[gentoo-commits] proj/gnome:gnome-next commit in: dev-libs/glib/files/, dev-libs/glib/

[Alexandre Restovtsev]

commit:     3ac8f4cc84f91a0e13c382c6b7f8f866709d0376
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Aug 30 18:12:53 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Aug 30 18:12:53 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3ac8f4cc

dev-libs/glib: 2.29.16-r1 → 2.29.18

Version bump, now with a new wallclock API.

---
 ...h => glib-2.29.18-external-gdbus-codegen.patch} |   50 +++++++++++---------
 ...{glib-2.29.16-r1.ebuild => glib-2.29.18.ebuild} |    4 +-
 dev-libs/glib/glib-9999.ebuild                     |    4 +-
 3 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/dev-libs/glib/files/glib-2.29.16-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.29.18-external-gdbus-codegen.patch
similarity index 61%
rename from dev-libs/glib/files/glib-2.29.16-external-gdbus-codegen.patch
rename to dev-libs/glib/files/glib-2.29.18-external-gdbus-codegen.patch
index 6f38bf8..abec0dd 100644
--- a/dev-libs/glib/files/glib-2.29.16-external-gdbus-codegen.patch
+++ b/dev-libs/glib/files/glib-2.29.18-external-gdbus-codegen.patch
@@ -1,4 +1,4 @@
-From 995d2ce4854fd95079f87ba20307c092398cfca3 Mon Sep 17 00:00:00 2001
+From 89a3234d52451cadb21c322931adb6e8928eb21d Mon Sep 17 00:00:00 2001
 From: Alexandre Rostovtsev <tetromino@×××××.com>
 Date: Wed, 24 Aug 2011 21:35:59 -0400
 Subject: [PATCH] Use an external gdbus-codegen package
@@ -7,12 +7,12 @@ Subject: [PATCH] Use an external gdbus-codegen package
  configure.ac                                       |    4 +---
  docs/reference/gio/Makefile.am                     |    3 +--
  gio/Makefile.am                                    |    2 +-
- gio/tests/Makefile.am                              |    2 +-
- gio/tests/gdbus-object-manager-example/Makefile.am |    2 +-
- 5 files changed, 5 insertions(+), 8 deletions(-)
+ gio/tests/Makefile.am                              |    4 +---
+ gio/tests/gdbus-object-manager-example/Makefile.am |    4 +---
+ 5 files changed, 5 insertions(+), 12 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 5ef55ce..3f16710 100644
+index dc23b8b..0bb0c4a 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -365,7 +365,7 @@ fi
@@ -24,12 +24,12 @@ index 5ef55ce..3f16710 100644
  
  
  dnl ***********************
-@@ -3841,8 +3841,6 @@ gobject/tests/Makefile
+@@ -3858,8 +3858,6 @@ gobject/tests/Makefile
  gthread/Makefile
  gthread/tests/Makefile
  gio/Makefile
--gio/gdbus-codegen/Makefile
--gio/gdbus-codegen/config.py
+-gio/gdbus-2.0/codegen/Makefile
+-gio/gdbus-2.0/codegen/config.py
  gio/xdgmime/Makefile
  gio/inotify/Makefile
  gio/libasyncns/Makefile
@@ -48,44 +48,48 @@ index 9eb0fce..511aec9 100644
  if ENABLE_MAN
  
 diff --git a/gio/Makefile.am b/gio/Makefile.am
-index 0a127a6..d4a08e5 100644
+index 7803bb2..d4a08e5 100644
 --- a/gio/Makefile.am
 +++ b/gio/Makefile.am
 @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl
  
  NULL =
  
--SUBDIRS = gdbus-codegen
+-SUBDIRS = gdbus-2.0/codegen
 +SUBDIRS =
  
  if OS_UNIX
  SUBDIRS += libasyncns xdgmime
 diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
-index 45cbe37..5370aa1 100644
+index a85ea4f..8fbe8ec 100644
 --- a/gio/tests/Makefile.am
 +++ b/gio/tests/Makefile.am
-@@ -260,7 +260,7 @@ gdbus_bz627724_LDADD = $(progs_ldadd)
+@@ -261,9 +261,7 @@ gdbus_bz627724_LDADD = $(progs_ldadd)
  
  if OS_UNIX
  gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : test-codegen.xml
