summaryrefslogtreecommitdiffstats
path: root/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches
diff options
context:
space:
mode:
Diffstat (limited to 'debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches')
-rw-r--r--debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/101-build-without-gconf.patch19
-rw-r--r--debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/series1
2 files changed, 20 insertions, 0 deletions
diff --git a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/101-build-without-gconf.patch b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/101-build-without-gconf.patch
new file mode 100644
index 00000000..9468b873
--- /dev/null
+++ b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/101-build-without-gconf.patch
@@ -0,0 +1,19 @@
+Index: compiz-trinity-0.8.4/configure.ac
+===================================================================
+--- compiz-trinity-0.8.4.orig/configure.ac
++++ compiz-trinity-0.8.4/configure.ac
+@@ -192,9 +192,12 @@ 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
+-fi
+
+-AM_GCONF_SOURCE_2
++ AM_GCONF_SOURCE_2
++else
++ m4_pattern_allow([AM_GCONF_SOURCE_2])
++ AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, false)
++fi
+
+ AM_CONDITIONAL(USE_GCONF, test "x$use_gconf" = "xyes")
+ if test "$use_gconf" = yes; then
diff --git a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/series b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/series
index 266927cb..aa3a9cdb 100644
--- a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/series
+++ b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/series
@@ -21,3 +21,4 @@ kubuntu_04_trinity.patch
099-trinity.patch
099-fix-dso-link.patch
100-tde-r14.patch
+101-build-without-gconf.patch