From 97c7804207f189ac9582c70b33f9bd8d6b572889 Mon Sep 17 00:00:00 2001 From: Alexandre Rostovtsev Date: Wed, 23 Nov 2011 23:06:13 +0000 Subject: [PATCH] =?utf8?q?Add=20patch=20to=20fix=20parallel=20make=20failu?= =?utf8?q?re=20when=20USE=3Dintrospection;=20many=20thanks=20to=20Rafa?= =?utf8?q?=C5=82=20Mu=C5=BCy=C5=82o=20=20for=20the=20solu?= =?utf8?q?tion=20(bug=20#391215).=20Should=20also=20fix=20bug=20#391213.?= =?utf8?q?=20Thanks=20to=20all=20for=20reporting.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Package-Manager: portage-2.2.0_alpha77/cvs/Linux x86_64 --- gnome-base/librsvg/ChangeLog | 8 +++- gnome-base/librsvg/Manifest | 15 +++---- .../files/librsvg-2.34.2-gir-filename.patch | 39 +++++++++++++++++++ gnome-base/librsvg/librsvg-2.34.2.ebuild | 5 ++- 4 files changed, 58 insertions(+), 9 deletions(-) create mode 100644 gnome-base/librsvg/files/librsvg-2.34.2-gir-filename.patch diff --git a/gnome-base/librsvg/ChangeLog b/gnome-base/librsvg/ChangeLog index cf8900c32440..dac1d9883859 100644 --- a/gnome-base/librsvg/ChangeLog +++ b/gnome-base/librsvg/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for gnome-base/librsvg # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.260 2011/11/21 22:26:35 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.261 2011/11/23 23:06:13 tetromino Exp $ + + 23 Nov 2011; Alexandre Rostovtsev + librsvg-2.34.2.ebuild, +files/librsvg-2.34.2-gir-filename.patch: + Add patch to fix parallel make failure when USE=introspection; many thanks to + Rafał Mużyło for the solution (bug #391215). Should also + fix bug #391213. Thanks to all for reporting. 21 Nov 2011; Pacho Ramos librsvg-2.34.2.ebuild: Only pull in introspection.m4, not full gobject-introspection. diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest index dd1685a79f06..1b97ad73e2b5 100644 --- a/gnome-base/librsvg/Manifest +++ b/gnome-base/librsvg/Manifest @@ -1,19 +1,20 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 AUX librsvg-2.34.0-automagic-gtk.patch 1420 RMD160 8b1740121a13ef1edaef44f6c6293f140432ab71 SHA1 91fd1a8713fe1296b30e2e3281cd72087c96ae4b SHA256 56e63ee0f4bd9baea7244fddc18622e88902bf0ccbfa18700c111157b05e4ef7 +AUX librsvg-2.34.2-gir-filename.patch 1344 RMD160 380b9231034a2c76208a2eb649b7d17febc628a2 SHA1 f54567c73b12c1df227aa6b611058e6b18b866a1 SHA256 4039ebef93fa4af7b73c087e1dc05db4b3d4d15df3de92163503e352a4ad3f9d DIST introspection.m4.bz2 1181 RMD160 3648afa820c2ee7e240083076e1452285d043084 SHA1 e5188cc387d0d17feb77684feff7ff163779912f SHA256 69a2a57b12179159420825d1d44c74108014b0864c4d63500265639cfa9151ae DIST librsvg-2.34.1.tar.xz 482380 RMD160 612dacdae9665445b982bf70b2c589c801b83f03 SHA1 2fdc23e7e06c153adc001efa6b1cb5c0aa28a6aa SHA256 4f2ab987eed2943b5a0ce3dde1672d2bc87123bee66d885dd7307eb7ede756db DIST librsvg-2.34.2.tar.xz 499108 RMD160 491432c990584da926c0844f68a92e4a3556a05e SHA1 9542af41b30f09f31753262f382c0118fb42891d SHA256 5de701325b84c0a15ab6892f49ffd6471722044bfe0b350725bf420642ee4464 EBUILD librsvg-2.34.1-r1.ebuild 2520 RMD160 4254d5e5e5cc9093493ce0a4e747c56f7efe417c SHA1 eac07b0a4cb469e70a962e5c8f45c4f29c5c55ec SHA256 686f59a313a99185a684bbfd40a6e75ff6373b17ba85d77a1784d121e39809e6 EBUILD librsvg-2.34.1.ebuild 2315 RMD160 9e44445dc087dca91e886c2c4b892f4c5f2fc7b6 SHA1 5e3daf5954b4ac83030c99d3d5850c30646ff1be SHA256 61fe0f672394317f1908fe1ff6ab2120fbc909721719c1e42b936b094d35f3a2 -EBUILD librsvg-2.34.2.ebuild 2821 RMD160 148972a0089b238f32a3431b82a4746b4fe88b37 SHA1 4ba36178519f424f802f6e535bdab6ff684f7a37 SHA256 2064019bc154f97a7045e5662e212ffadc7c62a0201c27049eb544601acc4e67 -MISC ChangeLog 33264 RMD160 5c7b2ec5c26434e4368a7203e82df08d4c60e1f0 SHA1 bc60883e3512245f2e09a33b1b8b7699706f80f0 SHA256 063093d56aea9f894972d44f90ea00c6f78498f05ecc334ce8dcc2f2adb0dcd3 +EBUILD librsvg-2.34.2.ebuild 2946 RMD160 d1c66f53d352774c9a193008e438f7092d903f5f SHA1 a483617bb51d0c15b5b43fa29f3f189f18fee61f SHA256 965c5a8efd2450db3f8f8d361875089ea57fb3c1e008bceb394ad81476984a17 +MISC ChangeLog 33603 RMD160 5f50aeb8745b27bc58e7cea25bed2affe7dd57e3 SHA1 d9ad9b766367bb92569b7b6491437e96df83e104 SHA256 8e6ee1b375b1d33efbdce6327b9b652af19725bda814f21996d74fb16d45873b MISC metadata.xml 376 RMD160 4ad36c6946d4873955386ad238d995eb6179a441 SHA1 8877f419fd68f51725372ac1f811635d21068f4e SHA256 7c75a35d70b6bbca589e1fb1c23d01f6475a62569751351b5bb1eaf6741f804a -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk7K0CEACgkQCaWpQKGI+9RvlgCfdLNPovjjbgGwxkPCl17/J4/Q -uZUAmwXVrRV8ZJgVOsVF/tWi4yRo9ifD -=WnNg +iF4EAREIAAYFAk7NfGoACgkQdjK8w9WeBnCnzQD/WGYiwEZMqDQ5BKLCImAc6KcY +lJa4eAwj6220IGgpM+AA/3bd8Tku316qmPOp6kl7d8WvMOdpWLx4ygnsM+toHRhy +=zD6D -----END PGP SIGNATURE----- diff --git a/gnome-base/librsvg/files/librsvg-2.34.2-gir-filename.patch b/gnome-base/librsvg/files/librsvg-2.34.2-gir-filename.patch new file mode 100644 index 000000000000..044fb7bd5375 --- /dev/null +++ b/gnome-base/librsvg/files/librsvg-2.34.2-gir-filename.patch @@ -0,0 +1,39 @@ +From c44813c1abb45467fa9e07bbde01d1fb09cae383 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev +Date: Wed, 23 Nov 2011 17:41:12 -0500 +Subject: [PATCH] Use $RSVG_API_VERSION in the .gir filename +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +$RSVG_API_VERSION == "2.0" +$RSVG_API_VERSION_U == "2_0" + +We want to use 2.0 when referring to the .gir filename, and 2_0 when +referring to the automake targets derived from the filename. Otherwise, +parallel make fails. + +Thanks to Rafał Mużyło for pointing this out in +https://bugs.gentoo.org/show_bug.cgi?id=391215#c10 + +https://bugzilla.gnome.org/show_bug.cgi?id=664684 +--- + Makefile.am | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 511df68..5a8dda3 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -235,7 +235,7 @@ INTROSPECTION_GIRS = Rsvg-@RSVG_API_VERSION@.gir + INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) + INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) + +-Rsvg-@RSVG_API_VERSION_U@.gir: librsvg-@RSVG_API_MAJOR_VERSION@.la ++Rsvg-@RSVG_API_VERSION@.gir: librsvg-@RSVG_API_MAJOR_VERSION@.la + + Rsvg_@RSVG_API_VERSION_U@_gir_NAMESPACE = Rsvg + Rsvg_@RSVG_API_VERSION_U@_gir_EXPORT_PACKAGES = librsvg-$(RSVG_API_VERSION) +-- +1.7.8.rc3 + diff --git a/gnome-base/librsvg/librsvg-2.34.2.ebuild b/gnome-base/librsvg/librsvg-2.34.2.ebuild index f734d27c9157..512724cc6c5b 100644 --- a/gnome-base/librsvg/librsvg-2.34.2.ebuild +++ b/gnome-base/librsvg/librsvg-2.34.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.34.2.ebuild,v 1.3 2011/11/21 22:26:35 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.34.2.ebuild,v 1.4 2011/11/23 23:06:13 tetromino Exp $ EAPI="4" GNOME2_LA_PUNT="yes" @@ -56,6 +56,9 @@ src_prepare() { # Fix automagic gtk+ dependency, bug #371290 epatch "${FILESDIR}/${PN}-2.34.0-automagic-gtk.patch" + # bug #391215, https://bugzilla.gnome.org/show_bug.cgi?id=664684 + epatch "${FILESDIR}/${PN}-2.34.2-gir-filename.patch" + # introspection.m4 needed for eautoreconf mv "${WORKDIR}/introspection.m4" "${S}"/ || die -- 2.26.2