summaryrefslogtreecommitdiff
path: root/x11-wm
diff options
context:
space:
mode:
authorJorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>2008-10-31 22:39:53 +0000
committerJorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>2008-10-31 22:39:53 +0000
commit67fadf00cc3899e4238fd0b31ecb83ed07b88fab (patch)
treef6b879ae0fa28b2227e1691827e5fe0811b41033 /x11-wm
parentallow for relative srcdir directory, thanks to Alon Bar-Lev in bug #198642 (diff)
downloadgentoo-2-67fadf00cc3899e4238fd0b31ecb83ed07b88fab.tar.gz
gentoo-2-67fadf00cc3899e4238fd0b31ecb83ed07b88fab.tar.bz2
gentoo-2-67fadf00cc3899e4238fd0b31ecb83ed07b88fab.zip
Added missing patch to compiz.
(Portage version: 2.2_rc12/cvs/Linux 2.6.27-gentoo x86_64)
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/compiz/ChangeLog6
-rw-r--r--x11-wm/compiz/files/compiz-no-gconf.patch20
2 files changed, 25 insertions, 1 deletions
diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index f6220b8e44fb..633ae8587fec 100644
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-wm/compiz
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.28 2008/10/31 16:48:40 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.29 2008/10/31 22:39:53 jmbsvicetto Exp $
+
+ 31 Oct 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+ +files/compiz-no-gconf.patch:
+ Added missing patch to compiz.
*compiz-0.7.8 (27 Oct 2008)
diff --git a/x11-wm/compiz/files/compiz-no-gconf.patch b/x11-wm/compiz/files/compiz-no-gconf.patch
new file mode 100644
index 000000000000..d43e84de6815
--- /dev/null
+++ b/x11-wm/compiz/files/compiz-no-gconf.patch
@@ -0,0 +1,20 @@
+ configure.ac | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7b09153..9c22ea0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -192,10 +192,10 @@ if test "x$use_gconf" = "xyes"; then
+ if test x"$GCONFTOOL" = xno; then
+ AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
+ fi
++else
++ AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, test "x$use_gconf" = "xyes")
+ fi
+
+-AM_GCONF_SOURCE_2
+-
+ AM_CONDITIONAL(USE_GCONF, test "x$use_gconf" = "xyes")
+ if test "$use_gconf" = yes; then
+ AC_DEFINE(USE_GCONF, 1, [Build gconf plugin])