Improve gamma restoring, bug 201019. Thanks to Pacho Ramos

(Portage version: 2.1.4.4)

3 files changed, 173 insertions, 2 deletions

diff --git a/gnome-extra/gnome-screensaver/ChangeLog b/gnome-extra/gnome-screensaver/ChangeLog
index 419f8917bf60..e8b332c196c9 100644
--- a/gnome-extra/gnome-screensaver/ChangeLog
+++ b/gnome-extra/gnome-screensaver/ChangeLog
@@ -1,6 +1,13 @@
 # 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:
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
new file mode 100644
index 000000000000..3afe0cb80f91
--- /dev/null
+++ b/gnome-extra/gnome-screensaver/files/gnome-screensaver-2.20.0-fix-gamma.patch
@@ -0,0 +1,60 @@
+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/gnome-screensaver-2.20.0-r1.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-2.20.0-r1.ebuild
new file mode 100644
index 000000000000..682ae6929add
--- /dev/null
+++ b/gnome-extra/gnome-screensaver/gnome-screensaver-2.20.0-r1.ebuild
@@ -0,0 +1,104 @@
+# 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}"
+}