[pkgsrc/trunk]: pkgsrc/x11/gnome-session If compiz is enabled, load the decor...

[jmcneill <jmcneill%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/83cd362a2f67
branches:  trunk
changeset: 542304:83cd362a2f67
user:      jmcneill <jmcneill%pkgsrc.org@localhost>
date:      Mon May 12 02:10:24 2008 +0000

description:
If compiz is enabled, load the decoration plugin before gconf, otherwise
when the default schema is applied the decoration will be unloaded.

Bump pkg revision.

diffstat:

 x11/gnome-session/Makefile         |   3 ++-
 x11/gnome-session/distinfo         |   3 ++-
 x11/gnome-session/patches/patch-ad |  24 ++++++++++++++++++++++++
 3 files changed, 28 insertions(+), 2 deletions(-)

diffs (55 lines):

diff -r 0482b74a0030 -r 83cd362a2f67 x11/gnome-session/Makefile
--- a/x11/gnome-session/Makefile        Mon May 12 02:03:16 2008 +0000
+++ b/x11/gnome-session/Makefile        Mon May 12 02:10:24 2008 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.95 2008/04/30 13:38:17 jmmv Exp $
+# $NetBSD: Makefile,v 1.96 2008/05/12 02:10:24 jmcneill Exp $
 #
 
 DISTNAME=              gnome-session-2.22.1.1
+PKGREVISION=           1
 CATEGORIES=            x11 gnome
 MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/gnome-session/2.22/}
 SITES.gnome-splash-2.16.0.png= ${MASTER_SITE_LOCAL:=gnome-splash/}
diff -r 0482b74a0030 -r 83cd362a2f67 x11/gnome-session/distinfo
--- a/x11/gnome-session/distinfo        Mon May 12 02:03:16 2008 +0000
+++ b/x11/gnome-session/distinfo        Mon May 12 02:10:24 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.36 2008/04/25 04:02:23 bjs Exp $
+$NetBSD: distinfo,v 1.37 2008/05/12 02:10:24 jmcneill Exp $
 
 SHA1 (gnome-session-2.22.1.1.tar.bz2) = 54ba733ec8c8530a1f9c03b9f11d66bf3e666163
 RMD160 (gnome-session-2.22.1.1.tar.bz2) = 0d8b26f95cee389e8aefd05251e16b7cd3703aa3
@@ -9,3 +9,4 @@
 SHA1 (patch-aa) = 7cb4092f21ee08b7e7248df2cff677b678da22ec
 SHA1 (patch-ab) = b274bbe433151383ee0f2117dd2fb5746920be75
 SHA1 (patch-ac) = 35cc0f0982cb8ed711a4ebc45d2e9570725cbf95
+SHA1 (patch-ad) = b84bf88952aafacd8d7043dccc18bb5a0c4b73bd
diff -r 0482b74a0030 -r 83cd362a2f67 x11/gnome-session/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/gnome-session/patches/patch-ad        Mon May 12 02:10:24 2008 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-ad,v 1.5 2008/05/12 02:10:24 jmcneill Exp $
+
+--- gnome-session/gnome-wm.orig        2008-05-11 22:00:59.000000000 -0400
++++ gnome-session/gnome-wm     2008-05-11 22:01:36.000000000 -0400
+@@ -119,15 +119,17 @@
+ case `basename $WINDOW_MANAGER` in
+   compiz)
+     export LIBGL_ALWAYS_INDIRECT=1
++    export INTEL_BATCH=1
+     gtk-window-decorator &
+     OPT3=glib
+-    OPT4=gconf
++    OPT4=decoration
++    OPT5=gconf
+     ;;
+   beryl)
+     emerald &
+     ;;
+ esac
+ 
+-exec $WINDOW_MANAGER $OPT1 $OPT2 $OPT3 $OPT4
++exec $WINDOW_MANAGER $OPT1 $OPT2 $OPT3 $OPT4 $OPT5
+ 
+ echo "ERROR: No window manager could run!"