[gentoo-commits] proj/gnome:gnome-next commit in: dev-util/gdbus-codegen/files/, dev-util/gdbus-codegen/

[Alexandre Restovtsev]

commit:     184b705e1722c0ea1bd351f183f3ca385aadded1
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Thu Sep  1 22:46:46 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Thu Sep  1 22:46:46 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=184b705e

dev-util/gdbus-codegen: 2.29.18 → 2.29.18-r1

Add an upstream patch that makes gdbus-codegen properly process all
interfaces when running on more than one file, and fixes a crash when
run with no arguments.

---
 .../files/gdbus-codegen-2.29.18-all-ifaces.patch   |   26 ++++++++++++++++++++
 ...9.18.ebuild => gdbus-codegen-2.29.18-r1.ebuild} |    5 +++-
 2 files changed, 30 insertions(+), 1 deletions(-)

diff --git a/dev-util/gdbus-codegen/files/gdbus-codegen-2.29.18-all-ifaces.patch b/dev-util/gdbus-codegen/files/gdbus-codegen-2.29.18-all-ifaces.patch
new file mode 100644
index 0000000..0839331
--- /dev/null
+++ b/dev-util/gdbus-codegen/files/gdbus-codegen-2.29.18-all-ifaces.patch
@@ -0,0 +1,26 @@
+From a020fbf8f6cd345c0e7cbd5eb0dae194c5dc6650 Mon Sep 17 00:00:00 2001
+From: Will Thompson <will.thompson@××××××××××××.uk>
+Date: Thu, 01 Sep 2011 18:28:57 +0000
+Subject: gdbus-codegen: post-process all interfaces when parsing >1 file
+
+This also fixes a crash when you run gdbus-codegen with no arguments.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=656323
+
+Signed-off-by: David Zeuthen <davidz@××××××.com>
+---
+diff --git a/gio/gdbus-2.0/codegen/codegen_main.py b/gio/gdbus-2.0/codegen/codegen_main.py
+index 067ac5e..76c838c 100755
+--- a/gio/gdbus-2.0/codegen/codegen_main.py
++++ b/gio/gdbus-2.0/codegen/codegen_main.py
+@@ -174,7 +174,7 @@ def codegen_main():
+     if opts.annotate != None:
+         apply_annotations(all_ifaces, opts.annotate)
+ 
+-    for i in parsed_ifaces:
++    for i in all_ifaces:
+         i.post_process(opts.interface_prefix, opts.c_namespace)
+ 
+     docbook = opts.generate_docbook
+--
+cgit v0.9.0.2

diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.29.18.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.29.18-r1.ebuild
similarity index 91%
rename from dev-util/gdbus-codegen/gdbus-codegen-2.29.18.ebuild
rename to dev-util/gdbus-codegen/gdbus-codegen-2.29.18-r1.ebuild
index a46d52d..d93a724 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.29.18.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.29.18-r1.ebuild
@@ -8,7 +8,7 @@ GNOME_TARBALL_SUFFIX="xz"
 PYTHON_DEPEND="2:2.5"
 PYTHON_USE_WITH="xml"
 
-inherit gnome.org multilib python
+inherit eutils gnome.org multilib python
 
 DESCRIPTION="GDBus code and documentation generator"
 
@@ -36,6 +36,9 @@ src_prepare() {
 		-i gdbus-codegen.in || die "sed gdbus-codegen.in failed"
 	sed -e "s:\"/usr/local\":\"${EPREFIX}/usr\":" \
 		-i config.py || die "sed config.py failed"
+
+	# Process all interfaces when running on >1 file; will be in next release
+	epatch "${FILESDIR}/${P}-all-ifaces.patch"
 }
 
 pkg_setup() {