[patch] glib-2.32.0-external-gdbus-codegen.patch update for glib-2.32.0

glib-2.32.0-external-gdbus-codegen.patch (text/plain), 2.90 KB, created by Palmer Dabbelt on 2012-04-18 01:48:55 UTC

diff -ur glib-2.32.0.orig/configure.ac glib-2.32.0/configure.ac
--- glib-2.32.0.orig/configure.ac	2012-04-17 13:31:12.000000000 -0400
+++ glib-2.32.0/configure.ac	2012-04-17 13:31:26.000000000 -0400
@@ -3516,8 +3516,6 @@
 gobject/tests/Makefile
 gthread/Makefile
 gio/Makefile
-gio/gdbus-2.0/codegen/Makefile
-gio/gdbus-2.0/codegen/config.py
 gio/xdgmime/Makefile
 gio/inotify/Makefile
 gio/fen/Makefile
diff -ur glib-2.32.0.orig/docs/reference/gio/Makefile.am glib-2.32.0/docs/reference/gio/Makefile.am
--- glib-2.32.0.orig/docs/reference/gio/Makefile.am	2012-04-17 13:31:12.000000000 -0400
+++ glib-2.32.0/docs/reference/gio/Makefile.am	2012-04-17 13:31:26.000000000 -0400
@@ -148,8 +148,7 @@
 	glib-compile-resources.1	\
 	gsettings.1		\
 	gresource.1		\
-	gdbus.1			\
-	gdbus-codegen.1
+	gdbus.1
 
 if ENABLE_MAN
 
diff -ur glib-2.32.0.orig/gio/Makefile.am glib-2.32.0/gio/Makefile.am
--- glib-2.32.0.orig/gio/Makefile.am	2012-04-17 13:31:12.000000000 -0400
+++ glib-2.32.0/gio/Makefile.am	2012-04-17 13:31:19.000000000 -0400
@@ -2,7 +2,7 @@
 
 NULL =
 
-SUBDIRS = gdbus-2.0/codegen
+SUBDIRS = 
 
 if OS_UNIX
 SUBDIRS += xdgmime
diff -ur glib-2.32.0.orig/gio/tests/gdbus-object-manager-example/Makefile.am glib-2.32.0/gio/tests/gdbus-object-manager-example/Makefile.am
--- glib-2.32.0.orig/gio/tests/gdbus-object-manager-example/Makefile.am	2012-04-17 13:31:12.000000000 -0400
+++ glib-2.32.0/gio/tests/gdbus-object-manager-example/Makefile.am	2012-04-17 13:31:26.000000000 -0400
@@ -21,10 +21,8 @@
 	gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml 	\
 	$(NULL)
 
-$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
-	$(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
-		UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
-		$(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
+$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile
+	$(AM_V_GEN) gdbus-codegen \
 		--interface-prefix org.gtk.GDBus.Example.ObjectManager. \
 		--c-namespace Example \
 		--c-generate-object-manager \
diff -ur glib-2.32.0.orig/gio/tests/Makefile.am glib-2.32.0/gio/tests/Makefile.am
--- glib-2.32.0.orig/gio/tests/Makefile.am	2012-04-17 13:31:12.000000000 -0400
+++ glib-2.32.0/gio/tests/Makefile.am	2012-04-17 13:31:26.000000000 -0400
@@ -275,10 +275,8 @@
 gdbus_close_pending_LDADD = $(progs_ldadd)
 
 if OS_UNIX
-gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
-	$(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
-		UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
-		$(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
+gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : test-codegen.xml Makefile
+	$(AM_V_GEN) gdbus-codegen \
 		--interface-prefix org.project. \
 		--generate-c-code gdbus-test-codegen-generated \
 		--c-generate-object-manager \