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.77) (envelope-from ) id 1Sm0zz-0004lF-4P for garchives@archives.gentoo.org; Tue, 03 Jul 2012 11:10:27 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6B23CE0656; Tue, 3 Jul 2012 11:10:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2DC18E05F8 for ; Tue, 3 Jul 2012 11:10:12 +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 3BA951B40BC for ; Tue, 3 Jul 2012 11:10:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 5D4B4E5436 for ; Tue, 3 Jul 2012 11:10:07 +0000 (UTC) From: "Priit Laes" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Priit Laes" Message-ID: <1341312028.8e04aaec5a6b297e83081e819063be4cf560227a.plaes@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.10.3-ia64-atomic-ops.patch dev-libs/glib/files/glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch dev-libs/glib/files/glib-2.25-skip-tests-with-dbus-keyring.patch dev-libs/glib/files/glib-2.33.x-testsuite-skip-gdbus-auth-tests.patch dev-libs/glib/files/glib-2.33.x-testsuite-skip-thread4.patch dev-libs/glib/glib-2.33.3.ebuild dev-libs/glib/glib-9999.ebuild X-VCS-Directories: dev-libs/glib/files/ dev-libs/glib/ X-VCS-Committer: plaes X-VCS-Committer-Name: Priit Laes X-VCS-Revision: 8e04aaec5a6b297e83081e819063be4cf560227a X-VCS-Branch: master Date: Tue, 3 Jul 2012 11:10:07 +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: ac6f7479-c3a4-43b8-a337-57a201d34f64 X-Archives-Hash: 518faf17b9a386f01006505b126f57a2 commit: 8e04aaec5a6b297e83081e819063be4cf560227a Author: Priit Laes plaes org> AuthorDate: Tue Jul 3 10:40:28 2012 +0000 Commit: Priit Laes plaes org> CommitDate: Tue Jul 3 10:40:28 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D8e04aaec dev-libs/glib: Add 2.33.3 to overlay --- .../glib/files/glib-2.10.3-ia64-atomic-ops.patch | 39 ++++++++++++ ...karound-gio-test-failure-without-userpriv.patch | 20 ------ .../glib-2.25-skip-tests-with-dbus-keyring.patch | 22 ------- ...ib-2.33.x-testsuite-skip-gdbus-auth-tests.patch | 62 ++++++++++++++= ++++++ .../files/glib-2.33.x-testsuite-skip-thread4.patch | 44 ++++++++++++++ .../glib/{glib-9999.ebuild =3D> glib-2.33.3.ebuild} | 34 +++++++---- dev-libs/glib/glib-9999.ebuild | 29 ++++++---- 7 files changed, 186 insertions(+), 64 deletions(-) diff --git a/dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch b/dev-= libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch new file mode 100644 index 0000000..0859e33 --- /dev/null +++ b/dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch @@ -0,0 +1,39 @@ +From Debian, this one is needed for gcc < 4.1... + +--- glib-2.10.0/glib/gatomic.c 2006-02-24 14:02:51.000000000 +0000 ++++ glib-2.10.0/glib/gatomic.c 2006-03-06 18:12:06.000000000 +0000 +@@ -414,14 +414,14 @@ + g_atomic_int_exchange_and_add (volatile gint *atomic, + gint val) + { +- return __sync_fetch_and_add (atomic, val); ++ return __sync_fetch_and_add_si (atomic, val); + } + =20 + void + g_atomic_int_add (volatile gint *atomic,=20 + gint val) + { +- __sync_fetch_and_add (atomic, val); ++ __sync_fetch_and_add_si (atomic, val); + } +=20 + gboolean +@@ -429,7 +429,7 @@ + gint oldval,=20 + gint newval) + { +- return __sync_bool_compare_and_swap (atomic, oldval, newval); ++ return __sync_bool_compare_and_swap_si (atomic, oldval, newval); + } +=20 + gboolean +@@ -437,7 +437,7 @@ + gpointer oldval,=20 + gpointer newval) + { +- return __sync_bool_compare_and_swap ((long *)atomic,=20 ++ return __sync_bool_compare_and_swap_di ((long *)atomic,=20 + (long)oldval, (long)newval); + } +=20 diff --git a/dev-libs/glib/files/glib-2.18.1-workaround-gio-test-failure-= without-userpriv.patch b/dev-libs/glib/files/glib-2.18.1-workaround-gio-t= est-failure-without-userpriv.patch deleted file mode 100644 index cabe56f..0000000 --- a/dev-libs/glib/files/glib-2.18.1-workaround-gio-test-failure-without= -userpriv.patch +++ /dev/null @@ -1,20 +0,0 @@ -Temporary workaround for gio tests failure when ran without FEATURES=3Du= serpriv -until upstream bug #552912 is fixed - ---- gio/tests/live-g-file.c.orig 2008-09-25 05:44:12.848556034 +0300 -+++ gio/tests/live-g-file.c 2008-09-25 06:12:34.248726237 +0300 -@@ -769,11 +769,14 @@ - if (posix_compat) - { - /* target directory is not accessible (no execute flag) */ -+#if 0 -+/* Fails when ran as root */ - do_copy_move (root, item, TEST_DIR_NO_ACCESS, - TEST_NO_ACCESS); - /* target directory is readonly */ - do_copy_move (root, item, TEST_DIR_NO_WRITE, - TEST_NO_ACCESS); -+#endif - } - } - } diff --git a/dev-libs/glib/files/glib-2.25-skip-tests-with-dbus-keyring.p= atch b/dev-libs/glib/files/glib-2.25-skip-tests-with-dbus-keyring.patch deleted file mode 100644 index baca1ec..0000000 --- a/dev-libs/glib/files/glib-2.25-skip-tests-with-dbus-keyring.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- gio/tests/gdbus-peer.c.orig 2010-08-28 20:06:11.000000000 +0300 -+++ gio/tests/gdbus-peer.c 2010-08-28 20:06:21.000000000 +0300 -@@ -1448,7 +1448,7 @@ -=20 - g_test_add_func ("/gdbus/peer-to-peer", test_peer); - g_test_add_func ("/gdbus/delayed-message-processing", delayed_message= _processing); -- g_test_add_func ("/gdbus/nonce-tcp", test_nonce_tcp); -+ //g_test_add_func ("/gdbus/nonce-tcp", test_nonce_tcp); - g_test_add_func ("/gdbus/credentials", test_credentials); - g_test_add_func ("/gdbus/overflow", test_overflow); -=20 ---- gio/tests/gdbus-non-socket.c.orig 2010-08-28 20:36:52.000000000 +030= 0 -+++ gio/tests/gdbus-non-socket.c 2010-08-28 20:37:02.000000000 +0300 -@@ -336,7 +336,7 @@ - /* all the tests rely on a shared main loop */ - loop =3D g_main_loop_new (NULL, FALSE); -=20 -- g_test_add_func ("/gdbus/non-socket", test_non_socket); -+ //g_test_add_func ("/gdbus/non-socket", test_non_socket); -=20 - ret =3D g_test_run(); -=20 diff --git a/dev-libs/glib/files/glib-2.33.x-testsuite-skip-gdbus-auth-te= sts.patch b/dev-libs/glib/files/glib-2.33.x-testsuite-skip-gdbus-auth-tes= ts.patch new file mode 100644 index 0000000..aff75cb --- /dev/null +++ b/dev-libs/glib/files/glib-2.33.x-testsuite-skip-gdbus-auth-tests.pat= ch @@ -0,0 +1,62 @@ +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=3D679308 +--- + 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"); + } +=20 ++#if 0 ++// https://bugzilla.gnome.org/show_bug.cgi?id=3D679308 + static void + auth_client_dbus_cookie_sha1 (void) + { + auth_client_mechanism ("DBUS_COOKIE_SHA1"); + } ++#endif +=20 + /* --------------------------------------------------------------------= -------------------------------- */ +=20 +@@ -250,11 +253,13 @@ auth_server_external (void) + auth_server_mechanism ("EXTERNAL"); + } +=20 ++#if 0 + static void + auth_server_dbus_cookie_sha1 (void) + { + auth_server_mechanism ("DBUS_COOKIE_SHA1"); + } ++#endif +=20 + /* --------------------------------------------------------------------= -------------------------------- */ +=20 +@@ -272,10 +277,14 @@ main (int argc, + session_bus_up (); +=20 + g_test_add_func ("/gdbus/auth/client/EXTERNAL", auth_client_e= xternal); ++#if 0 + g_test_add_func ("/gdbus/auth/client/DBUS_COOKIE_SHA1", auth_client_d= bus_cookie_sha1); ++#endif + g_test_add_func ("/gdbus/auth/server/ANONYMOUS", auth_server_a= nonymous); + g_test_add_func ("/gdbus/auth/server/EXTERNAL", auth_server_e= xternal); ++#if 0 + g_test_add_func ("/gdbus/auth/server/DBUS_COOKIE_SHA1", auth_server_d= bus_cookie_sha1); ++#endif +=20 + ret =3D g_test_run(); +=20 +--=20 +1.7.8.6 + diff --git a/dev-libs/glib/files/glib-2.33.x-testsuite-skip-thread4.patch= b/dev-libs/glib/files/glib-2.33.x-testsuite-skip-thread4.patch new file mode 100644 index 0000000..f409094 --- /dev/null +++ b/dev-libs/glib/files/glib-2.33.x-testsuite-skip-thread4.patch @@ -0,0 +1,44 @@ +From 8a8112aad6dc98aaaf9767b31e48f5ae8fabd858 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 + +https://bugzilla.gnome.org/show_bug.cgi?id=3D679306 +--- + glib/tests/thread.c | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/glib/tests/thread.c b/glib/tests/thread.c +index 29b3850..ffe8087 100644 +--- a/glib/tests/thread.c ++++ b/glib/tests/thread.c +@@ -124,6 +124,8 @@ test_thread3 (void) + g_assert_cmpint (GPOINTER_TO_INT(result), =3D=3D, 9); + } +=20 ++#if 0 ++// https://bugzilla.gnome.org/show_bug.cgi?id=3D679306 + /* test that thread creation fails as expected, + * by setting RLIMIT_NPROC ridiculously low + */ +@@ -152,6 +154,7 @@ test_thread4 (void) + g_error ("resetting RLIMIT_NPROC failed: %s\n", g_strerror (ret)); + #endif + } ++#endif +=20 + static void + test_thread5 (void) +@@ -195,7 +198,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); ++#if 0 + g_test_add_func ("/thread/thread4", test_thread4); ++#endif + g_test_add_func ("/thread/thread5", test_thread5); + g_test_add_func ("/thread/thread6", test_thread6); +=20 +--=20 +1.7.8.6 + diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-2.33.3.e= build similarity index 89% copy from dev-libs/glib/glib-9999.ebuild copy to dev-libs/glib/glib-2.33.3.ebuild index 1d9fff6..7fe4fca 100644 --- a/dev-libs/glib/glib-9999.ebuild +++ b/dev-libs/glib/glib-2.33.3.ebuild @@ -30,7 +30,7 @@ RDEPEND=3D"virtual/libiconv sys-libs/zlib || ( >=3Ddev-libs/elfutils-0.142 - >=3Ddev-libs/libelf-0.8.11 ) + >=3Ddev-libs/libelf-0.8.12 ) xattr? ( sys-apps/attr ) fam? ( virtual/fam ) utils? ( >=3Ddev-util/gdbus-codegen-${PV} )" @@ -81,14 +81,27 @@ src_prepare() { [[ ${PV} =3D 9999 ]] && gnome2-live_src_prepare mv -vf "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die =20 + if use ia64 ; then + # Only apply for < 4.1 + local major=3D$(gcc-major-version) + local minor=3D$(gcc-minor-version) + if (( major < 4 || ( major =3D=3D 4 && minor =3D=3D 0 ) )); then + epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch" + fi + fi + # Fix gmodule issues on fbsd; bug #184301 epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.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" + # 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 + # 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 # Disable tests requiring dev-util/desktop-file-utils when not install= ed, bug #286629 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," @@ -118,6 +131,11 @@ src_prepare() { # gdbus-codegen is a separate package epatch "${FILESDIR}/${PN}-2.31.x-external-gdbus-codegen.patch" =20 + # https://bugzilla.gnome.org/show_bug.cgi?id=3D679306 + epatch "${FILESDIR}/${PN}-2.33.x-testsuite-skip-thread4.patch" + # https://bugzilla.gnome.org/show_bug.cgi?id=3D679308 + epatch "${FILESDIR}/${PN}-2.33.x-testsuite-skip-gdbus-auth-tests.patch" + # disable pyc compiling use test && python_clean_py-compile_files =20 @@ -187,12 +205,6 @@ src_install() { [[ ${PV} =3D 9999 ]] && { emake README || die "emake README failed"; } dodoc AUTHORS ChangeLog* NEWS* README =20 - insinto /usr/share/bash-completion - for f in gdbus gsettings; do - newins "${ED}/etc/bash_completion.d/${f}-bash-completion.sh" ${f} - done - rm -rf "${ED}/etc" - # Completely useless with or without USE static-libs, people need to us= e # pkg-config find "${D}" -name '*.la' -exec rm -f {} + diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-9999.ebu= ild index 1d9fff6..ca821e8 100644 --- a/dev-libs/glib/glib-9999.ebuild +++ b/dev-libs/glib/glib-9999.ebuild @@ -30,7 +30,7 @@ RDEPEND=3D"virtual/libiconv sys-libs/zlib || ( >=3Ddev-libs/elfutils-0.142 - >=3Ddev-libs/libelf-0.8.11 ) + >=3Ddev-libs/libelf-0.8.12 ) xattr? ( sys-apps/attr ) fam? ( virtual/fam ) utils? ( >=3Ddev-util/gdbus-codegen-${PV} )" @@ -81,14 +81,27 @@ src_prepare() { [[ ${PV} =3D 9999 ]] && gnome2-live_src_prepare mv -vf "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die =20 + if use ia64 ; then + # Only apply for < 4.1 + local major=3D$(gcc-major-version) + local minor=3D$(gcc-minor-version) + if (( major < 4 || ( major =3D=3D 4 && minor =3D=3D 0 ) )); then + epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch" + fi + fi + # Fix gmodule issues on fbsd; bug #184301 epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.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" + # 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 + # 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 # Disable tests requiring dev-util/desktop-file-utils when not install= ed, bug #286629 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," @@ -187,12 +200,6 @@ src_install() { [[ ${PV} =3D 9999 ]] && { emake README || die "emake README failed"; } dodoc AUTHORS ChangeLog* NEWS* README =20 - insinto /usr/share/bash-completion - for f in gdbus gsettings; do - newins "${ED}/etc/bash_completion.d/${f}-bash-completion.sh" ${f} - done - rm -rf "${ED}/etc" - # Completely useless with or without USE static-libs, people need to us= e # pkg-config find "${D}" -name '*.la' -exec rm -f {} +