diff options
Diffstat (limited to 'gnome-extra')
9 files changed, 44 insertions, 320 deletions
diff --git a/gnome-extra/gnome-screensaver/ChangeLog b/gnome-extra/gnome-screensaver/ChangeLog index 314a9341bf33..278070c62c29 100644 --- a/gnome-extra/gnome-screensaver/ChangeLog +++ b/gnome-extra/gnome-screensaver/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for gnome-extra/gnome-screensaver # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.105 2010/01/18 00:10:45 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.106 2010/01/24 22:56:15 eva Exp $ + + 24 Jan 2010; Gilles Dartiguelongue <eva@gentoo.org> + -files/gnome-screensaver-2.20.0-fix-gamma.patch, + -files/gnome-screensaver-2.22.2-fix-copy-themes-include.patch, + -gnome-screensaver-2.24.1-r1.ebuild, + -files/gnome-screensaver-2.24.1-pixmap-leak.patch, + gnome-screensaver-2.26.1-r1.ebuild, -gnome-screensaver-2.28.0.ebuild, + gnome-screensaver-2.28.0-r1.ebuild, +files/gentoologo-floaters.desktop: + Add branding, bug #285230. Clean up old revisions. 18 Jan 2010; Jeroen Roovers <jer@gentoo.org> gnome-screensaver-2.26.1.ebuild: diff --git a/gnome-extra/gnome-screensaver/files/gentoologo-floaters.desktop b/gnome-extra/gnome-screensaver/files/gentoologo-floaters.desktop new file mode 100644 index 000000000000..4d7173cad6a4 --- /dev/null +++ b/gnome-extra/gnome-screensaver/files/gentoologo-floaters.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Name=Floating Gentoo Logo +Name[fr]=Logo Gentoo flottant +Comment=Bubbles the Gentoo logo around the screen +Comment[fr]=Le logo de Gentoo apparaît ça et là sur l'écran +Exec=/usr/libexec/gnome-screensaver/floaters /usr/share/pixmaps/gentoo-logo.svg +TryExec=/usr/libexec/gnome-screensaver/floaters +StartupNotify=false +Terminal=false +Type=Application +Categories=GNOME;Screensaver; +OnlyShowIn=GNOME; diff --git a/gnome-extra/gnome-screensaver/files/gnome-screensaver-2.20.0-fix-gamma.patch b/gnome-extra/gnome-screensaver/files/gnome-screensaver-2.20.0-fix-gamma.patch deleted file mode 100644 index 3afe0cb80f91..000000000000 --- a/gnome-extra/gnome-screensaver/files/gnome-screensaver-2.20.0-fix-gamma.patch +++ /dev/null @@ -1,60 +0,0 @@ -http://bugzilla.gnome.org/show_bug.cgi?id=342850 -http://bugs.gentoo.org/show_bug.cgi?id=201019 - -Index: src/gs-fade.c -=================================================================== ---- src/gs-fade.c (revision 1322) -+++ src/gs-fade.c (working copy) -@@ -296,6 +296,10 @@ - } - # endif - -+ if (fade->priv->gamma_info) { -+ return TRUE; -+ } -+ - info = g_new0 (xf86_gamma_info, fade->priv->num_screens); - fade->priv->gamma_info = info; - -@@ -402,8 +406,10 @@ - int screen; - gboolean res; - -- for (screen = 0; screen < fade->priv->num_screens; screen++) { -- res = xf86_whack_gamma (screen, &fade->priv->gamma_info [screen], alpha); -+ if (fade->priv->gamma_info) { -+ for (screen = 0; screen < fade->priv->num_screens; screen++) { -+ res = xf86_whack_gamma (screen, &fade->priv->gamma_info [screen], alpha); -+ } - } - - return TRUE; -@@ -523,6 +529,8 @@ - - g_return_if_fail (GS_IS_FADE (fade)); - -+ gamma_info_init (fade); -+ - if (fade->priv->timer_id > 0) { - gs_fade_stop (fade); - } -@@ -641,6 +649,8 @@ - fade->priv->current_alpha = 1.0; - - gs_fade_set_alpha (fade, fade->priv->current_alpha); -+ -+ gamma_info_free (fade); - } - - static void -@@ -681,7 +691,9 @@ - display = gdk_display_get_default (); - fade->priv->num_screens = gdk_display_get_n_screens (display); - -- gamma_info_init (fade); -+#ifdef HAVE_XF86VMODE_GAMMA -+ fade->priv->gamma_info = NULL; -+#endif - } - - static void diff --git a/gnome-extra/gnome-screensaver/files/gnome-screensaver-2.22.2-fix-copy-themes-include.patch b/gnome-extra/gnome-screensaver/files/gnome-screensaver-2.22.2-fix-copy-themes-include.patch deleted file mode 100644 index 6bc92a1cae44..000000000000 --- a/gnome-extra/gnome-screensaver/files/gnome-screensaver-2.22.2-fix-copy-themes-include.patch +++ /dev/null @@ -1,22 +0,0 @@ -Retrieved from http://svn.gnome.org/viewvc/gnome-screensaver/trunk/src/copy-theme-dialog.c?r1=1357&r2=1462&view=patch -Fixes build compatibility against gtk+-2.14 - ---- trunk/src/copy-theme-dialog.c 2008/01/31 03:10:09 1357 -+++ trunk/src/copy-theme-dialog.c 2008/07/03 13:17:17 1462 -@@ -21,12 +21,14 @@ - # include "config.h" - #endif - -+#include <sys/stat.h> -+#include <limits.h> -+#include <string.h> -+ - #include <glib.h> - #include <glib/gi18n.h> - #include <gtk/gtk.h> - #include <gio/gio.h> --#include <limits.h> --#include <string.h> - - #include "copy-theme-dialog.h" - diff --git a/gnome-extra/gnome-screensaver/files/gnome-screensaver-2.24.1-pixmap-leak.patch b/gnome-extra/gnome-screensaver/files/gnome-screensaver-2.24.1-pixmap-leak.patch deleted file mode 100644 index b64077fe6db4..000000000000 --- a/gnome-extra/gnome-screensaver/files/gnome-screensaver-2.24.1-pixmap-leak.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up gnome-screensaver-2.25.1/src/gs-window-x11.c.pixmap-leak gnome-screensaver-2.25.1/src/gs-window-x11.c ---- gnome-screensaver-2.25.1/src/gs-window-x11.c.pixmap-leak 2008-12-14 22:16:01.000000000 -0500 -+++ gnome-screensaver-2.25.1/src/gs-window-x11.c 2008-12-14 22:16:34.000000000 -0500 -@@ -2287,6 +2287,10 @@ gs_window_finalize (GObject *object) - - gs_window_dialog_finish (window); - -+ if (window->priv->background_pixmap) { -+ g_object_unref (window->priv->background_pixmap); -+ } -+ - G_OBJECT_CLASS (gs_window_parent_class)->finalize (object); - } - diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-2.24.1-r1.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-2.24.1-r1.ebuild deleted file mode 100644 index c54a1e9a734e..000000000000 --- a/gnome-extra/gnome-screensaver/gnome-screensaver-2.24.1-r1.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.24.1-r1.ebuild,v 1.8 2009/04/27 14:25:46 jer Exp $ - -inherit eutils gnome2 - -DESCRIPTION="Replaces xscreensaver, integrating with the desktop." -HOMEPAGE="http://live.gnome.org/GnomeScreensaver" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" -KERNEL_IUSE="kernel_linux" -IUSE="debug doc libnotify opengl pam $KERNEL_IUSE" - -RDEPEND=">=gnome-base/gconf-2.6.1 - >=x11-libs/gtk+-2.14.0 - >=gnome-base/libglade-2.5.0 - >=gnome-base/gnome-desktop-2.23.2 - >=gnome-base/gnome-menus-2.12 - >=dev-libs/glib-2.15 - >=gnome-base/libgnomekbd-0.1 - >=dev-libs/dbus-glib-0.71 - libnotify? ( x11-libs/libnotify ) - opengl? ( virtual/opengl ) - pam? ( virtual/pam ) - !pam? ( kernel_linux? ( sys-apps/shadow ) ) - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrandr - x11-libs/libXScrnSaver - x11-libs/libXxf86misc - x11-libs/libXxf86vm" -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.9 - >=dev-util/intltool-0.35 - doc? ( - app-text/xmlto - ~app-text/docbook-xml-dtd-4.1.2 - ~app-text/docbook-xml-dtd-4.4 - ) - x11-proto/xextproto - x11-proto/randrproto - x11-proto/scrnsaverproto - x11-proto/xf86miscproto" - -DOCS="AUTHORS ChangeLog HACKING NEWS README TODO" - -pkg_setup() { - G2CONF="${G2CONF} - $(use_enable doc docbook-docs) - $(use_enable debug) - $(use_with libnotify) - $(use_with opengl libgl) - $(use_enable pam) - --enable-locking - --with-xf86gamma-ext - --with-kbd-layout-indicator - --with-xscreensaverdir=/usr/share/xscreensaver/config - --with-xscreensaverhackdir=/usr/lib/misc/xscreensaver" -} - -src_unpack() { - gnome2_src_unpack - - # fix bug #253581 - epatch "${FILESDIR}/${PN}-2.24.1-pixmap-leak.patch" -} - -src_install() { - gnome2_src_install - - # Install the conversion script in the documentation - dodoc "${S}/data/migrate-xscreensaver-config.sh" - dodoc "${S}/data/xscreensaver-config.xsl" - - # Conversion information - sed -e "s:\${PF}:${PF}:" \ - < "${FILESDIR}/xss-conversion-2.txt" > "${S}/xss-conversion.txt" - - dodoc "${S}/xss-conversion.txt" - - # Non PAM users will need this suid to read the password hashes. - # OpenPAM users will probably need this too when - # http://bugzilla.gnome.org/show_bug.cgi?id=370847 - # is fixed. - if ! use pam ; then - fperms u+s /usr/libexec/gnome-screensaver-dialog - fi -} - -pkg_postinst() { - gnome2_pkg_postinst - - if has_version "<x11-misc/xscreensaver-4.22-r2" ; then - ewarn "You have xscreensaver installed, you probably want to disable it." - ewarn "To prevent a duplicate screensaver entry in the menu, you need to" - ewarn "build xscreensaver with -gnome in the USE flags." - ewarn "echo \"x11-misc/xscreensaver -gnome\" >> /etc/portage/package.use" - - echo - fi - - elog "Information for converting screensavers is located in " - elog "/usr/share/doc/${PF}/xss-conversion.txt.${PORTAGE_COMPRESS}" -} diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-2.26.1-r1.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-2.26.1-r1.ebuild index 873fbc286dcd..64e0ebb74910 100644 --- a/gnome-extra/gnome-screensaver/gnome-screensaver-2.26.1-r1.ebuild +++ b/gnome-extra/gnome-screensaver/gnome-screensaver-2.26.1-r1.ebuild @@ -1,17 +1,19 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.26.1-r1.ebuild,v 1.1 2010/01/16 21:54:13 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.26.1-r1.ebuild,v 1.2 2010/01/24 22:56:15 eva Exp $ inherit eutils gnome2 multilib DESCRIPTION="Replaces xscreensaver, integrating with the desktop." HOMEPAGE="http://live.gnome.org/GnomeScreensaver" +SRC_URI="${SRC_URI} + branding? ( http://www.gentoo.org/images/gentoo-logo.svg )" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" KERNEL_IUSE="kernel_linux" -IUSE="debug doc libnotify opengl pam $KERNEL_IUSE" +IUSE="branding debug doc libnotify opengl pam $KERNEL_IUSE" RDEPEND=">=gnome-base/gconf-2.6.1 >=x11-libs/gtk+-2.14.0 @@ -85,6 +87,13 @@ src_install() { if ! use pam ; then fperms u+s /usr/libexec/gnome-screensaver-dialog fi + + if use branding ; then + insinto /usr/share/pixmaps/ + doins "${DISTDIR}/gentoo-logo.svg" || die "doins 1 failed" + insinto /usr/share/applications/screensavers/ + doins "${FILESDIR}/gentoologo-floaters.desktop" || die "doins 2 failed" + fi } pkg_postinst() { diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-2.28.0-r1.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-2.28.0-r1.ebuild index f1184d02b72e..9bde33089b7b 100644 --- a/gnome-extra/gnome-screensaver/gnome-screensaver-2.28.0-r1.ebuild +++ b/gnome-extra/gnome-screensaver/gnome-screensaver-2.28.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.28.0-r1.ebuild,v 1.1 2010/01/16 21:54:13 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.28.0-r1.ebuild,v 1.2 2010/01/24 22:56:15 eva Exp $ EAPI="2" @@ -8,12 +8,14 @@ inherit eutils gnome2 multilib DESCRIPTION="Replaces xscreensaver, integrating with the desktop." HOMEPAGE="http://live.gnome.org/GnomeScreensaver" +SRC_URI="${SRC_URI} + branding? ( http://www.gentoo.org/images/gentoo-logo.svg )" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" KERNEL_IUSE="kernel_linux" -IUSE="debug doc libnotify opengl pam $KERNEL_IUSE" +IUSE="branding debug doc libnotify opengl pam $KERNEL_IUSE" RDEPEND=">=gnome-base/gconf-2.6.1 >=x11-libs/gtk+-2.14.0 @@ -91,6 +93,13 @@ src_install() { if ! use pam ; then fperms u+s /usr/libexec/gnome-screensaver-dialog fi + + if use branding ; then + insinto /usr/share/pixmaps/ + doins "${DISTDIR}/gentoo-logo.svg" || die "doins 1 failed" + insinto /usr/share/applications/screensavers/ + doins "${FILESDIR}/gentoologo-floaters.desktop" || die "doins 2 failed" + fi } pkg_postinst() { diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-2.28.0.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-2.28.0.ebuild deleted file mode 100644 index 9bdbf58f5896..000000000000 --- a/gnome-extra/gnome-screensaver/gnome-screensaver-2.28.0.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.28.0.ebuild,v 1.1 2009/10/29 22:15:51 eva Exp $ - -EAPI="2" - -inherit eutils gnome2 multilib - -DESCRIPTION="Replaces xscreensaver, integrating with the desktop." -HOMEPAGE="http://live.gnome.org/GnomeScreensaver" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -KERNEL_IUSE="kernel_linux" -IUSE="debug doc libnotify opengl pam $KERNEL_IUSE" - -RDEPEND=">=gnome-base/gconf-2.6.1 - >=x11-libs/gtk+-2.14.0 - >=gnome-base/gnome-desktop-2.23.2 - >=gnome-base/gnome-menus-2.12 - >=dev-libs/glib-2.15 - >=gnome-base/libgnomekbd-0.1 - >=dev-libs/dbus-glib-0.71 - libnotify? ( x11-libs/libnotify ) - opengl? ( virtual/opengl ) - pam? ( virtual/pam ) - !pam? ( kernel_linux? ( sys-apps/shadow ) ) - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrandr - x11-libs/libXScrnSaver - x11-libs/libXxf86misc - x11-libs/libXxf86vm" -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.9 - >=dev-util/intltool-0.40 - doc? ( - app-text/xmlto - ~app-text/docbook-xml-dtd-4.1.2 - ~app-text/docbook-xml-dtd-4.4 ) - x11-proto/xextproto - x11-proto/randrproto - x11-proto/scrnsaverproto - x11-proto/xf86miscproto" - -DOCS="AUTHORS ChangeLog HACKING NEWS README TODO" - -pkg_setup() { - G2CONF="${G2CONF} - $(use_enable doc docbook-docs) - $(use_enable debug) - $(use_with libnotify) - $(use_with opengl gl) - $(use_enable pam) - --enable-locking - --with-xf86gamma-ext - --with-kbd-layout-indicator - --with-xscreensaverdir=/usr/share/xscreensaver/config - --with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver" -} - -src_prepare() { - gnome2_src_prepare - - # Fix intltoolize broken file, see upstream #577133 - sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \ - || die "sed failed" -} - -src_install() { - gnome2_src_install - - # Install the conversion script in the documentation - dodoc "${S}/data/migrate-xscreensaver-config.sh" - dodoc "${S}/data/xscreensaver-config.xsl" - - # Conversion information - sed -e "s:\${PF}:${PF}:" < "${FILESDIR}/xss-conversion-2.txt" \ - > "${S}/xss-conversion.txt" || die "sed failed" - - dodoc "${S}/xss-conversion.txt" - - # Non PAM users will need this suid to read the password hashes. - # OpenPAM users will probably need this too when - # http://bugzilla.gnome.org/show_bug.cgi?id=370847 - # is fixed. - if ! use pam ; then - fperms u+s /usr/libexec/gnome-screensaver-dialog - fi -} - -pkg_postinst() { - gnome2_pkg_postinst - - if has_version "<x11-base/xorg-server-1.5.3-r4" ; then - ewarn "You have a too old xorg-server installation. This will cause" - ewarn "gnome-screensaver to eat up your CPU. Please consider upgrading." - echo - fi - - if has_version "<x11-misc/xscreensaver-4.22-r2" ; then - ewarn "You have xscreensaver installed, you probably want to disable it." - ewarn "To prevent a duplicate screensaver entry in the menu, you need to" - ewarn "build xscreensaver with -gnome in the USE flags." - ewarn "echo \"x11-misc/xscreensaver -gnome\" >> /etc/portage/package.use" - - echo - fi - - elog "Information for converting screensavers is located in " - elog "/usr/share/doc/${PF}/xss-conversion.txt.${PORTAGE_COMPRESS}" -} |