# ChangeLog for gnome-extra/gnome-screensaver
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.62 2007/12/12 03:03:34 leio Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.63 2008/02/21 14:04:25 leio Exp $
+
+*gnome-screensaver-2.20.0-r1 (21 Feb 2008)
+
+ 21 Feb 2008; Mart Raudsepp <leio@gentoo.org>
+ +files/gnome-screensaver-2.20.0-fix-gamma.patch,
+ +gnome-screensaver-2.20.0-r1.ebuild:
+ Improve gamma restoring, bug 201019. Thanks to Pacho Ramos
12 Dec 2007; Mart Raudsepp <leio@gentoo.org>
gnome-screensaver-2.20.0.ebuild:
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX gnome-screensaver-2.20.0-fix-gamma.patch 1637 RMD160 1bda5b646edb2b38218c93ac05b6f592e1366bca SHA1 243191a5c59be9badbba440ef364483a83d69fae SHA256 20c5afb7c058e1a4acf308eee466bbf81fb01e2df9a238fc48b0e89384521005
AUX xss-conversion-2.txt 1026 RMD160 5a1810d1f41999907ff39adf0e6396d1d6f5c5d7 SHA1 477743e8fd025cff16c1b2ed538a57ce9550a9cf SHA256 f1bcc5e85d45e53e6170d0cdf25dd3d10020aeef545cf2fdea5e3b4b30ec86c8
DIST gnome-screensaver-2.18.2.tar.bz2 2023290 RMD160 cbd5c1985e4224febb5c79665e5a52b39073292d SHA1 b8eed3f520ed8d0f4693f47aa4a91ad50e3008e9 SHA256 428d67dfbfb9fcc69144133e309093877ed0684a4c44afa1f859424159707f5e
DIST gnome-screensaver-2.20.0.tar.bz2 2013842 RMD160 ddea3d536366aab572462f4f66c72daabbeeb119 SHA1 0b99de04caf897642338c61edc12cb7cea27e0a4 SHA256 9ee744058d2c7139634543951a62828b2e1b69fe33cf0b5456737e9c5201dbb9
EBUILD gnome-screensaver-2.18.2-r1.ebuild 2873 RMD160 6d0d7102037da49212851ea8fe49cd608486ed66 SHA1 28c3e0b018ea78049b7dfe6907d5262f965372b5 SHA256 9c312a26a527f090a5a217f107fc33fc14ad1637c2e620d35dd60095d59f8016
+EBUILD gnome-screensaver-2.20.0-r1.ebuild 2976 RMD160 37ede051cceca7f82f5bc8dcf10fd13dc41c1573 SHA1 b58c6213f8ac627250d696eb74583331e81f9887 SHA256 f7a4b69a766053dde02aaf2a3b33c2181102141b59b4ac5ce0bd769f801a59bb
EBUILD gnome-screensaver-2.20.0.ebuild 2886 RMD160 f15e0478a5ff80e73475b178d57d9ca8bd5dd2af SHA1 434177800da6b29e1311bd90e4c213aad0e3c8c2 SHA256 76b6557c0be93ecf62d941a02105c482c79f283aa228fcad32e35597f7b73ef1
-MISC ChangeLog 9667 RMD160 4ef47b1238c81c967fe41285a801fb747c61a8b6 SHA1 6cd2e964b0bca6edbd85d415d0076ca208fabe4c SHA256 a2193583b4bef52a7528561e09b468367dd496a2fa24c2c2a7ad9621e109f7ef
+MISC ChangeLog 9910 RMD160 6874bc1573c76a9a449081c2080ba3d42d344e7c SHA1 6f7c4ca02a5b56c820d05e4062a05e74255be853 SHA256 a795c349df629ffb0ba330f3f62d72f7f567c2e6516ac415062c9bd73516860b
MISC metadata.xml 472 RMD160 3fe1221d0cb389cf1be040c98fa9c40dbf3c07e5 SHA1 18913172dba9d94ca5952b7f8bfb2aa13808bb67 SHA256 e70be8f69acbda81bd1e90c1bd3a57a0b5ccb5fa09c7a6f04427ef888e1872bc
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
-
-iEYEARECAAYFAkejt88ACgkQkeYb6olFHJfNdwCfSMetdjEkjsaOIb9ZaU9xr/1D
-XMcAoPpYFQ4aHlMqFPT2HJYbpru1hyWQ
-=H6iv
------END PGP SIGNATURE-----
--- /dev/null
+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
--- /dev/null
+# Copyright 1999-2008 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.20.0-r1.ebuild,v 1.1 2008/02/21 14:04:25 leio Exp $
+
+inherit 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 xinerama $KERNEL_IUSE"
+
+RDEPEND=">=gnome-base/gconf-2.6.1
+ >=x11-libs/gtk+-2.11.5
+ >=gnome-base/gnome-vfs-2.12
+ >=gnome-base/libglade-2.5.0
+ >=gnome-base/gnome-menus-2.12
+ >=dev-libs/glib-2.8
+ >=gnome-base/libgnomekbd-0.1
+ >=dev-libs/dbus-glib-0.71
+ libnotify? ( x11-libs/libnotify )
+ opengl? ( virtual/opengl )
+ xinerama? (
+ x11-libs/libXinerama
+ x11-proto/xineramaproto
+ )
+ pam? ( virtual/pam )
+ !pam? ( kernel_linux? ( sys-apps/shadow ) )
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXrandr
+ x11-libs/libXScrnSaver"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+ >=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) \
+ $(use_enable xinerama) \
+ --enable-locking \
+ --with-kbd-layout-indicator \
+ --with-gdm-config=/usr/share/gdm/defaults.conf \
+ --with-xscreensaverdir=/usr/share/xscreensaver/config \
+ --with-xscreensaverhackdir=/usr/lib/misc/xscreensaver"
+}
+
+src_unpack() {
+ gnome2_src_unpack
+ epatch "${FILESDIR}/${P}-fix-gamma.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
+
+ ewarn "If 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
+ elog "Information for converting screensavers is located in "
+ elog "/usr/share/doc/${PF}/xss-conversion.txt.${PORTAGE_COMPRESS}"
+}
projects / gentoo.git / commitdiff