avoid implicit Python dependency: don't build gdbus-codegen, it is new in

2.30 and not used in pkgsrc yet, will be added as separate pkg

4 files changed, 66 insertions, 30 deletions

diff --git a/devel/glib2/PLIST b/devel/glib2/PLIST
index 4dbe5845020..de0dc73dad0 100644
--- a/devel/glib2/PLIST
+++ b/devel/glib2/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.63 2012/01/29 10:46:52 drochner Exp $
+@comment $NetBSD: PLIST,v 1.64 2012/01/29 17:43:43 drochner Exp $
 bin/gdbus
-bin/gdbus-codegen
 bin/gio-querymodules
 bin/glib-compile-schemas
 bin/glib-genmarshal
@@ -228,30 +227,6 @@ include/glib/glib-2.0/gobject/gvalue.h
 include/glib/glib-2.0/gobject/gvaluearray.h
 include/glib/glib-2.0/gobject/gvaluecollector.h
 include/glib/glib-2.0/gobject/gvaluetypes.h
-lib/gdbus-2.0/codegen/__init__.py
-lib/gdbus-2.0/codegen/__init__.pyc
-lib/gdbus-2.0/codegen/__init__.pyo
-lib/gdbus-2.0/codegen/codegen.py
-lib/gdbus-2.0/codegen/codegen.pyc
-lib/gdbus-2.0/codegen/codegen.pyo
-lib/gdbus-2.0/codegen/codegen_docbook.py
-lib/gdbus-2.0/codegen/codegen_docbook.pyc
-lib/gdbus-2.0/codegen/codegen_docbook.pyo
-lib/gdbus-2.0/codegen/codegen_main.py
-lib/gdbus-2.0/codegen/codegen_main.pyc
-lib/gdbus-2.0/codegen/codegen_main.pyo
-lib/gdbus-2.0/codegen/config.py
-lib/gdbus-2.0/codegen/config.pyc
-lib/gdbus-2.0/codegen/config.pyo
-lib/gdbus-2.0/codegen/dbustypes.py
-lib/gdbus-2.0/codegen/dbustypes.pyc
-lib/gdbus-2.0/codegen/dbustypes.pyo
-lib/gdbus-2.0/codegen/parser.py
-lib/gdbus-2.0/codegen/parser.pyc
-lib/gdbus-2.0/codegen/parser.pyo
-lib/gdbus-2.0/codegen/utils.py
-lib/gdbus-2.0/codegen/utils.pyc
-lib/gdbus-2.0/codegen/utils.pyo
 lib/glib-2.0/include/glibconfig.h
 lib/libgio-2.0.la
 lib/libglib-2.0.la
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index 332669ed9df..bb68c5b7934 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.158 2012/01/29 10:46:52 drochner Exp $
+$NetBSD: distinfo,v 1.159 2012/01/29 17:43:43 drochner Exp $
 
 SHA1 (glib-2.30.2.tar.bz2) = 70208757905037fa1f8b89797db0097c5e82a140
 RMD160 (glib-2.30.2.tar.bz2) = efe0d8ae945dd3b20ca4835dcb45696fd0914c06
@@ -19,9 +19,10 @@ SHA1 (patch-aj) = 9e5a7ccf081e3ebdf7888a67b027b696f632177c
 SHA1 (patch-ak) = 5190e6d3b2a333ac83968a044755e1a139bf4460
 SHA1 (patch-al) = bde29693322c568f9a4ad090f1d469de5f69920e
 SHA1 (patch-am) = 062d3d295f00485ac3c3839dd4697957ebc66772
-SHA1 (patch-an) = 64564657b06e6f763a3fe2819992c594ddb44744
+SHA1 (patch-an) = 9384dca0b98bde4e2d64dbca6584a3aefa0c352c
 SHA1 (patch-ap) = 38a805f95e8f7ca35c73984be9142336c6a3ec4c
 SHA1 (patch-aq) = aa7087b91c7d0eca9f9895feb6924df95eccb372
+SHA1 (patch-ar) = 27679e663399ffa1ca1ad95876084f05930bece3
 SHA1 (patch-ba) = 8d50fcbe3e9238bbf7bafee4c0ce627e34c3d9d2
 SHA1 (patch-cb) = 0f084c33fb67fbb8e12448034450699da26289ff
 SHA1 (patch-cc) = dd73079b727bca9013465204dc3b53b76a280e54
diff --git a/devel/glib2/patches/patch-an b/devel/glib2/patches/patch-an
index 6833f42b9db..f95796c5836 100644
--- a/devel/glib2/patches/patch-an
+++ b/devel/glib2/patches/patch-an
@@ -1,7 +1,16 @@
-$NetBSD: patch-an,v 1.5 2012/01/29 10:46:54 drochner Exp $
+$NetBSD: patch-an,v 1.6 2012/01/29 17:43:44 drochner Exp $
 
---- gio/Makefile.in.orig	2011-10-14 13:31:08.000000000 +0000
+--- gio/Makefile.in.orig	2011-11-11 22:11:55.000000000 +0000
 +++ gio/Makefile.in
