summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sping@gentoo.org>2017-05-10 17:40:47 +0200
committerSebastian Pipping <sping@gentoo.org>2017-05-10 17:41:35 +0200
commitd8459d23f6d6b328c222a4fa469ffdb8cda7972f (patch)
treea2e5ea1a9f9ce6b4fdb9ca65501dcfc38eba7e20 /media-libs
parentnet-firewall/ferm: amd64 stable wrt bug #618094 (diff)
downloadgentoo-d8459d23f6d6b328c222a4fa469ffdb8cda7972f.tar.gz
gentoo-d8459d23f6d6b328c222a4fa469ffdb8cda7972f.tar.bz2
gentoo-d8459d23f6d6b328c222a4fa469ffdb8cda7972f.zip
media-libs/gegl: Fix 0.2.0-r2 underlinking (bug #617430)
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/gegl/files/gegl-0.2.0-underlinking.patch22
-rw-r--r--media-libs/gegl/gegl-0.2.0-r2.ebuild1
2 files changed, 19 insertions, 4 deletions
diff --git a/media-libs/gegl/files/gegl-0.2.0-underlinking.patch b/media-libs/gegl/files/gegl-0.2.0-underlinking.patch
index 4468f387855a..53f29c49da7d 100644
--- a/media-libs/gegl/files/gegl-0.2.0-underlinking.patch
+++ b/media-libs/gegl/files/gegl-0.2.0-underlinking.patch
@@ -1,6 +1,6 @@
-From db19965ad957edee3c2ef3e321c3904b436749da Mon Sep 17 00:00:00 2001
+From bedd95f5f14524360117209ed6a1a83627523f54 Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sebastian@pipping.org>
-Date: Mon, 9 Jan 2017 21:38:42 +0100
+Date: Wed, 10 May 2017 17:33:05 +0200
Subject: [PATCH] Backport $(MATH_LIB) patch to GEGL 0.2
Source:
@@ -8,7 +8,8 @@ https://git.gnome.org/browse/gegl/patch/?id=c9bbc815378cb81ba8a48be35f615e7e2d74
---
bin/Makefile.am | 2 +-
examples/Makefile.am | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ tools/Makefile.am | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/bin/Makefile.am b/bin/Makefile.am
index c85ecbd..08a156b 100644
@@ -33,6 +34,19 @@ index c29a1dd..5c4ac3a 100644
$(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la \
- $(DEP_LIBS) $(GTK_LIBS) $(BABL_LIBS) $(PNG_LIBS)
+ $(DEP_LIBS) $(GTK_LIBS) $(BABL_LIBS) $(PNG_LIBS) $(MATH_LIB)
+diff --git a/tools/Makefile.am b/tools/Makefile.am
+index 8f1077d..4dd3845 100644
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -22,7 +22,7 @@ AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
+
+ AM_LDFLAGS = \
+ $(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la \
+- $(DEP_LIBS) $(BABL_LIBS)
++ $(DEP_LIBS) $(BABL_LIBS) $(MATH_LIB)
+
+ noinst_PROGRAMS = introspect operation_reference img_cmp
+
--
-2.11.0
+2.12.2
diff --git a/media-libs/gegl/gegl-0.2.0-r2.ebuild b/media-libs/gegl/gegl-0.2.0-r2.ebuild
index 15d56a636c2c..a1199a76cbf0 100644
--- a/media-libs/gegl/gegl-0.2.0-r2.ebuild
+++ b/media-libs/gegl/gegl-0.2.0-r2.ebuild
@@ -73,6 +73,7 @@ src_prepare() {
epatch "${FILESDIR}"/${P}-g_log_domain.patch
# https://bugs.gentoo.org/show_bug.cgi?id=605216
+ # https://bugs.gentoo.org/show_bug.cgi?id=617430
epatch "${FILESDIR}"/${P}-underlinking.patch
eautoreconf