media-libs/babl: Fix build with USE=introspection (bug #413663)

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0x401A1600

5 files changed, 55 insertions, 9 deletions

diff --git a/media-libs/babl/ChangeLog b/media-libs/babl/ChangeLog
index 0d30c9d4b7b8..33123ae08cce 100644
--- a/media-libs/babl/ChangeLog
+++ b/media-libs/babl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/babl
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/babl/ChangeLog,v 1.45 2013/02/21 18:07:17 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/babl/ChangeLog,v 1.46 2013/04/29 21:46:02 sping Exp $
+
+  29 Apr 2013; Sebastian Pipping <sping@gentoo.org> babl-0.1.10.ebuild,
+  +files/babl-0.1.10-g-ir-compiler-crash.patch,
+  +files/babl-0.1.10-introspection.patch:
+  Fix build with USE=introspection (bug #413663), patches by upstream and
+  openSUSE
 
   21 Feb 2013; Zac Medico <zmedico@gentoo.org> babl-0.1.10.ebuild:
   Add ~arm-linux keyword.
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index dbe04ddb823c..1983118e672f 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -3,24 +3,26 @@ Hash: SHA256
 
 AUX babl-0.1.0-build-fixes.patch 551 SHA256 bae0afb4e8c1feb7a0bd566616e7b0a303583f8978b28dea84be9e354e9bf9e6 SHA512 53da84e6d44b85f0eede1a0dadec20cd8639219278042484a514678da6a9a0b6356fab71a44be248848cc692cf5151ce599bc8958d37d1568b73933f7209ad13 WHIRLPOOL 843a87e744588d37313e0887e3692f6deed4320c5715f1db2baf6cf9e053c3880f78bde5a2485a58c645927c8a48c5358b46b01853be4677a105f014c460f4b0
 AUX babl-0.1.10-clang.patch 1602 SHA256 c06a8f7daad0b918fedc6eda01e70f94cb376eaef2c557ca469776f18d43bb8f SHA512 892cceb179eb969809aa1f90e52adb786c999d9eb7659b172370e2385dfdb5446a37672c76abc431997507a7ece3575f46869b86ae229f8bee92c41c751751d1 WHIRLPOOL 58fa1028c89db265a76d560ca2a6985f7f6bcb6a18fe04e28bc71946ed6a4046cd0cc71a544b3aa36943873063c5ae5fa230cf425fd0d1c7a2894ec4fc16e577
+AUX babl-0.1.10-g-ir-compiler-crash.patch 705 SHA256 6085e0eed4951f548421e00cf3eb957576bf6126955ca2eeddef499bcd2de2e4 SHA512 5bd7f2815b0df6d65fbbbdfde009483108f2dc018d4b4e966eb73db1be25b71f3e09cd416691ff0451f601dacc268daf59b9b0582c79bc8e153d9744e867bb1b WHIRLPOOL 578185466c06e0442295109461a9f5417c617d450b0ce50de6ede41f6c91ba3d57eb96c508cb8c130a2d6264938061dc28d425deaef5de7dfb9bb0e5445912ee
+AUX babl-0.1.10-introspection.patch 1153 SHA256 9b367f4662835df0dadd2a50c8a382f0177751fa25bac7c3db7355afcf130688 SHA512 7670031fa6a901d9491754bf333aa954369df1768bb8ad81fc114a0bfd08fc6e16681da8ff365898fdbb82acdef344508adda6ed574180b1a473d9b2f47ff1f9 WHIRLPOOL 6011f46aa636376c6b6a542627cf0ecfe35c0cd8dcaca35d876b0d7eda95c5a640e046137c3954abdb292c5974737cbf35bb27d60f510546a08274c684c50ca2
 AUX babl-0.1.4-introspection.patch 708 SHA256 f0ae623b81888e8455a25ec24529bc6158ad1d9ab16954de2e0e1ecd11b57d5e SHA512 2b4ff6e67ea254543321fc43a0ea43942d41519a13b790bb4164f63288cac9b66fe1622df6686e215489179168d17e14a0248ca557be566c45382dc8f8da5965 WHIRLPOOL 250580a3483ad2a6b2f15098152833149e44c487d10bec95304c885b25483b7a4baadedbfb957e8861f04a9710bb3f15314114bd6d50784d0c25d9cac020ba8c
 AUX babl-0.1.6-introspection.patch 598 SHA256 9ec797f8e3f23ae0c7806a6a508c1841c3b48d7cbcdfb9a0d0b1cae2d83d1df5 SHA512 a28a27f3e7a7421edd148c3a8e868f33a97c7a703afe550bcea2ae620e2bcdc910f9a0e20825bb8bf27d0ab9c6eb9d17dd4fdcf82a8d11013f2f9a7d1680e8ce WHIRLPOOL 6ccf8965dbcfc7c52f0fa0ec59bd36eff5a0ec2d78126781cba3bd5e91c9d519031878f8a1e21100cdae8351b7a8fe3d52000ca0b58064133f9121816c2a605d
 DIST babl-0.1.10.tar.bz2 449537 SHA256 943fc36ceac7dd25bc928256bc7b535a42989c6b971578146869eee5fe5955f4 SHA512 2950d94c255ee05d405e003a46138da0f4e0cad65e2d2a882089b788c2deac0524014f7c5758c3097253bdbebaded433caf0447c7d218c9cc96798df9e6f0c92 WHIRLPOOL a71907a531bc71c7ac0c84a197a559c50321a5d96b5d846083935390890ef116780d49bd458577aef0e948395dc14897e6fbbc75478b2a59d57d4381cf7f8db8
 DIST babl-0.1.4.tar.bz2 423645 SHA256 5b36312528de84815f054345cd478743a9493981a44060013b682d0304ffe733
-DIST babl-0.1.6.tar.bz2 462712 SHA256 319b9004a5366101fd522da02cc983a5d0f50a17af0fa5cbce3535e31bce19a4
+DIST babl-0.1.6.tar.bz2 462712 SHA256 319b9004a5366101fd522da02cc983a5d0f50a17af0fa5cbce3535e31bce19a4 SHA512 c38549f27bba3df31fc79602e64aab5b4c7eea83d2f45baf06bdbf64e162384e666610ce4b74e67e26cad1b702972f7aed9460bdebd018ac0782cd8d7fdc98d7 WHIRLPOOL 3a0cf3ce8980c2f84a9aef8c8f6650ed6c174183a4ba00b1a034aad938d26454327991b818b83b3324f585897e52d327453a0a03440d35dbcbd87269e3b89370
 DIST babl-0.1.8.tar.bz2 471664 SHA256 dbef10866835c27e6dc623af1d5cd64b3f38dc06654e0641c87747458678341b
-EBUILD babl-0.1.10.ebuild 1787 SHA256 3d74365f095c6155dea0024779d69d83c8e4ee7f99d2a54e3691375e285cb1e7 SHA512 14cde2bfca382599d52673afc668021497f369dbc6b874c22170732c223f9d9b74a5d3cfc9fc38b5e01e20355d44da4b257ec219e9ff6a46cc9dc9f856e948f8 WHIRLPOOL 1c5ccd7ebe103981b0c3ff1cf85f6749dd12b9328c86f6263236c696bb1ae1207d24f1149b5140468ff6b2c724d7b1a2f9b593ad4ae83db28052f973cdd68862
+EBUILD babl-0.1.10.ebuild 1831 SHA256 2ae5bdc62d212b9823af0eebd6cb235f89292058de6402a14c7d5c946950ba29 SHA512 d33378c6dc52d35db8df767de82160c6805fe52eee7dc91930cc1dd73a6ecedcc2e0f3b7e2454f70c08439f829330097799269514794b1f5387315ca998aff0e WHIRLPOOL 9b623ff2a4b5b8f23de6564543eb781e1d07e34d3e15eedc0d3974fe80ac2d295416c030a67c905241a92a15c3e8909e7fe32b8ab28842173c75e33210ec13e8
 EBUILD babl-0.1.4-r2.ebuild 1360 SHA256 abd23ce0166e9c697ed0892d3daae9d94ebfdbcfcc1004c1d4d79d6ef1435c4a SHA512 d93a8e5ee7bcf3306146f6da8d93b0d0ec39c144de75fb66c74254b03b0efb42aeb92f8b4338cc3eaae9ed88d063209d12da939446b8034a47fc950684c9e4c9 WHIRLPOOL bd6aff4c8d79005a73d845b34be037c03797b63daf0b68aaa78ef14a8f7aaf2a97115a82811fa5ba598119e75c6abc67178406c29c30675750b999b239d9ba52
 EBUILD babl-0.1.4.ebuild 1245 SHA256 2ff35e333687024f7f082a20e3a8e27d84658760402031b4024d489abbaa112b SHA512 3304e2cbfb74386835b971ed50cb84259023b8509073bf41140c45da2e6debcc902ebd2afd1ef98552652e42782228cbb8bcb2b6e9cf5aa0218145f4257a0084 WHIRLPOOL 85aa66a83d0692a33f14b4a130ec01dbae86bf858d614dc6a06d7114b4f8d61d4be3859ec32f1f2ec4daaf286691a5337aeff13c66b509c0fa290dc4f724c066
 EBUILD babl-0.1.6.ebuild 1522 SHA256 005da2e2438fb4d5ff9b892b32106c11c685bcc3bacf79ba097c7167bdf48b73 SHA512 a76ef7019326fc3948dac3db70751286a2b2aa19afcc8a2f2f8c34deb9cd1e63e8b7de0dad8d667ada21aaf0728911901213983eeefca4c502fcd23a784365c7 WHIRLPOOL daaecd2339ae2e38a83e63d5ae426df2bcdc093b902c96375b9e3c617b94bee27ea6b4d4b9fc247ff99af99bfb049a6956ceb821b822f0d96bac080acebaa68a
 EBUILD babl-0.1.8.ebuild 1529 SHA256 8e56098fc156bccaf07a776b0c5e62c216fd180a0d8b2f1e52c39715f13f3de6 SHA512 9b0e261d55f81a7b3194774be61cbe5b2e90f8da67c424a5b47f8b462998be0864e94c95c892ebb32797ba9c305d1fe690d62698b0096feacba93ff41fe4288d WHIRLPOOL b2ea2208e0eec635438e680ee7c8c5ed082fea68e1a53efb1fee31dcb2ba59858001b6352be950a9bff4ed5fdcc6999df76869641cae96889e973dd54c581e5e
 EBUILD babl-9999.ebuild 1467 SHA256 a3806af7a4da9d3cf7842bf8857ddd86fb477ccf72642f97b68e3ae168da79f7 SHA512 48ba59c857bfe268365676cf3b010a13448a051c39355d83334f01317caa417ebd892c20054919939f98a4bac35e868bdcd9cad0674320f71b55cd092b0de218 WHIRLPOOL 834bf840131874703a561924900182d711bfeaf76f8e77889bf971e6d1f414cec405ad74ef7221d5ee0213f033d887161478c76f332aa55cd39a016d1f4809b3
-MISC ChangeLog 5578 SHA256 5923c215ef4b60c9ad399929738b08df12ccff69b47596d11697ab094a671fd2 SHA512 435675da2980af6a3f0d332a2acb77cca7115da125595820acce634f8908a96a874ac6e96a508f11dc517824d2fbfa1ee267afad3e929bef06fc386fdfe4764b WHIRLPOOL f79b7d035a14baa4ff2f2f189b09ff7a1bf02b661c1cca39c8c8793076fe7b235fdb7f69e9f1040cf0147c602ed628361cc90265211937b94be172f341572721
+MISC ChangeLog 5824 SHA256 c3d8a636f6d1eaf0a3165c6471146b4e7918f3b34b4e57a74dabd8d0822d58f8 SHA512 ed76faeedc7792a1911894ea52acc2b8ebc777c400e58bd9df3120ef18f4ac5135e0600501108625b8c4ff2945e17735d4f5514b95ec246cad985973e421b31c WHIRLPOOL f511d2dcea090f52a6e0234a45eec8c5f9c25c41ff1b511b731ea8e58c390cb32dafbda7362fa5dc8a3ef9d9f71219f2aad3e898369a2eeb9a452cefff1abdf8
 MISC metadata.xml 391 SHA256 3df30b3fc9c861ed6cf986f63b269dd11c63713ff36b234af2c31adfb78760f1 SHA512 38ad0ecbdce22d342844dc0ae2772935cf5d3cfd1dc1281aa69f6ccc640b58005af3f41f33687a30d2d86fa1722a5afdb79add27cfb46f4cd9c9e9485eff9dd1 WHIRLPOOL 843c6f2c2797b04471132fd3981b1f66cd59a0f206169a833af8965f8f1bf7f9412009f583e74d8edacda4c294d33b5560bba846e9a4fcc546dd10f710713db1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEmYlYACgkQ/ejvha5XGaPsfgCfef+tbrl3toUH/7cBQLuqh80p
-W24An1r5uxIBFp0d2ZFr5G7YZAGGNv4Y
-=ZPlR
+iEYEAREIAAYFAlF+6j4ACgkQsAvGakAaFgCM3QCfcYid8mqlXNzpsgvBNBQSl/ul
+6CAAn0vFqmlez0gmj29egmsbVgVQd9jt
+=XVnv
 -----END PGP SIGNATURE-----
diff --git a/media-libs/babl/babl-0.1.10.ebuild b/media-libs/babl/babl-0.1.10.ebuild
index a5f2d2f13792..6604a457e72e 100644
--- a/media-libs/babl/babl-0.1.10.ebuild
+++ b/media-libs/babl/babl-0.1.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/babl/babl-0.1.10.ebuild,v 1.6 2013/02/21 18:07:17 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/babl/babl-0.1.10.ebuild,v 1.7 2013/04/29 21:46:02 sping Exp $
 
 EAPI=3
 VALASLOT=0.14
@@ -28,7 +28,8 @@ src_prepare() {
 	# fix compilation on OSX, can be dropped on next release:
 	# http://mail.gnome.org/archives/commits-list/2012-April/msg02589.html
 	sed -i -e 's/values\.h/limits.h/' babl/babl-palette.c || die
-	epatch "${FILESDIR}"/${PN}-0.1.6-introspection.patch
+	epatch "${FILESDIR}"/${P}-introspection.patch
+	epatch "${FILESDIR}"/${P}-g-ir-compiler-crash.patch
 	eautoreconf
 }
 
diff --git a/media-libs/babl/files/babl-0.1.10-g-ir-compiler-crash.patch b/media-libs/babl/files/babl-0.1.10-g-ir-compiler-crash.patch
new file mode 100644
index 000000000000..4b6cf919a849
--- /dev/null
+++ b/media-libs/babl/files/babl-0.1.10-g-ir-compiler-crash.patch
@@ -0,0 +1,12 @@
+Index: babl-0.1.10/babl/Makefile.am
+===================================================================
+--- babl-0.1.10.orig/babl/Makefile.am
++++ babl-0.1.10/babl/Makefile.am
+@@ -95,6 +95,7 @@ INTROSPECTION_COMPILER_ARGS = --included
+ if HAVE_INTROSPECTION
+ Babl-$(BABL_API_VERSION).gir: $(G_IR_SCANNER) $(library_include_HEADERS) $(c_sources) $(srcdir)/Makefile.am libbabl-@BABL_API_VERSION@.la
+ 	$(INTROSPECTION_SCANNER) -v --namespace Babl --nsversion=$(BABL_API_VERSION) \
++            --identifier-prefix= --symbol-prefix=babl \
+             --add-include-path=$(srcdir) --add-include-path=. \
+             --library=$(builddir)/libbabl-$(BABL_API_VERSION).la \
+             --libtool="$(LIBTOOL)" \
diff --git a/media-libs/babl/files/babl-0.1.10-introspection.patch b/media-libs/babl/files/babl-0.1.10-introspection.patch
new file mode 100644
index 000000000000..f9b92698689d
--- /dev/null
+++ b/media-libs/babl/files/babl-0.1.10-introspection.patch
@@ -0,0 +1,25 @@
+From c024c89f95de4a8fa95ba96790dac61768d11a17 Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar@opensuse.org>
+Date: Tue, 10 Jan 2012 16:32:50 +0000
+Subject: gobject-introspection: fix build of the .gir and .typelib files.
+
+---
+diff --git a/babl/Makefile.am b/babl/Makefile.am
+index cefab57..03115a3 100644
+--- a/babl/Makefile.am
++++ b/babl/Makefile.am
+@@ -93,10 +93,10 @@ INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
+ INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
+ 
+ if HAVE_INTROSPECTION
+-Babl-$(BABL_API_VERSION).gir: $(G_IR_SCANNER) $(library_include_HEADERS) $(c_sources) $(srcdir)/Makefile.am
++Babl-$(BABL_API_VERSION).gir: $(G_IR_SCANNER) $(library_include_HEADERS) $(c_sources) $(srcdir)/Makefile.am libbabl-@BABL_API_VERSION@.la
+ 	$(INTROSPECTION_SCANNER) -v --namespace Babl --nsversion=$(BABL_API_VERSION) \
+             --add-include-path=$(srcdir) --add-include-path=. \
+-            --library=babl-$(BABL_API_VERSION) \
++            --library=$(builddir)/libbabl-$(BABL_API_VERSION).la \
+             --libtool="$(LIBTOOL)" \
+             --output $@ \
+             -DBABL_IS_BEING_COMPILED \
+--
+cgit v0.9.1