summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-libs/glib/ChangeLog7
-rw-r--r--dev-libs/glib/Manifest18
-rw-r--r--dev-libs/glib/glib-2.32.4-r1.ebuild5
3 files changed, 19 insertions, 11 deletions
diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index a7640cea9dc4..283d2c38245c 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-libs/glib
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.547 2012/10/17 07:37:32 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.548 2012/10/23 06:21:15 tetromino Exp $
+
+ 23 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+ glib-2.32.4-r1.ebuild:
+ Disable problematic thread4 test, like was already done in glib-2.34.x
+ ebuilds (bug #434248, thanks to Toralf Förster and Priit Laes).
*glib-2.34.1 (17 Oct 2012)
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 1fef9e77ed19..5c52dc4fdc1b 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -29,20 +29,20 @@ DIST glib-2.34.1.tar.xz 6363332 SHA256 6e84dc9d84b104725b34d255421ed7ac3629e49f4
DIST pkg-config-0.26.tar.gz 396399 SHA256 94c1936a797c930fb3e4e5a154165b6268caba22b32d24083dd4c492a533c8af SHA512 9390d5918dd4ac520b914d2330aa7cae2587ca7b21b03bc88372fd5dbbd78e33eeb3fca39fcdb6dd10113658f03118a1c8829149c7029eb0dd80348d100170a4 WHIRLPOOL f535946a02192a9bffc7be0fae454e25aa86af8bac7f47622d52ed13f77f1ba05ff9b5693b2a501981e3991e4e1595eced22dee4ab748b310baa7d57267a62a7
EBUILD glib-1.2.10-r5.ebuild 1782 SHA256 1ac935da2188aa1ed04e5db79d8637f519fdfa9d9a64dd8a978cbf31bb056486 SHA512 6d9f9839be66df0f343f4dd39c6f88524e8acc45c747ef0ce7507c24296d0550c8b1c13efa396a6a65f31033d62f064cbc0fc7c7b8b28b2eabe22387b611fa15 WHIRLPOOL b5967b8704e5ce04f41a03bb108ccaffa628f02add1b67803e8b0a531d7f345b9a0c458388da90262a53e76fd96dae7a82cab391fc5e6404c6b2ff7d43164f54
EBUILD glib-2.30.3.ebuild 8696 SHA256 a507488c385f89b06283a19821dc43a948770aa3b903f736656d41502477a5ef SHA512 03a7eb3a5d1f464f5b5745538db084dec17e1bf24494995da17005367f9bff06aac1b9e2e1588ab34c7a407a9ed94f6f43ad65af1d7ed801fc53d9a3aea3f774 WHIRLPOOL b5e17f9acee124bd1d26218f3b6a2c731d1157a58416dfc98e8d1c26815b4534aac02187e3814f45bf1cd1f5aade825f81fe9dc1c2e84f3c44a3db1bd214b9b0
-EBUILD glib-2.32.4-r1.ebuild 8032 SHA256 49f89fa745e33f72ab4c878d8d00a5c6af23f46cbfc278244d139763844b849d SHA512 14bfbc8e12d9de32395192ebcf5dc8b7a1b9524a02c2fc38ad6996cfd9ce01509e2bbb773775602d13e5fb68306b1a2a5a8ef4f744136660d5210df85e31f2bc WHIRLPOOL 96e6453e62a051189187135b4614cc9cf700ac39536ba2116fc05fa4089c18878b628cd2026c3c5c0940806b458ebfc27bcdf6989678b7f03e76f224f8c6eb92
+EBUILD glib-2.32.4-r1.ebuild 8153 SHA256 afea0cf2530053938ba528ff50429cbf9115d30af92910e21e5ff9dda7a66f1a SHA512 881c08df5898071c8346f5b6cf98ed1fe605b5e90dd62b9ca1e5fad20c39f784aef3b35b8808dc410af12d972e1d6925f9035b2efe06f9aa2c0b0242e12ac89b WHIRLPOOL 8ff38082eb34b9ddcfa386ff6fb59b64232207fcdc77c1df5779b09834ce515b1cb7e76ad91db70a0609a5924696dc29decee8a70cd12e417794bf9c6dc91093
EBUILD glib-2.32.4.ebuild 7994 SHA256 9890de6175c730df9270c21e460a1fd2229770eee42429d354105fd4df93ee72 SHA512 241d23b6aad19b293ed7591ab68291973133f48878eb6ff7cacda86fef2186dee1d2aaf1e12ab369b4f8bc68681ac40605a99f4a497b23acafd67ae9adc42ad8 WHIRLPOOL 2f938a6fd923b7a74c9521097aaa3d6268fda3b592790cf706f2ad6961ee1223242e59515dacc0d6383e02079064e6844e2748f89a46171c7cd6dca1d3f3477f
EBUILD glib-2.34.0.ebuild 8250 SHA256 b470f9bda344956ea820c1f02fa059bacf26f8728ba75f1ed632f1004b4b806d SHA512 466e46f9df13a567857be12ecadf004be11666decb90f8b3ba0dd4d908bacbaea4f4df0ca7d9fc3c20adf1a41e5a94a60e8053c6664d2a1a93510327c274fea4 WHIRLPOOL e4b9df50e5deed3ab489e5eaaee596f84d4d49579f64c6d13a3aa3ef8a21f223dade5cb8792bd487c5c57ea2353051c403dab6f5abdb2acdb169d41dde7b9652
EBUILD glib-2.34.1.ebuild 8250 SHA256 a3cb3572e57e9c2d9024c14bdc5a062c78797bec02673d7cc6e78313027a0c03 SHA512 266f181f363fed1c3e83d862bcc54aea3a215d69600eb5c478e191c4628c3bf4cc8587b9673a3e59cf77eaf14e9e5b7c0882fbb2d0a7a7ff17c752a6b3244da1 WHIRLPOOL cba787a5d4c94358e8a059fd5bfc32bbb2241a96fdb1ba524295891393563a273b6f477cf10d6f4865dd25517c64a3dd6d2749da7123ffb8b1ec89d6c73c0869
-MISC ChangeLog 74871 SHA256 47d703ec0d17dbc60d9c07fcde7a0de6f01c1dbcfb453ec184f8e56db68db014 SHA512 9bebc79a0f33a36bb9e6ba220283f9e37d226b180579a2273462541c6420d1b51935b334fdd9ad49354ab2c35178497d9cde28fb8a7b166cf735f76e5e545e35 WHIRLPOOL 66e6420b86a0521c9d1c79bc6bd8efbdae445aad7bff6a4038e5b800d674bbca91e2f86d31784ee0eeae2d14a686ca9c110c7507af4c6f74c49d846311961ae0
+MISC ChangeLog 75096 SHA256 8657ca7bdd79514cda6863d260094e9b0e3555a4794c985bf4eeafced830f7ae SHA512 6977d8dd710767f4d792ec2a3703f0a8f2e502b94f5f340dbe7bd5e2633d12dfb4c6c2ebf556b411ff9b37430c300d7d14dc787f43c24932bf9c9de02847af27 WHIRLPOOL 2f4fcfaf55de4f8a9077a705e453557c121ff99e748425d5fc91ec832105b75f44254562aabaa02e9105713b3809d0b32d1f2f7a0360a7a4997d09132fdd7434
MISC metadata.xml 396 SHA256 15590ae8a4e9724b07cdc4766f62257c604ffb256acc15f065e005a34cfe81cb SHA512 b1083fad61b609c0f01421745147cf7bbf3964d5d8fa95e5f0db7e38443a4038404103abf87cba9ce6809683f089fe71f8b080ce464964befff336db7e8c1d2f WHIRLPOOL 0cc2b231d0d1f14e31361c4160f9164af7972d3832e475655cc1fbc7be3bf948ea40f295de55583b065a5b17af7842d03f6d4c869c7f65bae1306b4faf00eae4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQEcBAEBCAAGBQJQfmA9AAoJEJ0WA1zPCt1hG7AH/R6chFkPz99xPwY42BH5UOW7
-FchJretStTN/kRTuH6xxZPKhujpvG5pVlznpNvwCy9RrwFMYLVGI0pdqbJmCNopH
-rYxyUf6511Eq+RapWzxHCH/6nydZiw6F/UDZm2OpSuUg+5zADPRkeqPSu8QM5VRU
-Str6G59rkBawwOPKWHYaHEYMbxPPiTDyBkX4+zLZuSFZckJaUswI2lWD+Tq+uzbF
-1BHZRLRT+od0GfTUQRPuZhVpnBs3Ei5al0ZDNqJDhn7xA//a78uXSqYyN1pFvyd0
-mdVYedBBuGUvi8ENzjM+4in0lhkGFMxDNe5revymJ7JyXMHXJ6Fgozf+nPX8+io=
-=IOGK
+iQEcBAEBCAAGBQJQhjdcAAoJEJ0WA1zPCt1h42gH/1beZ4ZJ7KVi2rJyW1q5/K8x
+jhIsuDMTR00OLllANX2JPX6unIcsH46bsrZCp1g0wxpDOq4Q5T6NooUYle1k6CqU
+MkFTowe9tr57KgghrJUNZATTE8YJ8BbrAHgUqxCBetcsTxFDzqAu0k+nFNfCP9T3
+FLp1rgKO2qscLc0qqxBZ8gXGPKqRqSAbgxK6s2jNwvuxhqly0TS/Up5k7jFKvhpo
+mXNoituj5B1TnFL+uk0kc1adgeZl39cs2RSwW4xgNVHyZs8XmbO5cDVdbaakpaBQ
+MvSNQKe0UtNzj23CjCkTHFBLjF8ZGpSMemjFDU89s19EefOBIgiO8i9ykzIFl0c=
+=khun
-----END PGP SIGNATURE-----
diff --git a/dev-libs/glib/glib-2.32.4-r1.ebuild b/dev-libs/glib/glib-2.32.4-r1.ebuild
index ed62b0161cec..34fca60dc0f5 100644
--- a/dev-libs/glib/glib-2.32.4-r1.ebuild
+++ b/dev-libs/glib/glib-2.32.4-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.32.4-r1.ebuild,v 1.9 2012/10/14 14:53:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.32.4-r1.ebuild,v 1.10 2012/10/23 06:21:15 tetromino Exp $
EAPI="4"
PYTHON_DEPEND="utils? 2"
@@ -107,6 +107,9 @@ src_prepare() {
# AS_IF fixes from 2.33.x, needed for cross-compiling, bug #434770
epatch ../AS_IF-patches/*.patch
+ # https://bugzilla.gnome.org/show_bug.cgi?id=679306
+ epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch"
+
# disable pyc compiling
use test && python_clean_py-compile_files