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

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

[Nirbheek Chauhan]

commit:     310913a05dff4284b7cfd0287cb3b3011b79d42b
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 21 13:49:07 2012 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Feb 21 13:49:15 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=310913a0

dev-libs/glib, dev-util/gdbus-codegen: 2.31.16 → .18

* There's a test failure, unfortunately

---
 ...e.patch => glib-2.31-assert-test-failure.patch} |   10 ++++++----
 .../{glib-2.31.16.ebuild => glib-2.31.18.ebuild}   |    4 ++--
 ...2.31.16.ebuild => gdbus-codegen-2.31.18.ebuild} |    0
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/dev-libs/glib/files/glib-2.24-assert-test-failure.patch b/dev-libs/glib/files/glib-2.31-assert-test-failure.patch
similarity index 56%
rename from dev-libs/glib/files/glib-2.24-assert-test-failure.patch
rename to dev-libs/glib/files/glib-2.31-assert-test-failure.patch
index 6d8e74f..4259dee 100644
--- a/dev-libs/glib/files/glib-2.24-assert-test-failure.patch
+++ b/dev-libs/glib/files/glib-2.31-assert-test-failure.patch
@@ -6,14 +6,16 @@ This patch exports LD_LIBRARY_PATH before running gdb
 
 https://bugzilla.gnome.org/621368
 
----
+(updated for 2.31.18)
+
 --- tests/run-assert-msg-test.sh
 +++ tests/run-assert-msg-test.sh
-@@ -34,6 +34,7 @@ if [ -e ".libs/lt-$msg_test" ]; then
+@@ -34,7 +34,7 @@
         msg_test="lt-$msg_test"
  fi
  echo_v "Running gdb on assert-msg-test"
-+export LD_LIBRARY_PATH="`dirname $PWD`/glib/.libs:$LD_LIBRARY_PATH"
- OUT=$(gdb --batch --ex run --ex "print (char*) __glib_assert_msg" .libs/$msg_test 2> $error_out) || \
+-OUT=$(gdb --batch --ex run --ex "set print elements 0" --ex "print (char*) __glib_assert_msg" .libs/$msg_test 2> $error_out) || \
++OUT=$(libtool --mode=execute gdb --batch --ex run --ex "set print elements 0" --ex "print (char*) __glib_assert_msg" .libs/$msg_test 2> $error_out) || \
    fail "failed to run gdb"
  
+ echo_v "Checking if assert message is in __glib_assert_msg"

diff --git a/dev-libs/glib/glib-2.31.16.ebuild b/dev-libs/glib/glib-2.31.18.ebuild
similarity index 98%
rename from dev-libs/glib/glib-2.31.16.ebuild
rename to dev-libs/glib/glib-2.31.18.ebuild
index 1b0c464..9abcd49 100644
--- a/dev-libs/glib/glib-2.31.16.ebuild
+++ b/dev-libs/glib/glib-2.31.18.ebuild
@@ -69,8 +69,8 @@ src_prepare() {
 	# Fix gmodule issues on fbsd; bug #184301
 	epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
 
-	# Fix test failure when upgrading from 2.22 to 2.24, upstream bug 621368
-	epatch "${FILESDIR}/${PN}-2.24-assert-test-failure.patch"
+	# Fix test failure during upgrades, upstream bug 621368
+	epatch "${FILESDIR}/${PN}-2.31-assert-test-failure.patch"
 
 	# Do not try to remove files on live filesystem, upstream bug #619274
 	sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \

diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.31.16.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.31.18.ebuild
similarity index 100%
rename from dev-util/gdbus-codegen/gdbus-codegen-2.31.16.ebuild
rename to dev-util/gdbus-codegen/gdbus-codegen-2.31.18.ebuild