[patch] patch for glib-2.30.0.ebuild to fix tests

glib-2.30.0.ebuild.patch (text/plain), 3.79 KB, created by Alexandre Rostovtsev (RETIRED) on 2011-09-30 09:53:19 UTC

--- a/glib-2.30.0.ebuild
+++ b/glib-2.30.0.ebuild
@@ -2,9 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.0.ebuild,v 1.2 2011/09/28 11:19:21 ssuominen Exp $
 
-EAPI="4"
+EAPI="3"
+GNOME_TARBALL_SUFFIX="xz"
+PYTHON_DEPEND="utils? 2"
+# Avoid runtime dependency on python when USE=test
 
-inherit autotools gnome.org libtool eutils flag-o-matic multilib pax-utils virtualx
+inherit autotools gnome.org libtool eutils flag-o-matic multilib pax-utils python virtualx
 
 DESCRIPTION="The GLib library of C routines"
 HOMEPAGE="http://www.gtk.org/"
@@ -13,7 +16,7 @@
 
 LICENSE="LGPL-2"
 SLOT="2"
-IUSE="debug doc fam selinux +static-libs systemtap test xattr"
+IUSE="debug doc fam selinux +static-libs systemtap test utils xattr"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
 
@@ -21,7 +24,8 @@
 	virtual/libffi
 	sys-libs/zlib
 	xattr? ( sys-apps/attr )
-	fam? ( virtual/fam )"
+	fam? ( virtual/fam )
+	utils? ( >=dev-util/gdbus-codegen-2.30.0 )"
 DEPEND="${RDEPEND}
 	>=sys-devel/gettext-0.11
 	>=dev-util/gtk-doc-am-1.15
@@ -31,6 +35,7 @@
 		~app-text/docbook-xml-dtd-4.1.2 )
 	systemtap? ( >=dev-util/systemtap-1.3 )
 	test? (
+		=dev-lang/python-2*
 		>=dev-util/gdbus-codegen-2.30.0
 		>=sys-apps/dbus-1.2.14 )
 	!<dev-util/gtk-doc-1.15-r2"
@@ -38,6 +43,11 @@
 
 # XXX: Consider adding test? ( sys-devel/gdb ); assert-msg-test tries to use it
 
+pkg_setup() {
+	# Needed for gio/tests/gdbus-testserver.py
+	use test && python_set_active_version 2
+}
+
 src_prepare() {
 	mv -vf "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
 
@@ -77,6 +87,24 @@
 			sed -i -e "/desktop-app-info\/fallback/d" gio/tests/desktop-app-info.c || die
 			sed -i -e "/desktop-app-info\/lastused/d" gio/tests/desktop-app-info.c || die
 		fi
+
+		# Disable flaky gdbus/connection/life-cycle test; bug #384853
+		sed -i -e "/connection\/life-cycle/d" gio/tests/gdbus-connection.c || die
+
+		# Disable tests requiring dbus-python and pygobject; bugs #349236, #377549, #384853
+		if ! has_version dev-python/dbus-python || ! has_version 'dev-python/pygobject:2' ; then
+			ewarn "Some tests will be skipped due to dev-python/dbus-python or dev-python/pygobject:2"
+			ewarn "not being present on your system, think on installing them to get these tests run."
+			sed -i -e "/connection\/filter/d" gio/tests/gdbus-connection.c || die
+			sed -i -e "/connection\/large_message/d" gio/tests/gdbus-connection-slow.c || die
+			sed -i -e "/gdbus\/proxy/d" gio/tests/gdbus-proxy.c || die
+			sed -i -e "/gdbus\/proxy-well-known-name/d" gio/tests/gdbus-proxy-well-known-name.c || die
+			sed -i -e "/gdbus\/introspection-parser/d" gio/tests/gdbus-introspection.c || die
+			sed -i -e "/g_test_add_func/d" gio/tests/gdbus-threading.c || die
+			sed -i -e "/gdbus\/method-calls-in-thread/d" gio/tests/gdbus-threading.c || die
+			# needed to prevent gdbus-threading from asserting
+			ln -sfn $(type -P true) gio/tests/gdbus-testserver.py
+		fi
 	fi
 
 	# gdbus-codegen is a separate package
@@ -127,7 +155,8 @@
 
 src_install() {
 	local f
-	emake DESTDIR="${D}" install || die "Installation failed"
+	# install-exec-hook substitutes ${PYTHON} in glib/gtester-report
+	emake DESTDIR="${D}" PYTHON="${EPREFIX}/usr/bin/python2" install || die "Installation failed"
 
 	# Do not install charset.alias even if generated, leave it to libiconv
 	rm -f "${ED}/usr/lib/charset.alias"
@@ -195,4 +224,10 @@
 		ewarn "Using <gtk+-3.0.12:3 with ${P} results in frequent crashes."
 		ewarn "You should upgrade to a newer version of gtk+:3 immediately."
 	fi
+
+	if ! use utils && ! has_version '=dev-lang/python-2*'; then
+		elog
+		elog "If you want to use ${EPREFIX}/usr/bin/gtester-report, you will need"
+		elog "to install =dev-lang/python-2*"
+	fi
 }