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
commit79d354e42fb51e70070b42bfe45ff5f76ce0f967 (patch)
treeaf645c49b84541b02cd26f509dc048d54779bb1e /x11-plugins
parentEAPI=2; add gcc44 patch from Paul Mulders (bug #264739) (diff)
downloadhistorical-79d354e42fb51e70070b42bfe45ff5f76ce0f967.tar.gz
historical-79d354e42fb51e70070b42bfe45ff5f76ce0f967.tar.bz2
historical-79d354e42fb51e70070b42bfe45ff5f76ce0f967.zip
Trying to add the patch again.
Package-Manager: portage-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/Manifest2
-rw-r--r--x11-plugins/compiz-plugins-extra/files/compiz-plugins-extra-no-gconf.patch21
3 files changed, 27 insertions, 2 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/Manifest b/x11-plugins/compiz-plugins-extra/Manifest
index 1697fd6bbb76..f3eed117ce44 100644
--- a/x11-plugins/compiz-plugins-extra/Manifest
+++ b/x11-plugins/compiz-plugins-extra/Manifest
@@ -1,5 +1,5 @@
AUX compiz-plugins-extra-no-gconf.patch 585 RMD160 bb3b291eab783be7f9754d724d3a96618fe2e614 SHA1 564d6614cc157397ae24347a731a9f4d65bf30f8 SHA256 0567850b07c3973f1b4bfd5c36a1e240a57e45a1714b63637ecec577febfc13f
DIST compiz-plugins-extra-0.8.2.tar.bz2 2624166 RMD160 9a8078b51491e8c8ed03dfdb93a336da4619e2af SHA1 4aa3220472e68fa3b27bfc5e95808b4fb9eae6cd SHA256 4f99f6b6a1abd5bd480b9e9f025ef8f75270fa46dd80a03e902bc297d61e0ab2
EBUILD compiz-plugins-extra-0.8.2.ebuild 1221 RMD160 1a3449c32e677213f4528a24165f910c46f6f76a SHA1 1f3ee374905b9d36a6ec6b8c710d7390624f9dc1 SHA256 9596a17b20f150fe2e509570865d1dde37f957c303394b2fd2eae39009a93a63
-MISC ChangeLog 581 RMD160 2bf004539b28f12a046ead4eae0d48005c05e616 SHA1 8ba20cfc8b764379ec5621d70058e075d04dae18 SHA256 263cefddc393acc16f23456eac64c5800494e53c5fda858e4bc4caaed4055635
+MISC ChangeLog 728 RMD160 f2c28f23a2fd3ebaf2e75ffab2ade955b7630388 SHA1 8d6d9bed2d0d83ba3b2a82a4aaec22c7403511f0 SHA256 1942dfb58718b7fe1a960f98d515e8a72f2eeed98705bfa8e2f358d1f9beb515
MISC metadata.xml 446 RMD160 aeefd7f7a11eca1cfdf311dd9edf9e78f54d0d13 SHA1 35ee4d4d871dc365def8b4901172b72c8db28460 SHA256 6c0bdfc83d10f364e6fc38305ef97834032fbb5d6623058d04670910acc6fad8
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])