diff options
| author |   Sebastian Pipping <sping@gentoo.org> | 2013-04-30 23:11:24 +0000 |
|---|---|---|
| committer | Sebastian Pipping <sping@gentoo.org> | 2013-04-30 23:11:24 +0000 |
| commit | 758bdac84f7178f520f7da07a929fb72cd7d9ab7 (patch) | |
| tree | fca208163b0378641111e692e2b0bb1e123bb24f /media-libs/gegl | |
| parent | Version bump (diff) | |
| download | gentoo-2-758bdac84f7178f520f7da07a929fb72cd7d9ab7.tar.gz gentoo-2-758bdac84f7178f520f7da07a929fb72cd7d9ab7.tar.bz2 gentoo-2-758bdac84f7178f520f7da07a929fb72cd7d9ab7.zip | |
media-libs/gegl[introspection]: G_LOG_DOMAIN related compile errors (bug #416587)
(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key 0x401A1600)
Diffstat (limited to 'media-libs/gegl')
| -rw-r--r-- | media-libs/gegl/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/gegl/files/gegl-0.2.0-g_log_domain.patch | 25 | ||||
| -rw-r--r-- | media-libs/gegl/gegl-0.2.0-r1.ebuild | 4 |
3 files changed, 33 insertions, 2 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/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 |