media-libs/gegl[introspection]: G_LOG_DOMAIN related compile errors (bug #416587)

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

4 files changed, 39 insertions, 7 deletions

diff --git a/media-libs/gegl/ChangeLog b/media-libs/gegl/ChangeLog
index d8152c602c9c..a44307e6ccc6 100644
--- a/media-libs/gegl/ChangeLog
+++ b/media-libs/gegl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/gegl
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/ChangeLog,v 1.84 2013/04/28 17:41:14 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/ChangeLog,v 1.85 2013/04/30 23:11:24 sping Exp $
+
+  30 Apr 2013; Sebastian Pipping <sping@gentoo.org> gegl-0.2.0-r1.ebuild,
+  +files/gegl-0.2.0-g_log_domain.patch:
+  Apply experimental fix for G_LOG_DOMAIN related compile errors (bug #416587)
 
   28 Apr 2013; Sebastian Pipping <sping@gentoo.org> gegl-0.2.0.ebuild,
   gegl-0.2.0-r1.ebuild, gegl-9999.ebuild:
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index 6131ca5133ce..9605c93579d6 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -7,6 +7,7 @@ AUX gegl-0.1.8-cve-2012-4433-4757cdf7.patch 2118 SHA256 b9d0d3a304525af4524d1865
 AUX gegl-0.2.0-cve-2012-4433-1e92e523.patch 2365 SHA256 0351770b65c4620868e575ba8e3f5d4e46b09fcf83cb52231ecdc42b2bc96bac SHA512 f27c89ac3b7742da348f75190cb1d5ad2569ab71a188b42a64e23a6254489770c701714e8de49602fdb8e8f063c3c9130abac330dceacee15603098bc1b70348 WHIRLPOOL 107f7ae3d7aa6eac22a5c127cc2dcc1387f808bbab4254cb55aebbc5f1e70be2dbf9b40d6b79c2b62fdc5edde5f2384164ec3b441c281829ba89b366131c873a
 AUX gegl-0.2.0-cve-2012-4433-4757cdf7.patch 1952 SHA256 6ecb465e6fc060417b353418c23c1d97d664666f652f2c4967d7fa6e0125fc84 SHA512 c48ed73b4a042263464819981e5f9fb0c0fc7abe8291840da9e839833a8cd548077fa99fed4b523a5bbac120d4336d2007a243baa359b40a0f0e3ff633bffa57 WHIRLPOOL 34287b2ae70f0d2f61c1aa817e767b3db6041857ce6a09a85371177ae31575d3b73d1f2efe6dccdb6776bdbf9cc518a06e7ed77662eeee85fe4658bb13815dc7
 AUX gegl-0.2.0-ffmpeg-0.11.diff 2022 SHA256 79b2385d828a6e9506f715b423bd5fd1e0ad3d62f3f02bdfe336952f1f3ca46f SHA512 b2d56e4abaae76d7995e8e454b023a5f1e4e74e3bf1f3cbe9663040031762941c3947db5de312ee516733f23e03d72d779794ab7f206e7334b14e298c0ceb493 WHIRLPOOL 2dbd04451a4372289bed0f34fdc8283b85b55bd2d75c32c9b08507a7404e5f5d4274076df300f8caac25df31361f855ca30c19df4d45683136878ebb9ef5603a
+AUX gegl-0.2.0-g_log_domain.patch 1079 SHA256 fa5e4238a6f23f83a48644928472fc9d032cff5f045829f5f56ceffa84a7a904 SHA512 a538d42164dbefbd5044461fe8fdac5d3b2de2d7df5013a5206b0230fe48ea7cf537972b8aab2a40081a15ece1dd818bef70cef95cd0a04bc7179764070a1e45 WHIRLPOOL f9aa2668764ad354f297fcc0f622c1d111f1c77eb80d8471e35e2be7907386b03f0457d3a0a3c5697a3cd9628818493e92d3792bc8d2664287e86e7396fbc2e4
 AUX gegl-0.2.0-introspection-version.patch 1233 SHA256 7238b314bcefedb0cc6e9d65547c0b9cf81466b3ef35ba179607c10f81381b8d SHA512 539508215c769a5571ba0b798ab001d37756a0f264817394282ee3aa9d46ca83fe10a3d37ee8915afe79453d1e72e7adcb928fbb54a22229a06cf0a308095d23 WHIRLPOOL af6f735fce74d161fd3d8e758a38a18b1c65c1192fa7d67c2e10105ae9d0ece6bc771fee385aa76a1f28a089f952480d918e529da9d31b78a2210fed2197a48a
 AUX gegl-doubledestdir.diff 438 SHA256 a39da1569b510092ba345f52f33486fc246165ffd0f84d0129d29e77a26ccc2b SHA512 dcfd999de171ebc80a4016d380793ea5bf39bfb4839715acd01a26edd28dea0a81cc31e92343934a6940f5aece8b2fc476f3328ba45343a3995e79040560b131 WHIRLPOOL da248cfb52a39157d0ef010121182151a00ad684e354c8d3fd2110d64344ca80f77acea5cf0c22ee6467a63ca43d6c2efc846d74137d1a9262d56baa042bad1f
 AUX replace-imgconvert-by-swsscale.patch 2154 SHA256 d0470dd22814afffbbb2fffa7fc9488129b9cae715f26c8330eea913550885dc SHA512 e988ea43516b5664ed8e359e1d964875916540f617b810e958f0644efc98f41abaed6c6cac41c049524dd85decf8819382fb49a5ddd3df42c12747a16fed79e1 WHIRLPOOL 0f28afaf5b9bedb18b178f5df9eddbfc6219899a189e16e15bbeed5da1d1417c55988cf1b6ee5da643fe7494c53f54c2d531cf2d543c94f03869279947b73ef0
@@ -17,15 +18,15 @@ EBUILD gegl-0.1.6-r1.ebuild 2957 SHA256 0e86587d32b6387a9786db121602d5753a8f6e7c
 EBUILD gegl-0.1.6.ebuild 2743 SHA256 6829f93779057e10caf9a985556190e72ff64371511f952971f28c421dfa6884 SHA512 a5ee9f166ed68698c55e1a1da561536705c9c8282dcb949694eeae751dd31748972b943c2f4cab38ffde9caad12eeb60e45639e0cabffaa594e6006a87bfb3f0 WHIRLPOOL e6dbf18465bf4112dde66c20c4e87fe47634d119cc787db48390f2e6324fd76e93c3a1f6372c0ad4b7b3fd89d868ec3c5a04efb84c45f2782f782d5e79210445
 EBUILD gegl-0.1.8-r1.ebuild 3413 SHA256 c3a016c6ca5d9e889e68552c6af85b34718dbce5825949c8d4b1334aa0b3e759 SHA512 c6d7b97ec39b7fca698a5b2e2ffa4da2690a2b45630746920102e4e0e5f99ca43abb76cbb6b68786990be448bd0faf8ae984112aa881da6b2bad7316280f3346 WHIRLPOOL 01c3f567c5171dbe21eee204c587a588ee63c7cf848362d95a2c05edb4334de19fd8a80450369e16fb58d120e590bb4d574a5f83572fe3e1a6d5e8a7839ea743
 EBUILD gegl-0.1.8.ebuild 3215 SHA256 3eb7db2d937e0dc698bea674f40fc1b4bb810a8e40267e28eef7ac21a1f4b708 SHA512 34c57cb573ec2387b69128dd3a2b523f6ef8120f17e84c29a05961f88b75203b91cf53500f4e323aa41523c71cce4900486da06f3fe627ce1c87740fda046242 WHIRLPOOL c04c028d7d12c42f007ca31a8dc3ef18c99213c6a760e9802e92d42a2cfef6f47afa918eff29ae77539346b45ee223579fb6af08cca40226c7335daae6910248
-EBUILD gegl-0.2.0-r1.ebuild 3555 SHA256 b05118ab0602a8ab5e2d4f4cbd949f008e76f2919f60620dc45db8aae48ce5c2 SHA512 8068fabb48983ce8179ab8b8d009c1ab8085a1a91aa32d3423a168c9ecf3c031346d6c64fe97bc7dec1c7169d2540e61e2d481bb4ca4016ab4e38590196288e9 WHIRLPOOL 10a97a4b06f949c98727e35456d0643ec9f07ddc3aff432d299b8158361f6683d69b6cf72112b146566d447bbe2005ed25b791126c9eca76da95b098883feae4
+EBUILD gegl-0.2.0-r1.ebuild 3602 SHA256 d92935ba35f168c9ea899ad6f610af8e8bc9edc3cec6e2dcd68896aca47244b1 SHA512 d4dcbeb1814c3ffe8b7745f2cbe8a24056589af161df9cd8ea706bd2ef62a6adb86f313d80ded8fa10bb2118d9ffd4cfe56385aa6ae021ddde4b8a219efb8578 WHIRLPOOL 6ed94199405a5533009eb9618ec24cff80e960155559ea77b0b9bbe6b7e0d52dfe11c610d9b397893a9c2b5f93ecbc741ca79d9ad671b49d75a9660349a5a5f1
 EBUILD gegl-0.2.0.ebuild 3239 SHA256 db7a7406bc68e2079a5d176c5ed64f208b265f37d89c5ee88ecf9abe7e60531b SHA512 974be85d77dfa174693a6f8a345ffb4ed8eef64987615dd0408f06fa6220ce63bae4afcd99596d2cf09e3794c2ca9ffa25bd9b134ca0891f450e5f6c0b24937a WHIRLPOOL 65339f87b11c64e87098f1fc182e4b7dc0e8a8910c86b3ea1c540a1a2747d250abdb05e705881026952a1b01296a3d200c50d310afb9b362cdea70220114baf6
 EBUILD gegl-9999.ebuild 3101 SHA256 10fcc02892f78f7a3f5755da12bc27f87e71c3fc0fa896940d7b613c26f21324 SHA512 e0eae18f544fca02ca9d5e4a626ea08d3062e9769d8615be88023de1f09c21c95a045464894b7b691ad3f2d8d56d74269f51ee7c014feffb816b0e69646022fa WHIRLPOOL 239ba9e75c96e6be897a1cecf4b770fd6e3569034b40f82abca54d7cf3727b3bc959ae0d83cfe3bd2de59f101877e8875bdfbdf03ba0538f5e40cda188d93ec6
-MISC ChangeLog 11872 SHA256 f24fa01a360cc2aa5bac16361630aa987e63156821da833a8f44ba0e73fac47a SHA512 945dc6ef1b022179d838b84c421f9dff9017d942f8900be84246f8ae7c5d7579677d9f7c6a42d11569d137eb9b3298d8aa34a79d2f9cc717c254f399ba3518e7 WHIRLPOOL 1f9ff24135bc98fbdc407e81c104541b55b7aa2d077c57a57e66f7008bde4ff0dfd558661aa8414bd609215d4048b467fd778371340b6470cea8c24e438cdc61
+MISC ChangeLog 12066 SHA256 8f107cefa0d523e7010922e894b7c6a78b26dfa94b1da960c3b11464dcb5dc3a SHA512 7c73154fbe924bcbcd41d0f97dd96e9c45ecbc42ffaa2f6119bd978286c2a47d2d0d97742ab786b5098b556f503f6131fc3cf957d381349664bbcc9736c53286 WHIRLPOOL 6fff6d22c7be158ff693533921d4f04c93e1dd03c662c2e4eed90f0e672015f3026108b0a400be06c59d6d753ba8d9e54c74ff4fe17fec7acd48cca4189c4847
 MISC metadata.xml 546 SHA256 76148af87ef72e06a1daae6476a80a97058f4f9e5d115c0603e156aeb3fd492d SHA512 0aab6757fb995142f0407c2b9aa35fdd7d18566541ca2dd06134451482287d0fb9b3fabf3b744644edba43d7d5b5838558c622792c041144d1b160f44cf48fb4 WHIRLPOOL a073c9fe5d73789ed6ba380b1c0337948300765d1e509f0097be34f1bdbbdebf8863608dbdfa63b0430695d9f22ae0c3b2a2513cba1520a6fc4178419854bee5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlF9X2QACgkQsAvGakAaFgAMYwCgzaVWkFjzgLqROLgYTOSdEOol
-qAYAn3u8Dwdcbr8gZaKyy294G0yxPDC8
-=hDUi
+iEYEAREIAAYFAlGAT8MACgkQsAvGakAaFgDG3QCfX6Y/XmH0x54FvPnUluY+Vqmk
+FUsAoJv35U0WzsCCfoSssSzpDUPQEvtN
+=YFCb
 -----END PGP SIGNATURE-----
diff --git a/media-libs/gegl/files/gegl-0.2.0-g_log_domain.patch b/media-libs/gegl/files/gegl-0.2.0-g_log_domain.patch
new file mode 100644
index 000000000000..cdb42b2ca5f2
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.2.0-g_log_domain.patch
@@ -0,0 +1,25 @@
+From deaa974528ac1f4099d091a333214b1a50147243 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Wed, 1 May 2013 00:39:42 +0200
+Subject: [PATCH] Prevent double escaping / error "stray ‘\’ in program"
+
+---
+ gegl/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+), 0 deletion(-)
+
+diff --git a/gegl/Makefile.am b/gegl/Makefile.am
+index 43010ce..fd046d2 100644
+--- a/gegl/Makefile.am
++++ b/gegl/Makefile.am
+@@ -119,7 +119,8 @@ INCLUDES = $(AM_CFLAGS) $(AM_CPPFLAGS)
+ 
+ Gegl-@GEGL_API_VERSION@.gir: libgegl-@GEGL_API_VERSION@.la Makefile
+ Gegl_@GEGL_MAJOR_VERSION@_@GEGL_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 GLib-2.0 Babl-0.1
+ Gegl_@GEGL_MAJOR_VERSION@_@GEGL_MINOR_VERSION@_gir_CFLAGS = $(INCLUDES)
++INTROSPECTION_SCANNER_ENV = CFLAGS="${CFLAGS} "-D'G_LOG_DOMAIN="GEGL-"__FILE__'  # No extra backslashes here!
+ Gegl_@GEGL_MAJOR_VERSION@_@GEGL_MINOR_VERSION@_gir_LIBS = libgegl-@GEGL_API_VERSION@.la
+ Gegl_@GEGL_MAJOR_VERSION@_@GEGL_MINOR_VERSION@_gir_FILES = $(introspection_sources)
+ INTROSPECTION_GIRS += Gegl-@GEGL_API_VERSION@.gir
+-- 
+1.8.1.5
+
diff --git a/media-libs/gegl/gegl-0.2.0-r1.ebuild b/media-libs/gegl/gegl-0.2.0-r1.ebuild
index 385b9df097cd..a8d1af9fa33a 100644
--- a/media-libs/gegl/gegl-0.2.0-r1.ebuild
+++ b/media-libs/gegl/gegl-0.2.0-r1.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/gegl/gegl-0.2.0-r1.ebuild,v 1.8 2013/04/28 17:41:14 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-0.2.0-r1.ebuild,v 1.9 2013/04/30 23:11:24 sping Exp $
 
 EAPI=4
 
@@ -65,6 +65,8 @@ src_prepare() {
 	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
 		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
 	fi
+
+	epatch "${FILESDIR}"/${P}-g_log_domain.patch
 	eautoreconf
 
 	use vala && vala_src_prepare