[compiz-plugins-main] add compiz-plugins-main_remove_gconf_usage.patch

Wolfgang Ulbrich raveit65 at fedoraproject.org
Wed Apr 24 16:27:00 UTC 2013


commit a8933f3bcbe42ae2431f3ae4d9a0e69a1295cb61
Author: raveit <chat-to-me at raveit.de>
Date:   Wed Apr 24 18:26:25 2013 +0200

    add compiz-plugins-main_remove_gconf_usage.patch

 compiz-plugins-main_remove_gconf_usage.patch |   69 ++++++++++++++++++++++++++
 1 files changed, 69 insertions(+), 0 deletions(-)
---
diff --git a/compiz-plugins-main_remove_gconf_usage.patch b/compiz-plugins-main_remove_gconf_usage.patch
new file mode 100644
index 0000000..6ddebbb
--- /dev/null
+++ b/compiz-plugins-main_remove_gconf_usage.patch
@@ -0,0 +1,69 @@
+diff -upr compiz-plugins-main-0.8.8-orig/configure.ac compiz-plugins-main-0.8.8/configure.ac
+--- compiz-plugins-main-0.8.8-orig/configure.ac	2013-04-23 10:25:06.228267000 +0200
++++ compiz-plugins-main-0.8.8/configure.ac	2013-04-23 10:35:09.392933746 +0200
+@@ -157,32 +157,6 @@ if test "$use_jpeg" = yes; then
+   AC_DEFINE(USE_JPEG, 1, [Build jpeg plugin])
+ fi
+ 
+-AC_ARG_ENABLE(schemas,
+-  [  --enable-schemas         Build gconf schemas],
+-  [use_schemas=$enableval], [use_schemas=no])
+-
+-if test x"$use_schemas" = x"yes"; then
+-  AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
+-  PKG_CHECK_MODULES(SCHEMAS, compiz-gconf, [use_schemas=yes], [use_schemas=no])
+-  if test x"$GCONFTOOL" = xno; then
+-    AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
+-  fi
+-  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+-  if test x"$PKG_CONFIG" = xno ; then
+-    AC_MSG_ERROR([pkg-config executable not found in your path, unable to determine schema directory])
+-  fi
+-  xsltdir=`$PKG_CONFIG --variable=xsltdir compiz-gconf`
+-  AC_SUBST(xsltdir)
+-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])
+-fi
+-
+ AC_OUTPUT([
+ compiz-text.pc
+ compiz-mousepoll.pc
+Nur in compiz-plugins-main-0.8.8: configure.ac~.
+diff -upr compiz-plugins-main-0.8.8-orig/metadata/Makefile.am compiz-plugins-main-0.8.8/metadata/Makefile.am
+--- compiz-plugins-main-0.8.8-orig/metadata/Makefile.am	2013-04-23 10:25:06.231267000 +0200
++++ compiz-plugins-main-0.8.8/metadata/Makefile.am	2013-04-23 10:37:11.962136165 +0200
+@@ -52,26 +52,9 @@ xml_DATA     = $(xml_files)
+ 
+ @INTLTOOL_XML_RULE@
+ 
+-if USE_SCHEMAS
+-schemadir   = $(GCONF_SCHEMA_FILE_DIR)
+-schema_files = $(patsubst %.xml.in,compiz-%.schemas,$(xml_in_files))
+-schema_DATA  = $(schema_files)
+-
+-%.schemas: $(xml_files)
+-	xsltproc -o $@ $(xsltdir)/schemas.xslt $(subst compiz-,,$*).xml;
+-
+-if GCONF_SCHEMAS_INSTALL
+-install-data-local:
+-	if test -z "$(DESTDIR)" ; then \
+-               GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA); \
+-       fi
+-endif
+-endif
+-
+ EXTRA_DIST =		\
+ 	$(xml_in_files)
+ 
+ DISTCLEANFILES =	\
+-	$(xml_files)    \
+-	$(schema_files)
++	$(xml_files)
+ 
+Nur in compiz-plugins-main-0.8.8/metadata: Makefile.am~.


More information about the scm-commits mailing list