diff options
| author |   Sebastian Pipping <sping@gentoo.org> | 2017-05-21 00:21:02 +0200 |
|---|---|---|
| committer | Sebastian Pipping <sping@gentoo.org> | 2017-05-21 00:22:15 +0200 |
| commit | 3980d9be8a48e5aa8c5b47416f9c31ab171a981b (patch) | |
| tree | 06ea7898680cf5685ce356a5d513536ec4804fd0 | |
| parent | meson.eclass: new eclass for packages using the meson build system (diff) | |
| download | gentoo-3980d9be8a48e5aa8c5b47416f9c31ab171a981b.tar.gz gentoo-3980d9be8a48e5aa8c5b47416f9c31ab171a981b.tar.bz2 gentoo-3980d9be8a48e5aa8c5b47416f9c31ab171a981b.zip | |
media-libs/gegl: Fix USE=introspection compilation (bug #617618)
Package-Manager: Portage-2.3.6, Repoman-2.3.2
| -rw-r--r-- | media-libs/gegl/files/gegl-0.3.14-g_log_domain.patch | 47 | ||||
| -rw-r--r-- | media-libs/gegl/gegl-0.3.14.ebuild | 3 |
2 files changed, 49 insertions, 1 deletions
diff --git a/media-libs/gegl/files/gegl-0.3.14-g_log_domain.patch b/media-libs/gegl/files/gegl-0.3.14-g_log_domain.patch new file mode 100644 index 000000000000..4fb81a2b2bb7 --- /dev/null +++ b/media-libs/gegl/files/gegl-0.3.14-g_log_domain.patch @@ -0,0 +1,47 @@ +From 81fb956b221e4b1f919788d8a5f6a3a5462b86ae Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=98yvind=20Kol=C3=A5s?= <pippin@gimp.org> +Date: Thu, 23 Mar 2017 14:59:28 +0100 +Subject: build: move G_LOG_DOMAIN define to a Makefile.am as suggested in glib + docs... + +--- + configure.ac | 2 -- + gegl/Makefile.am | 2 ++ + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 41ed17e..36e8e2a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1269,8 +1269,6 @@ done + # We should support this at some point if possible + #LDFLAGS="-Wl,-z,defs" + +-CFLAGS="$CFLAGS -DG_LOG_DOMAIN=\\\"GEGL\\\"" +- + dnl bin/node-editors/Makefile + AC_CONFIG_FILES([ + Makefile +diff --git a/gegl/Makefile.am b/gegl/Makefile.am +index 2030ebb..b5f70d8 100644 +--- a/gegl/Makefile.am ++++ b/gegl/Makefile.am +@@ -12,6 +12,7 @@ endif + + SUBDIRS = buffer graph module operation process property-types opencl + ++ + CLEANFILES = + + AM_CPPFLAGS = \ +@@ -31,6 +32,7 @@ AM_CPPFLAGS = \ + -I$(top_builddir)/gegl/property-types \ + -I$(top_srcdir)/gegl/property-types \ + -DLIBDIR=\""$(libdir)"\" \ ++ -DG_LOG_DOMAIN=\"GEGL\" \ + -DGEGL_LOCALEDIR=\""$(GEGL_LOCALEDIR)"\" + + AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS) +-- +cgit v0.12 + diff --git a/media-libs/gegl/gegl-0.3.14.ebuild b/media-libs/gegl/gegl-0.3.14.ebuild index f9b15ae02a4b..7a50c447bbf5 100644 --- a/media-libs/gegl/gegl-0.3.14.ebuild +++ b/media-libs/gegl/gegl-0.3.14.ebuild @@ -86,7 +86,8 @@ src_prepare() { sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die fi - #epatch "${FILESDIR}"/${P}-g_log_domain.patch + # https://bugs.gentoo.org/show_bug.cgi?id=617618 + epatch "${FILESDIR}"/${P}-g_log_domain.patch # commit 7c78497b : tests that use gegl.png are broken on non-amd64 sed -e '/clones.xml/d' \ |