summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>2009-04-04 00:57:20 +0000
committerJorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>2009-04-04 00:57:20 +0000
commit9d124f0e09f6d617e5db162bfde26030b1ea3a01 (patch)
tree9d806d2a1e8ce49ca6953ec3b46529fdc7672dc9 /x11-plugins
parentEAPI=2; add gcc44 patch from Paul Mulders (bug #264739) (diff)
downloadgentoo-2-9d124f0e09f6d617e5db162bfde26030b1ea3a01.tar.gz
gentoo-2-9d124f0e09f6d617e5db162bfde26030b1ea3a01.tar.bz2
gentoo-2-9d124f0e09f6d617e5db162bfde26030b1ea3a01.zip
Trying to add the patch again.
(Portage version: 2.2_rc28/cvs/Linux x86_64)
Diffstat (limited to 'x11-plugins')
-rw-r--r--x11-plugins/compiz-plugins-extra/ChangeLog6
-rw-r--r--x11-plugins/compiz-plugins-extra/files/compiz-plugins-extra-no-gconf.patch21
2 files changed, 26 insertions, 1 deletions
diff --git a/x11-plugins/compiz-plugins-extra/ChangeLog b/x11-plugins/compiz-plugins-extra/ChangeLog
index 5bc0b76a9d3d..62672a7ed23d 100644
--- a/x11-plugins/compiz-plugins-extra/ChangeLog
+++ b/x11-plugins/compiz-plugins-extra/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-plugins/compiz-plugins-extra
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-extra/ChangeLog,v 1.2 2009/04/03 17:07:22 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-extra/ChangeLog,v 1.3 2009/04/04 00:57:20 jmbsvicetto Exp $
+
+ 04 Apr 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+ +files/compiz-plugins-extra-no-gconf.patch:
+ Trying to add the patch again.
03 Apr 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+files/compiz-plugins-extra-no-gconf.patch:
diff --git a/x11-plugins/compiz-plugins-extra/files/compiz-plugins-extra-no-gconf.patch b/x11-plugins/compiz-plugins-extra/files/compiz-plugins-extra-no-gconf.patch
new file mode 100644
index 000000000000..49bf16be4b10
--- /dev/null
+++ b/x11-plugins/compiz-plugins-extra/files/compiz-plugins-extra-no-gconf.patch
@@ -0,0 +1,21 @@
+ configure.ac | 5 ++---
+ 1 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0a3d7c1..6f8356d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -150,11 +150,10 @@ if test x"$use_schemas" = x"yes"; then
+ fi
+ xsltdir=`$PKG_CONFIG --variable=xsltdir compiz-gconf`
+ AC_SUBST(xsltdir)
++else
++ AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, test "x$use_gconf" = "xyes")
+ fi
+
+-AM_GCONF_SOURCE_2
+-
+-
+ AM_CONDITIONAL(USE_SCHEMAS, test "x$use_schemas" = "xyes")
+ if test "$use_schemas" = yes; then
+ AC_DEFINE(USE_SCHEMAS, 1, [Build gconf schemas])