+@@ -709,7 +709,7 @@ EXTRA_DIST = strinfo.c gio.symbols gioen
+ 	gschema.dtd $(NULL) $(completion_DATA)
+ TEST_PROGS = 
+ NULL = 
+-SUBDIRS = gdbus-2.0/codegen $(am__append_1) $(am__append_3) \
++SUBDIRS = $(am__append_1) $(am__append_3) \
+ 	$(am__append_7) $(am__append_10) . $(am__append_13) tests
+ @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@noinst_DATA = gio-2.0.lib
+ @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@install_ms_lib_cmd = $(INSTALL) gio-2.0.lib $(DESTDIR)$(libdir)
 @@ -3377,7 +3377,7 @@ info: info-recursive
  
  info-am:
diff --git a/devel/glib2/patches/patch-ar b/devel/glib2/patches/patch-ar
new file mode 100644
index 00000000000..cff3aad69f9
--- /dev/null
+++ b/devel/glib2/patches/patch-ar
@@ -0,0 +1,51 @@
+$NetBSD: patch-ar,v 1.1 2012/01/29 17:43:44 drochner Exp $
+
+avoid python dependency
+
+--- gio/tests/Makefile.in.orig	2011-11-11 22:11:56.000000000 +0000
++++ gio/tests/Makefile.in
+@@ -48,17 +48,14 @@ noinst_PROGRAMS = $(am__EXEEXT_5) $(am__
+ @OS_UNIX_TRUE@	gdbus-peer gdbus-exit-on-close gdbus-non-socket \
+ @OS_UNIX_TRUE@	gdbus-bz627724 appinfo contenttype file $(NULL) \
+ @OS_UNIX_TRUE@	live-g-file desktop-app-info unix-fd \
+-@OS_UNIX_TRUE@	unix-streams gapplication gdbus-test-codegen \
++@OS_UNIX_TRUE@	unix-streams gapplication \
+ @OS_UNIX_TRUE@	$(NULL)
+ @OS_UNIX_TRUE@am__append_2 = \
+ @OS_UNIX_TRUE@	gdbus-example-unix-fd-client 		\
+-@OS_UNIX_TRUE@	gdbus-example-objectmanager-server 	\
+-@OS_UNIX_TRUE@	gdbus-example-objectmanager-client 	\
+ @OS_UNIX_TRUE@	$(NULL)
+ 
+ @OS_WIN32_TRUE@am__append_3 = win32-streams
+ @HAVE_DBUS1_TRUE@am__append_4 = gdbus-serialization
+-@OS_UNIX_TRUE@am__append_5 = gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h
+ subdir = gio/tests
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \
+@@ -96,7 +93,7 @@ am__EXEEXT_1 =
+ @OS_UNIX_TRUE@	$(am__EXEEXT_1) live-g-file$(EXEEXT) \
+ @OS_UNIX_TRUE@	desktop-app-info$(EXEEXT) unix-fd$(EXEEXT) \
+ @OS_UNIX_TRUE@	unix-streams$(EXEEXT) gapplication$(EXEEXT) \
+-@OS_UNIX_TRUE@	gdbus-test-codegen$(EXEEXT) $(am__EXEEXT_1)
++@OS_UNIX_TRUE@	$(am__EXEEXT_1)
+ @OS_WIN32_TRUE@am__EXEEXT_3 = win32-streams$(EXEEXT)
+ @HAVE_DBUS1_TRUE@am__EXEEXT_4 = gdbus-serialization$(EXEEXT)
+ am__EXEEXT_5 = io-stream$(EXEEXT) actions$(EXEEXT) \
+@@ -115,8 +112,6 @@ am__EXEEXT_5 = io-stream$(EXEEXT) action
+ 	cancellable$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \
+ 	$(am__EXEEXT_3) $(am__EXEEXT_4)
+ @OS_UNIX_TRUE@am__EXEEXT_6 = gdbus-example-unix-fd-client$(EXEEXT) \
+-@OS_UNIX_TRUE@	gdbus-example-objectmanager-server$(EXEEXT) \
+-@OS_UNIX_TRUE@	gdbus-example-objectmanager-client$(EXEEXT) \
+ @OS_UNIX_TRUE@	$(am__EXEEXT_1)
+ am__EXEEXT_7 = resolver$(EXEEXT) socket-server$(EXEEXT) \
+ 	socket-client$(EXEEXT) echo-server$(EXEEXT) httpd$(EXEEXT) \
+@@ -902,7 +897,6 @@ TEST_PROGS = io-stream actions memory-in
+ 	gdbus-addresses network-address gdbus-message socket pollable \
+ 	tls-certificate tls-interaction cancellable $(NULL) \
+ 	$(am__append_1) $(am__append_3) $(am__append_4)
+-SUBDIRS = gdbus-object-manager-example
+ INCLUDES = \
+ 	-g 			\
+ 	$(gio_INCLUDES)		\