media-gfx/gimp: Fix 2.9.6 gold linking (bug #629300)

Package-Manager: Portage-2.3.8, Repoman-2.3.3

diff --git a/media-gfx/gimp/files/gimp-2.9.6-underlinking.patch b/media-gfx/gimp/files/gimp-2.9.6-underlinking.patch
new file mode 100644 (file)
index 0000000..9208c2f
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.9.6-underlinking.patch
@@ -0,0 +1,20 @@
+diff --git a/libgimpbase/Makefile.am b/libgimpbase/Makefile.am
+index a1a6719..85c8518 100644
+--- a/libgimpbase/Makefile.am
++++ b/libgimpbase/Makefile.am
+@@ -22,6 +22,7 @@ uninstall-libtool-import-lib:
+       -rm $(DESTDIR)$(libdir)/libgimpbase-$(GIMP_API_VERSION).dll.a
+       -rm $(DESTDIR)$(libdir)/gimpbase.def
+ else
++libm = -lm
+ install-libtool-import-lib:
+ uninstall-libtool-import-lib:
+ endif
+@@ -169,6 +170,7 @@ EXTRA_libgimpbase_@GIMP_API_VERSION@_la_DEPENDENCIES = $(gimpbase_def)
+ libgimpbase_@GIMP_API_VERSION@_la_LIBADD = \
+       $(GIO_LIBS)     \
+       $(GEXIV2_LIBS)  \
++      $(libm) \
+       $(ole32_lib)
+ 
+ install-data-local: install-ms-lib install-libtool-import-lib

diff --git a/media-gfx/gimp/gimp-2.9.6.ebuild b/media-gfx/gimp/gimp-2.9.6.ebuild
index a10239d72f3813adc4a7c133220ef1806895ef58..b0ad56d9c6f082f7b8ed14a721a6050cd97e1038 100644 (file)
--- a/media-gfx/gimp/gimp-2.9.6.ebuild
+++ b/media-gfx/gimp/gimp-2.9.6.ebuild
@@ -89,6 +89,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+       eapply "${FILESDIR}"/${P}-underlinking.patch  # from 629304
        eapply_user
 
        sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864