--	$(AM_V_GEN) PYTHONPATH=$(top_srcdir)/gio/gdbus-codegen:$(top_builddir)/gio/gdbus-codegen:$$PYTHONPATH $(PYTHON) $(top_srcdir)/gio/gdbus-codegen/codegen_main.py	 	\
+-	$(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
+-		UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
+-		$(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
 +	$(AM_V_GEN) gdbus-codegen \
- 		--interface-prefix org.project.								\
- 		--generate-c-code gdbus-test-codegen-generated						\
- 		--c-generate-object-manager								\
+ 		--interface-prefix org.project. \
+ 		--generate-c-code gdbus-test-codegen-generated \
+ 		--c-generate-object-manager \
 diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am
-index 3ca56c6..52e7f3d 100644
+index 5e6eb9a..8b16926 100644
 --- a/gio/tests/gdbus-object-manager-example/Makefile.am
 +++ b/gio/tests/gdbus-object-manager-example/Makefile.am
-@@ -22,7 +22,7 @@ GDBUS_GENERATED = 										\
+@@ -22,9 +22,7 @@ GDBUS_GENERATED = 										\
  	$(NULL)
  
  $(GDBUS_GENERATED) : gdbus-example-objectmanager.xml
--	$(AM_V_GEN) PYTHONPATH=$(top_srcdir)/gio/gdbus-codegen:$(top_builddir)/gio/gdbus-codegen:$$PYTHONPATH $(PYTHON) $(top_srcdir)/gio/gdbus-codegen/codegen_main.py	 	\
+-	$(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
+-		UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
+-		$(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
 +	$(AM_V_GEN) gdbus-codegen \
- 		--interface-prefix org.gtk.GDBus.Example.ObjectManager.		\
- 		--c-namespace Example 						\
- 		--c-generate-object-manager					\
+ 		--interface-prefix org.gtk.GDBus.Example.ObjectManager. \
+ 		--c-namespace Example \
+ 		--c-generate-object-manager \
 -- 
-1.7.6
+1.7.6.1
 

diff --git a/dev-libs/glib/glib-2.29.16-r1.ebuild b/dev-libs/glib/glib-2.29.18.ebuild
similarity index 98%
rename from dev-libs/glib/glib-2.29.16-r1.ebuild
rename to dev-libs/glib/glib-2.29.18.ebuild
index f439e87..d9a1261 100644
--- a/dev-libs/glib/glib-2.29.16-r1.ebuild
+++ b/dev-libs/glib/glib-2.29.18.ebuild
@@ -37,7 +37,7 @@ DEPEND="${RDEPEND}
 		~app-text/docbook-xml-dtd-4.1.2 )
 	systemtap? ( >=dev-util/systemtap-1.3 )
 	test? (
-		dev-util/gdbus-codegen
+		>=dev-util/gdbus-codegen-2.29.18
 		>=sys-apps/dbus-1.2.14 )
 	!<dev-util/gtk-doc-1.15-r2"
 PDEPEND="introspection? ( dev-libs/gobject-introspection )
@@ -88,7 +88,7 @@ src_prepare() {
 	fi
 
 	# gdbus-codegen is a separate package
-	epatch "${FILESDIR}/${PN}-2.29.16-external-gdbus-codegen.patch"
+	epatch "${FILESDIR}/${PN}-2.29.18-external-gdbus-codegen.patch"
 
 	# disable pyc compiling
 	ln -sfn $(type -P true) py-compile

diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-9999.ebuild
index f439e87..d9a1261 100644
--- a/dev-libs/glib/glib-9999.ebuild
+++ b/dev-libs/glib/glib-9999.ebuild
@@ -37,7 +37,7 @@ DEPEND="${RDEPEND}
 		~app-text/docbook-xml-dtd-4.1.2 )
 	systemtap? ( >=dev-util/systemtap-1.3 )
 	test? (
-		dev-util/gdbus-codegen
+		>=dev-util/gdbus-codegen-2.29.18
 		>=sys-apps/dbus-1.2.14 )
 	!<dev-util/gtk-doc-1.15-r2"
 PDEPEND="introspection? ( dev-libs/gobject-introspection )
@@ -88,7 +88,7 @@ src_prepare() {
 	fi
 
 	# gdbus-codegen is a separate package
-	epatch "${FILESDIR}/${PN}-2.29.16-external-gdbus-codegen.patch"
+	epatch "${FILESDIR}/${PN}-2.29.18-external-gdbus-codegen.patch"
 
 	# disable pyc compiling
 	ln -sfn $(type -P true) py-compile