Skip to content

Commit

Permalink
media-gfx/gimp: Fix 2.9.6 gold linking (bug #629300)
Browse files Browse the repository at this point in the history
Package-Manager: Portage-2.3.8, Repoman-2.3.3
  • Loading branch information
hartwork committed Aug 30, 2017
1 parent 752ced7 commit f1fbb77
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 0 deletions.
20 changes: 20 additions & 0 deletions media-gfx/gimp/files/gimp-2.9.6-underlinking.patch
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions media-gfx/gimp/gimp-2.9.6.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f1fbb77

Please sign in to comment.