diff options
| author | jmcneill <jmcneill> | 2008-05-12 12:58:03 +0000 |
|---|---|---|
| committer | jmcneill <jmcneill> | 2008-05-12 12:58:03 +0000 |
| commit | 6c0a31174513a8ffe07893f3787626f9e86ce840 (patch) | |
| tree | 3c419d838cc8e225725483b5ce35abbf50f1432d /x11 | |
| parent | 6fdd7790a4f679979bfb5a5f745304e5a44f9b25 (diff) | |
| download | pkgsrc-6c0a31174513a8ffe07893f3787626f9e86ce840.tar.gz | |
If ccsm is found, use the ccp plugin for compiz instead of the usual
glib/decoration/gconf list. Bump pkg revision.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/gnome-session/Makefile | 4 | ||||
| -rw-r--r-- | x11/gnome-session/distinfo | 4 | ||||
| -rw-r--r-- | x11/gnome-session/patches/patch-ad | 19 |
3 files changed, 16 insertions, 11 deletions
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile index 101aa6b609f..12b62022b8c 100644 --- a/x11/gnome-session/Makefile +++ b/x11/gnome-session/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.96 2008/05/12 02:10:24 jmcneill Exp $ +# $NetBSD: Makefile,v 1.97 2008/05/12 12:58:03 jmcneill Exp $ # DISTNAME= gnome-session-2.22.1.1 -PKGREVISION= 1 +PKGREVISION= 2 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 647bf59a833..0713071380d 100644 --- a/x11/gnome-session/distinfo +++ b/x11/gnome-session/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.37 2008/05/12 02:10:24 jmcneill Exp $ +$NetBSD: distinfo,v 1.38 2008/05/12 12:58:03 jmcneill Exp $ SHA1 (gnome-session-2.22.1.1.tar.bz2) = 54ba733ec8c8530a1f9c03b9f11d66bf3e666163 RMD160 (gnome-session-2.22.1.1.tar.bz2) = 0d8b26f95cee389e8aefd05251e16b7cd3703aa3 @@ -9,4 +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 +SHA1 (patch-ad) = c737a11ec9ab7c74e498644f81377ffb3c65ee94 diff --git a/x11/gnome-session/patches/patch-ad b/x11/gnome-session/patches/patch-ad index f672d66b676..0614cf5e3be 100644 --- a/x11/gnome-session/patches/patch-ad +++ b/x11/gnome-session/patches/patch-ad @@ -1,17 +1,22 @@ -$NetBSD: patch-ad,v 1.5 2008/05/12 02:10:24 jmcneill Exp $ +$NetBSD: patch-ad,v 1.6 2008/05/12 12:58:03 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 @@ +--- gnome-session/gnome-wm.orig 2008-04-10 10:32:20.000000000 -0400 ++++ gnome-session/gnome-wm 2008-05-12 08:50:00.000000000 -0400 +@@ -119,15 +119,21 @@ case `basename $WINDOW_MANAGER` in compiz) export LIBGL_ALWAYS_INDIRECT=1 + export INTEL_BATCH=1 gtk-window-decorator & - OPT3=glib +- OPT3=glib - OPT4=gconf -+ OPT4=decoration -+ OPT5=gconf ++ if which ccsm >/dev/null; then ++ OPT3=ccp ++ else ++ OPT3=glib ++ OPT4=decoration ++ OPT5=gconf ++ fi ;; beryl) emerald & |