summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorjmcneill <jmcneill>2008-05-12 02:10:24 +0000
committerjmcneill <jmcneill>2008-05-12 02:10:24 +0000
commit81e286ce61d54d3f699d0de50dc3a4e242d2267b (patch)
tree037ffcffadc69818c00f5879988cc58b3233709e /x11
parent4608ef7c86ea03f6a503015b08df1b14fe305005 (diff)
downloadpkgsrc-81e286ce61d54d3f699d0de50dc3a4e242d2267b.tar.gz
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 (limited to 'x11')
-rw-r--r--x11/gnome-session/Makefile3
-rw-r--r--x11/gnome-session/distinfo3
-rw-r--r--x11/gnome-session/patches/patch-ad24
3 files changed, 28 insertions, 2 deletions
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index a7500b22a08..101aa6b609f 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -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 --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index e57ec276a83..647bf59a833 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -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 @@ Size (gnome-splash-2.16.0.png) = 36601 bytes
SHA1 (patch-aa) = 7cb4092f21ee08b7e7248df2cff677b678da22ec
SHA1 (patch-ab) = b274bbe433151383ee0f2117dd2fb5746920be75
SHA1 (patch-ac) = 35cc0f0982cb8ed711a4ebc45d2e9570725cbf95
+SHA1 (patch-ad) = b84bf88952aafacd8d7043dccc18bb5a0c4b73bd
diff --git a/x11/gnome-session/patches/patch-ad b/x11/gnome-session/patches/patch-ad
new file mode 100644
index 00000000000..f672d66b676
--- /dev/null
+++ b/x11/gnome-session/patches/patch-ad
@@ -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!"