From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C276B138247 for ; Sun, 24 Nov 2013 19:34:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 577ACE09C5; Sun, 24 Nov 2013 19:34:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 895E3E09AA for ; Sun, 24 Nov 2013 19:34:30 +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 7173733F385 for ; Sun, 24 Nov 2013 19:34:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 376A519002B for ; Sun, 24 Nov 2013 19:34:27 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1385320571.1b55928304378a14ae0206974d7c91d59c01f68c.eva@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.12.12-fbsd.patch dev-libs/glib/files/glib-2.32.4-bashcomp.patch dev-libs/glib/files/glib-2.34.0-testsuite-skip-gdbus-auth-tests.patch dev-libs/glib/files/glib-2.34.0-testsuite-skip-thread4.patch dev-libs/glib/files/glib-2.35.x-external-gdbus-codegen.patch dev-libs/glib/files/glib-2.36.4-znodelete.patch dev-libs/glib/files/glib-2.37.x-external-gdbus-codegen.patch dev-libs/glib/glib-2.35.8.ebuild dev-libs/glib/glib-2.38.2.ebuild dev-libs/glib/glib-9999.ebuild X-VCS-Directories: dev-libs/glib/files/ dev-libs/glib/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 1b55928304378a14ae0206974d7c91d59c01f68c X-VCS-Branch: master Date: Sun, 24 Nov 2013 19:34:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 440e8b3f-8eff-452f-8a1e-ae58a24ec331 X-Archives-Hash: 8ddd6199eb84a91e7ff4eca9f56cd8f1 commit: 1b55928304378a14ae0206974d7c91d59c01f68c Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sun Nov 24 18:04:08 2013 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sun Nov 24 19:16:11 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1b559283 dev-libs/glib: 2.36.4-r1 → 2.38.2 --- dev-libs/glib/files/glib-2.12.12-fbsd.patch | 24 ++- dev-libs/glib/files/glib-2.32.4-bashcomp.patch | 27 --- ...ib-2.34.0-testsuite-skip-gdbus-auth-tests.patch | 62 ------- .../files/glib-2.34.0-testsuite-skip-thread4.patch | 16 +- dev-libs/glib/files/glib-2.36.4-znodelete.patch | 65 +++++++ ...ch => glib-2.37.x-external-gdbus-codegen.patch} | 41 +++-- .../{glib-2.35.8.ebuild => glib-2.38.2.ebuild} | 196 ++++++++++----------- dev-libs/glib/glib-9999.ebuild | 173 ++++++++++-------- 8 files changed, 307 insertions(+), 297 deletions(-) diff --git a/dev-libs/glib/files/glib-2.12.12-fbsd.patch b/dev-libs/glib/files/glib-2.12.12-fbsd.patch index bba6329..5aca695 100644 --- a/dev-libs/glib/files/glib-2.12.12-fbsd.patch +++ b/dev-libs/glib/files/glib-2.12.12-fbsd.patch @@ -1,7 +1,18 @@ -diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN glib-2.12.12.orig/gmodule/gmodule-dl.c glib-2.12.12/gmodule/gmodule-dl.c ---- glib-2.12.12.orig/gmodule/gmodule-dl.c 2007-05-01 19:12:40.000000000 -0400 -+++ glib-2.12.12/gmodule/gmodule-dl.c 2007-07-05 20:10:51.000000000 -0400 -@@ -106,6 +106,7 @@ _g_module_open (const gchar *file_name, +From deeb71226d4ab465d48805d899ec88eb836a6966 Mon Sep 17 00:00:00 2001 +From: Daniel Gryniewicz +Date: Sun, 24 Nov 2013 19:46:13 +0100 +Subject: [PATCH 1/4] Fix gmodule issue on FreeBSD + +Gentoo bug #184301, Gnome bug #107626. +--- + gmodule/gmodule-dl.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/gmodule/gmodule-dl.c b/gmodule/gmodule-dl.c +index a606f17..57fc41b 100644 +--- a/gmodule/gmodule-dl.c ++++ b/gmodule/gmodule-dl.c +@@ -107,6 +107,7 @@ _g_module_open (const gchar *file_name, static gpointer _g_module_self (void) { @@ -9,7 +20,7 @@ diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN glib-2.12.12.orig/gmodul gpointer handle; /* to query symbols from the program itself, special link options -@@ -117,6 +118,9 @@ _g_module_self (void) +@@ -122,6 +123,9 @@ _g_module_self (void) g_module_set_error (fetch_dlerror (TRUE)); return handle; @@ -19,3 +30,6 @@ diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN glib-2.12.12.orig/gmodul } static void +-- +1.8.3.2 + diff --git a/dev-libs/glib/files/glib-2.32.4-bashcomp.patch b/dev-libs/glib/files/glib-2.32.4-bashcomp.patch deleted file mode 100644 index 33abffc..0000000 --- a/dev-libs/glib/files/glib-2.32.4-bashcomp.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 6d032421b4871105e1f37bb75a5ec7b012f19f61 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Sun, 15 Jul 2012 22:30:07 -0400 -Subject: [PATCH] gio: use /usr/share/bash-completion for bashcomp - -In Gentoo, we use /usr/share/bash-completion, not -/usr/share/bash-completion/completions. ---- - gio/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/gio/Makefile.am b/gio/Makefile.am -index 704367c..bee9dc6 100644 ---- a/gio/Makefile.am -+++ b/gio/Makefile.am -@@ -715,7 +715,7 @@ gdbus_LDADD = libgio-2.0.la \ - $(top_builddir)/glib/libglib-2.0.la \ - $(top_builddir)/gobject/libgobject-2.0.la - --completiondir = $(datadir)/bash-completion/completions -+completiondir = $(datadir)/bash-completion - completion_DATA = \ - completion/gdbus \ - completion/gsettings \ --- -1.7.8.6 - diff --git a/dev-libs/glib/files/glib-2.34.0-testsuite-skip-gdbus-auth-tests.patch b/dev-libs/glib/files/glib-2.34.0-testsuite-skip-gdbus-auth-tests.patch deleted file mode 100644 index aff75cb..0000000 --- a/dev-libs/glib/files/glib-2.34.0-testsuite-skip-gdbus-auth-tests.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 6e6aa7de746b78bc5fc6d2cad1cac762f6d2205f Mon Sep 17 00:00:00 2001 -From: Priit Laes -Date: Tue, 3 Jul 2012 12:50:44 +0300 -Subject: [PATCH] Gentoo: skip over gdbus-auth /gdbus/auth/*/DBUS_COOKIE_SHA1 - tests - -https://bugzilla.gnome.org/show_bug.cgi?id=679308 ---- - gio/tests/gdbus-auth.c | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -diff --git a/gio/tests/gdbus-auth.c b/gio/tests/gdbus-auth.c -index 737770e..9f42c24 100644 ---- a/gio/tests/gdbus-auth.c -+++ b/gio/tests/gdbus-auth.c -@@ -89,11 +89,14 @@ auth_client_external (void) - auth_client_mechanism ("EXTERNAL"); - } - -+#if 0 -+// https://bugzilla.gnome.org/show_bug.cgi?id=679308 - static void - auth_client_dbus_cookie_sha1 (void) - { - auth_client_mechanism ("DBUS_COOKIE_SHA1"); - } -+#endif - - /* ---------------------------------------------------------------------------------------------------- */ - -@@ -250,11 +253,13 @@ auth_server_external (void) - auth_server_mechanism ("EXTERNAL"); - } - -+#if 0 - static void - auth_server_dbus_cookie_sha1 (void) - { - auth_server_mechanism ("DBUS_COOKIE_SHA1"); - } -+#endif - - /* ---------------------------------------------------------------------------------------------------- */ - -@@ -272,10 +277,14 @@ main (int argc, - session_bus_up (); - - g_test_add_func ("/gdbus/auth/client/EXTERNAL", auth_client_external); -+#if 0 - g_test_add_func ("/gdbus/auth/client/DBUS_COOKIE_SHA1", auth_client_dbus_cookie_sha1); -+#endif - g_test_add_func ("/gdbus/auth/server/ANONYMOUS", auth_server_anonymous); - g_test_add_func ("/gdbus/auth/server/EXTERNAL", auth_server_external); -+#if 0 - g_test_add_func ("/gdbus/auth/server/DBUS_COOKIE_SHA1", auth_server_dbus_cookie_sha1); -+#endif - - ret = g_test_run(); - --- -1.7.8.6 - diff --git a/dev-libs/glib/files/glib-2.34.0-testsuite-skip-thread4.patch b/dev-libs/glib/files/glib-2.34.0-testsuite-skip-thread4.patch index f409094..584b56f 100644 --- a/dev-libs/glib/files/glib-2.34.0-testsuite-skip-thread4.patch +++ b/dev-libs/glib/files/glib-2.34.0-testsuite-skip-thread4.patch @@ -1,15 +1,15 @@ -From 8a8112aad6dc98aaaf9767b31e48f5ae8fabd858 Mon Sep 17 00:00:00 2001 +From 4881b5d303512208b55f5bf78b91cd6a85e5034c Mon Sep 17 00:00:00 2001 From: Priit Laes Date: Tue, 3 Jul 2012 11:21:56 +0300 -Subject: [PATCH] Gentoo: skip over thread/thread4 test failure +Subject: [PATCH 2/4] Gentoo: skip over thread/thread4 test failure https://bugzilla.gnome.org/show_bug.cgi?id=679306 --- - glib/tests/thread.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) + glib/tests/thread.c | 5 +++++ + 1 file changed, 5 insertions(+) diff --git a/glib/tests/thread.c b/glib/tests/thread.c -index 29b3850..ffe8087 100644 +index 539782e..179ec06 100644 --- a/glib/tests/thread.c +++ b/glib/tests/thread.c @@ -124,6 +124,8 @@ test_thread3 (void) @@ -21,7 +21,7 @@ index 29b3850..ffe8087 100644 /* test that thread creation fails as expected, * by setting RLIMIT_NPROC ridiculously low */ -@@ -152,6 +154,7 @@ test_thread4 (void) +@@ -158,6 +160,7 @@ test_thread4 (void) g_error ("resetting RLIMIT_NPROC failed: %s\n", g_strerror (ret)); #endif } @@ -29,7 +29,7 @@ index 29b3850..ffe8087 100644 static void test_thread5 (void) -@@ -195,7 +198,9 @@ main (int argc, char *argv[]) +@@ -203,7 +206,9 @@ main (int argc, char *argv[]) g_test_add_func ("/thread/thread1", test_thread1); g_test_add_func ("/thread/thread2", test_thread2); g_test_add_func ("/thread/thread3", test_thread3); @@ -40,5 +40,5 @@ index 29b3850..ffe8087 100644 g_test_add_func ("/thread/thread6", test_thread6); -- -1.7.8.6 +1.8.3.2 diff --git a/dev-libs/glib/files/glib-2.36.4-znodelete.patch b/dev-libs/glib/files/glib-2.36.4-znodelete.patch new file mode 100644 index 0000000..b936fbd --- /dev/null +++ b/dev-libs/glib/files/glib-2.36.4-znodelete.patch @@ -0,0 +1,65 @@ +From 196ea5ab614e5357da48acf73a373f103e61ee0b Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev +Date: Mon, 2 Sep 2013 13:59:18 -0400 +Subject: [PATCH 4/4] gobject: try to link with -Wl,-z,nodelete + +Since the type system does not support reloading its data and assumes +that libgobject remains loaded for the lifetime of the process, we +should link libgobject with a flag indicating that it can't be unloaded. + +https://bugzilla.gnome.org/show_bug.cgi?id=707298 +--- + configure.ac | 24 ++++++++++++++++++++++++ + gobject/Makefile.am | 1 + + 2 files changed, 25 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 907c534..266c45d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3669,6 +3669,30 @@ fi + AC_SUBST(GLIB_LINK_FLAGS) + + dnl ++dnl Check for -z,nodelete linker flag: the type system assumes that ++dnl libgobject stays loaded for the lifetime of the process ++dnl ++ ++AC_ARG_ENABLE([znodelete], ++ [AS_HELP_STRING([--disable-znodelete], ++ [avoid linking with -z,nodelete])],, ++ [SAVED_LDFLAGS="${LDFLAGS}" ++ AC_MSG_CHECKING([for -z,nodelete linker flag]) ++ LDFLAGS=-Wl,-z,nodelete ++ AC_TRY_LINK([], [int main (void) { return 0; }], ++ AC_MSG_RESULT(yes) ++ enable_znodelete=yes, ++ AC_MSG_RESULT(no) ++ enable_znodelete=no) ++ LDFLAGS="${SAVED_LDFLAGS}"]) ++ ++if test "x${enable_znodelete}" = "xyes"; then ++ GOBJECT_LINK_FLAGS=-Wl,-z,nodelete ++fi ++ ++AC_SUBST(GOBJECT_LINK_FLAGS) ++ ++dnl + dnl Check for -fvisibility=hidden to determine if we can do GNU-style + dnl visibility attributes for symbol export control + dnl +diff --git a/gobject/Makefile.am b/gobject/Makefile.am +index 1509616..181ad7d 100644 +--- a/gobject/Makefile.am ++++ b/gobject/Makefile.am +@@ -45,6 +45,7 @@ endif + + libgobjectincludedir = $(includedir)/glib-2.0/gobject + libgobject_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \ ++ $(GOBJECT_LINK_FLAGS) \ + $(gobject_win32_res_ldflag) \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ + -export-dynamic $(no_undefined) +-- +1.8.3.2 + diff --git a/dev-libs/glib/files/glib-2.35.x-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.37.x-external-gdbus-codegen.patch similarity index 78% rename from dev-libs/glib/files/glib-2.35.x-external-gdbus-codegen.patch rename to dev-libs/glib/files/glib-2.37.x-external-gdbus-codegen.patch index a7fb019..f87c146 100644 --- a/dev-libs/glib/files/glib-2.35.x-external-gdbus-codegen.patch +++ b/dev-libs/glib/files/glib-2.37.x-external-gdbus-codegen.patch @@ -1,7 +1,7 @@ -From 4a74adf19d7e46aef7c9ede87ffb0264193311dc Mon Sep 17 00:00:00 2001 +From 81f037771e2992834961cb5db08aece53a02b8ae Mon Sep 17 00:00:00 2001 From: Priit Laes Date: Thu, 28 Feb 2013 08:28:01 +0200 -Subject: [PATCH] Split out gdbus codegen +Subject: [PATCH 3/4] Split out gdbus codegen --- configure.ac | 17 ++++++++--------- @@ -12,10 +12,10 @@ Subject: [PATCH] Split out gdbus codegen 5 files changed, 14 insertions(+), 20 deletions(-) diff --git a/configure.ac b/configure.ac -index f734b7c..8076e7f 100644 +index 797cb92..907c534 100644 --- a/configure.ac +++ b/configure.ac -@@ -374,14 +374,14 @@ AC_SUBST(PERL_PATH) +@@ -378,14 +378,14 @@ AC_SUBST(PERL_PATH) # option to specify python interpreter to use; this just sets $PYTHON, so that # we will fallback to reading $PYTHON if --with-python is not given, and # python.m4 will get the expected input @@ -38,7 +38,7 @@ index f734b7c..8076e7f 100644 dnl *********************** -@@ -3697,7 +3697,6 @@ gobject/glib-mkenums +@@ -3784,7 +3784,6 @@ gobject/glib-mkenums gobject/tests/Makefile gthread/Makefile gio/Makefile @@ -47,10 +47,10 @@ index f734b7c..8076e7f 100644 gio/gnetworking.h gio/xdgmime/Makefile diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am -index 99606d3..067cd50 100644 +index 112626b..8ddcdbc 100644 --- a/docs/reference/gio/Makefile.am +++ b/docs/reference/gio/Makefile.am -@@ -152,8 +152,7 @@ man_MANS += \ +@@ -151,8 +151,7 @@ man_MANS += \ glib-compile-resources.1 \ gsettings.1 \ gresource.1 \ @@ -61,12 +61,11 @@ index 99606d3..067cd50 100644 XSLTPROC_FLAGS = \ --nonet \ diff --git a/gio/Makefile.am b/gio/Makefile.am -index 94d7f59..c07d00d 100644 +index 717419f..808b5dd 100644 --- a/gio/Makefile.am +++ b/gio/Makefile.am -@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl - - NULL = +@@ -1,6 +1,6 @@ + include $(top_srcdir)/glib.mk -SUBDIRS = gdbus-2.0/codegen +SUBDIRS = @@ -74,28 +73,28 @@ index 94d7f59..c07d00d 100644 if OS_UNIX SUBDIRS += xdgmime diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am -index c8a4090..feece02 100644 +index 7224124..5c8baaa 100644 --- a/gio/tests/Makefile.am +++ b/gio/tests/Makefile.am -@@ -212,10 +212,8 @@ gdbus_bz627724_SOURCES = gdbus-bz627724.c gdbus-sessionbus.c gdbus-sessionbus.h - gdbus_close_pending_SOURCES = gdbus-close-pending.c gdbus-sessionbus.c gdbus-sessionbus.h gdbus-tests.h gdbus-tests.c +@@ -359,10 +359,8 @@ gmenumodel_SOURCES = $(gdbus_sessionbus_sources) gmenumode + nodist_gdbus_test_codegen_SOURCES = gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h - if OS_UNIX --gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen + gdbus-test-codegen.o: gdbus-test-codegen-generated.h +-gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen - $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \ - UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \ - $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \ -+gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : test-codegen.xml Makefile ++gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c: test-codegen.xml Makefile + $(AM_V_GEN) gdbus-codegen \ --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 6875210..264c3c1 100644 +index d6d1412..62ef706 100644 --- a/gio/tests/gdbus-object-manager-example/Makefile.am +++ b/gio/tests/gdbus-object-manager-example/Makefile.am -@@ -21,10 +21,8 @@ GDBUS_GENERATED = \ - gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml \ +@@ -11,10 +11,8 @@ GDBUS_GENERATED = \ + gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml \ $(NULL) -$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen @@ -108,5 +107,5 @@ index 6875210..264c3c1 100644 --c-namespace Example \ --c-generate-object-manager \ -- -1.8.1.2 +1.8.3.2 diff --git a/dev-libs/glib/glib-2.35.8.ebuild b/dev-libs/glib/glib-2.38.2.ebuild similarity index 60% rename from dev-libs/glib/glib-2.35.8.ebuild rename to dev-libs/glib/glib-2.38.2.ebuild index 1d7a2ae..6533ac6 100644 --- a/dev-libs/glib/glib-2.35.8.ebuild +++ b/dev-libs/glib/glib-2.38.2.ebuild @@ -3,38 +3,42 @@ # $Header: $ EAPI="5" -PYTHON_DEPEND="utils? 2" +PYTHON_COMPAT=( python2_{6,7} ) # Avoid runtime dependency on python when USE=test -inherit autotools gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python toolchain-funcs virtualx linux-info -if [[ ${PV} = 9999 ]]; then - inherit gnome2-live -fi +inherit autotools bash-completion-r1 gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python-r1 toolchain-funcs versionator virtualx linux-info multilib-minimal DESCRIPTION="The GLib library of C routines" HOMEPAGE="http://www.gtk.org/" SRC_URI="${SRC_URI} - http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz" # pkg.m4 for eautoreconf + http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf LICENSE="LGPL-2+" SLOT="2" IUSE="debug fam kernel_linux selinux static-libs systemtap test utils xattr" -if [[ ${PV} = 9999 ]]; then - IUSE="${IUSE} doc" - KEYWORDS="" -else - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" -fi - -RDEPEND="virtual/libiconv - virtual/libffi - sys-libs/zlib +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" + +# FIXME: want libselinux[${MULTILIB_USEDEP}] - bug #480960 +RDEPEND=" + virtual/libiconv[${MULTILIB_USEDEP}] + virtual/libffi[${MULTILIB_USEDEP}] + sys-libs/zlib[${MULTILIB_USEDEP}] || ( >=dev-libs/elfutils-0.142 - >=dev-libs/libelf-0.8.12 ) - xattr? ( sys-apps/attr ) - fam? ( virtual/fam ) - utils? ( >=dev-util/gdbus-codegen-${PV} )" + >=dev-libs/libelf-0.8.12 + >=sys-freebsd/freebsd-lib-9.2_rc1 + ) + selinux? ( sys-libs/libselinux ) + xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] ) + fam? ( virtual/fam[${MULTILIB_USEDEP}] ) + utils? ( + ${PYTHON_DEPS} + >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] ) + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + ) +" DEPEND="${RDEPEND} app-text/docbook-xml-dtd:4.1.2 >=dev-libs/libxslt-1.0 @@ -43,46 +47,39 @@ DEPEND="${RDEPEND} systemtap? ( >=dev-util/systemtap-1.3 ) test? ( sys-devel/gdb - =dev-lang/python-2* - >=dev-util/gdbus-codegen-${PV} + ${PYTHON_DEPS} + >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] >=sys-apps/dbus-1.2.14 ) - !=dev-libs/elfutils-0.142 - >=dev-libs/libelf-0.8.12 ) - xattr? ( sys-apps/attr ) - fam? ( virtual/fam ) - utils? ( >=dev-util/gdbus-codegen-${PV} )" + >=dev-libs/libelf-0.8.12 + >=sys-freebsd/freebsd-lib-9.2_rc1 + ) + selinux? ( sys-libs/libselinux ) + xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] ) + fam? ( virtual/fam[${MULTILIB_USEDEP}] ) + utils? ( + ${PYTHON_DEPS} + >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] ) + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + ) +" DEPEND="${RDEPEND} app-text/docbook-xml-dtd:4.1.2 >=dev-libs/libxslt-1.0 @@ -43,10 +55,15 @@ DEPEND="${RDEPEND} systemtap? ( >=dev-util/systemtap-1.3 ) test? ( sys-devel/gdb - =dev-lang/python-2* - >=dev-util/gdbus-codegen-${PV} + ${PYTHON_DEPS} + >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] >=sys-apps/dbus-1.2.14 ) - !=dev-util/gdbus-codegen-${PV} + >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] >=dev-util/gtk-doc-1.15 ) - =dev-lang/python-2*" + " fi -pkg_setup() { - # Needed for gio/tests/gdbus-testserver.py - if use test || [[ ${PV} = 9999 ]]; then - python_set_active_version 2 - python_pkg_setup - if [[ ${PV} = 9999 ]]; then - # Make gdbus-codegen from ${S} work despite all our patches - MAKEOPTS="${MAKEOPTS} PYTHON=$(PYTHON -2 -a)" - fi - fi +DOCS="AUTHORS ChangeLog* NEWS*" +pkg_setup() { if use kernel_linux ; then CONFIG_CHECK="~INOTIFY_USER" + if use test; then + CONFIG_CHECK="~IPV6" + WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them." + export IPV6_DISABLED="yes" + fi linux-info_pkg_setup fi } src_prepare() { [[ ${PV} = 9999 ]] && gnome2-live_src_prepare - mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die - # Fix gmodule issues on fbsd; bug #184301 + # Prevent build failure in stage3 where pkgconfig is not available, bug #481056 + mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die + + # Fix gmodule issues on fbsd; bug #184301, upstream bug #107626 epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch if use test; then @@ -90,7 +107,7 @@ src_prepare() { sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \ -i "${S}"/gio/tests/desktop-app-info.c || die "sed failed" - # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629 + # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163 if ! has_version dev-util/desktop-file-utils ; then ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," ewarn "think on installing it to get these tests run." @@ -122,31 +139,51 @@ src_prepare() { ln -sfn $(type -P true) gio/tests/gdbus-testserver.py fi - epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch" + # Some tests need ipv6, upstream bug #667468 + if [[ -n "${IPV6_DISABLED}" ]]; then + sed -i -e "/socket\/ipv6_sync/d" gio/tests/socket.c || die + sed -i -e "/socket\/ipv6_async/d" gio/tests/socket.c || die + sed -i -e "/socket\/ipv6_v4mapped/d" gio/tests/socket.c || die + fi + + # Test relies on /usr/bin/true, but we have /bin/true, upstream bug #698655 + sed -i -e "s:/usr/bin/true:/bin/true:" gio/tests/desktop-app-info.c || die fi + # thread test fails, upstream bug #679306 + epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch" + # gdbus-codegen is a separate package epatch "${FILESDIR}/${PN}-2.35.x-external-gdbus-codegen.patch" - # bashcomp goes in /usr/share/bash-completion - epatch "${FILESDIR}/${PN}-2.32.4-bashcomp.patch" + # do not allow libgobject to unload; bug #405173, https://bugzilla.gnome.org/show_bug.cgi?id=707298 + epatch "${FILESDIR}/${PN}-2.36.4-znodelete.patch" - epatch_user + # leave python shebang alone + sed -e '/${PYTHON}/d' \ + -i glib/Makefile.{am,in} || die + + # Gentoo handles completions in a different directory + sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \ + gio/Makefile.am || die - # disable pyc compiling - use test && python_clean_py-compile_files + # Support compilation in clang until upstream solves this, upstream bug #691608 + append-flags -Wno-format-nonliteral + + epatch_user # Needed for the punt-python-check patch, disabling timeout test - # Also needed to prevent croscompile failures, see bug #267603 + # Also needed to prevent cross-compile failures, see bug #267603 # Also needed for the no-gdbus-codegen patch - AT_M4DIR="${WORKDIR}" eautoreconf + eautoreconf - [[ ${CHOST} == *-freebsd* ]] && elibtoolize + # FIXME: Really needed when running eautoreconf before? bug#???? + #[[ ${CHOST} == *-freebsd* ]] && elibtoolize epunt_cxx } -src_configure() { +multilib_src_configure() { # Avoid circular depend with dev-util/pkgconfig and # native builds (cross-compiles won't need pkg-config # in the target ROOT to work here) @@ -161,47 +198,50 @@ src_configure() { local myconf + case "${CHOST}" in + *-mingw*) myconf="${myconf} --with-threads=win32" ;; + *) myconf="${myconf} --with-threads=posix" ;; + esac + # Building with --disable-debug highly unrecommended. It will build glib in # an unusable form as it disables some commonly used API. Please do not # convert this to the use_enable form, as it results in a broken build. - # -- compnerd (3/27/06) use debug && myconf="--enable-debug" - if use test; then - myconf="${myconf} --enable-modular-tests" + # Only used by the gresource bin + multilib_is_native_abi || myconf="${myconf} --disable-libelf" + + # FIXME: change to "$(use_enable selinux)" when libselinux is multilibbed, bug #480960 + if multilib_is_native_abi; then + myconf="${myconf} $(use_enable selinux)" else - if [[ ${PV} = 9999 ]] && use doc; then - # need to build tests if USE=doc for bug #387385 - myconf="${myconf} --enable-modular-tests" - else - myconf="${myconf} --disable-modular-tests" - fi + myconf="${myconf} --disable-selinux" fi [[ ${PV} = 9999 ]] && myconf="${myconf} $(use_enable doc gtk-doc)" # Always use internal libpcre, bug #254659 - econf ${myconf} \ + ECONF_SOURCE="${S}" econf ${myconf} \ $(use_enable xattr) \ $(use_enable fam) \ $(use_enable selinux) \ $(use_enable static-libs static) \ $(use_enable systemtap dtrace) \ $(use_enable systemtap systemtap) \ + --disable-compile-warnings \ --enable-man \ --with-pcre=internal \ - --with-threads=posix \ --with-xml-catalog="${EPREFIX}/etc/xml/catalog" } -src_install() { - local f - - # install-exec-hook substitutes ${PYTHON} in glib/gtester-report - emake DESTDIR="${D}" PYTHON="${EPREFIX}/usr/bin/python2" install +multilib_src_install_all() { + einstalldocs - if ! use utils; then + if use utils ; then + python_replicate_script "${ED}"/usr/bin/gtester-report + else rm "${ED}usr/bin/gtester-report" + rm "${ED}usr/share/man/man1/gtester-report.1" fi # Do not install charset.alias even if generated, leave it to libiconv @@ -210,16 +250,12 @@ src_install() { # Don't install gdb python macros, bug 291328 rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/" - # This is there for git snapshots and the live ebuild, bug 351966 - [[ ${PV} = 9999 ]] && { emake README || die "emake README failed"; } - dodoc AUTHORS ChangeLog* NEWS* README - # Completely useless with or without USE static-libs, people need to use # pkg-config prune_libtool_files --modules } -src_test() { +multilib_src_test() { gnome2_environment_reset unset DBUS_SESSION_BUS_ADDRESS @@ -228,6 +264,7 @@ src_test() { export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" unset GSETTINGS_BACKEND # bug 352451 export LC_TIME=C # bug #411967 + python_export_best # Related test is a bit nitpicking mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" @@ -235,7 +272,7 @@ src_test() { # Hardened: gdb needs this, bug #338891 if host-is-pax ; then - pax-mark -mr "${S}"/tests/.libs/assert-msg-test \ + pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \ || die "Hardened adjustment failed" fi @@ -243,18 +280,6 @@ src_test() { Xemake check } -pkg_preinst() { - # Only give the introspection message if: - # * The user has gobject-introspection - # * Has glib already installed - # * Previous version was different from new version - # TODO: add a subslotted virtual to trigger this automatically - if has_version "dev-libs/gobject-introspection" && ! has_version "=${CATEGORY}/${PF}"; then - ewarn "You must rebuild gobject-introspection so that the installed" - ewarn "typelibs and girs are regenerated for the new APIs in glib" - fi -} - pkg_postinst() { # Inform users about possible breakage when updating glib and not dbus-glib, bug #297483 # TODO: add a subslotted virtual to trigger this automatically