From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1S1JEu-0007ZR-H6 for garchives@archives.gentoo.org; Sat, 25 Feb 2012 15:08:48 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 33677E0C1D; Sat, 25 Feb 2012 15:08:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E28ACE0C1C for ; Sat, 25 Feb 2012 15:08:35 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2CE291B4012 for ; Sat, 25 Feb 2012 15:08:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id DFDF3E53FF for ; Sat, 25 Feb 2012 15:08:33 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: <1330182481.13f20d4eb802367831b70748259e49555f0b863b.nirbheek@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: dev-libs/glib/files/, dev-libs/glib/ X-VCS-Repository: proj/gnome X-VCS-Files: dev-libs/glib/files/glib-2.31-assert-test-failure.patch dev-libs/glib/glib-2.31.18.ebuild dev-libs/glib/glib-9999.ebuild X-VCS-Directories: dev-libs/glib/files/ dev-libs/glib/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: 13f20d4eb802367831b70748259e49555f0b863b X-VCS-Branch: master Date: Sat, 25 Feb 2012 15:08:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 64ff485b-eb53-463f-b68a-6e99aba0fa2f X-Archives-Hash: fac6511cc159f7fc115b3693bf35e9f7 commit: 13f20d4eb802367831b70748259e49555f0b863b Author: Nirbheek Chauhan gentoo org> AuthorDate: Sat Feb 25 14:17:56 2012 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Sat Feb 25 15:08:01 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D13f20d4e dev-libs/glib: fix 9999 build issue reported by Robin Kauffman --- .../glib/files/glib-2.31-assert-test-failure.patch | 26 +++++++++++++-= ------ dev-libs/glib/glib-2.31.18.ebuild | 12 ++++++++- dev-libs/glib/glib-9999.ebuild | 14 ++++++---- 3 files changed, 36 insertions(+), 16 deletions(-) diff --git a/dev-libs/glib/files/glib-2.31-assert-test-failure.patch b/de= v-libs/glib/files/glib-2.31-assert-test-failure.patch index 4259dee..a272d0e 100644 --- a/dev-libs/glib/files/glib-2.31-assert-test-failure.patch +++ b/dev-libs/glib/files/glib-2.31-assert-test-failure.patch @@ -1,16 +1,21 @@ -Tests fail when upgrading glib from 2.22 to 2.24 if sys-devel/gdb is ins= talled -because gdb is run on .libs/assert-msg-test before LD_LIBRARY_PATH is se= t. This -causes gdb to use the system-wide glib instead, and fail on the test. +From cf9e76b19482cf494798c24ffe904485a36a0b19 Mon Sep 17 00:00:00 2001 +From: Nirbheek Chauhan +Date: Tue, 21 Feb 2012 19:42:22 +0530 +Subject: [PATCH] [tests] Run gdb under libtool so that local libraries a= re used =20 -This patch exports LD_LIBRARY_PATH before running gdb +If this isn't done, the system-wide glib is used for this test, +and that can cause test failures. =20 https://bugzilla.gnome.org/621368 +--- + tests/run-assert-msg-test.sh | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) =20 -(updated for 2.31.18) - ---- tests/run-assert-msg-test.sh -+++ tests/run-assert-msg-test.sh -@@ -34,7 +34,7 @@ +diff --git a/tests/run-assert-msg-test.sh b/tests/run-assert-msg-test.sh +index 194481e..b6045d6 100755 +--- a/tests/run-assert-msg-test.sh ++++ b/tests/run-assert-msg-test.sh +@@ -34,7 +34,7 @@ if [ -e ".libs/lt-$msg_test" ]; then msg_test=3D"lt-$msg_test" fi echo_v "Running gdb on assert-msg-test" @@ -19,3 +24,6 @@ https://bugzilla.gnome.org/621368 fail "failed to run gdb" =20 echo_v "Checking if assert message is in __glib_assert_msg" +--=20 +1.7.3.4 + diff --git a/dev-libs/glib/glib-2.31.18.ebuild b/dev-libs/glib/glib-2.31.= 18.ebuild index 9abcd49..a09e59f 100644 --- a/dev-libs/glib/glib-2.31.18.ebuild +++ b/dev-libs/glib/glib-2.31.18.ebuild @@ -7,6 +7,9 @@ PYTHON_DEPEND=3D"utils? 2" # Avoid runtime dependency on python when USE=3Dtest =20 inherit autotools gnome.org libtool eutils flag-o-matic multilib pax-uti= ls python virtualx +if [[ ${PV} =3D 9999 ]]; then + inherit gnome2-live +fi =20 DESCRIPTION=3D"The GLib library of C routines" HOMEPAGE=3D"http://www.gtk.org/" @@ -16,7 +19,11 @@ SRC_URI=3D"${SRC_URI} LICENSE=3D"LGPL-2" SLOT=3D"2" IUSE=3D"debug doc fam selinux +static-libs systemtap test utils xattr" -KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390= ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux" +if [[ ${PV} =3D 9999 ]]; then + KEYWORDS=3D"" +else + KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s39= 0 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux" +fi =20 RDEPEND=3D"virtual/libiconv virtual/libffi @@ -51,6 +58,7 @@ pkg_setup() { } =20 src_prepare() { + [[ ${PV} =3D 9999 ]] && gnome2-live_src_prepare mv -vf "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die =20 if use ia64 ; then @@ -173,6 +181,8 @@ src_install() { # Don't install gdb python macros, bug 291328 rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/" =20 + # This is there for git snapshots and the live ebuild, bug 351966 + [[ ${PV} =3D 9999 ]] && { emake README || die "emake README failed"; } dodoc AUTHORS ChangeLog* NEWS* README =20 insinto /usr/share/bash-completion diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-9999.ebu= ild index 39fc4ec..a09e59f 100644 --- a/dev-libs/glib/glib-9999.ebuild +++ b/dev-libs/glib/glib-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.2.ebuild,v 1.= 2 2011/11/14 19:06:22 tetromino Exp $ =20 EAPI=3D"4" PYTHON_DEPEND=3D"utils? 2" @@ -37,6 +37,7 @@ DEPEND=3D"${RDEPEND} >=3Ddev-util/gtk-doc-am-1.15 doc? ( >=3Ddev-libs/libxslt-1.0 + >=3Ddev-util/gdbus-codegen-${PV} >=3Ddev-util/gtk-doc-1.15 ~app-text/docbook-xml-dtd-4.1.2 ) systemtap? ( >=3Ddev-util/systemtap-1.3 ) @@ -76,14 +77,15 @@ src_prepare() { # Fix gmodule issues on fbsd; bug #184301 epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch =20 - # Fix test failure when upgrading from 2.22 to 2.24, upstream bug 62136= 8 - 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" =20 # Do not try to remove files on live filesystem, upstream bug #619274 sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \ -i "${S}"/gio/tests/desktop-app-info.c || die "sed failed" =20 - if ! use test; then + # need to build tests if USE=3Ddoc for bug #387385 + if ! use test && ! use doc; then # don't waste time building tests sed 's/^\(.*\SUBDIRS .*\=3D.*\)tests\(.*\)$/\1\2/' -i $(find . -name M= akefile.am -o -name Makefile.in) || die else @@ -180,7 +182,7 @@ src_install() { rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/" =20 # This is there for git snapshots and the live ebuild, bug 351966 - emake README || die "emake README failed" + [[ ${PV} =3D 9999 ]] && { emake README || die "emake README failed"; } dodoc AUTHORS ChangeLog* NEWS* README =20 insinto /usr/share/bash-completion @@ -191,7 +193,7 @@ src_install() { =20 # Completely useless with or without USE static-libs, people need to us= e # pkg-config - find "${E}" -name '*.la' -exec rm -f {} + + find "${D}" -name '*.la' -exec rm -f {} + } =20 src_test() {