Skip to content

Commit

Permalink
media-gfx/gimp: Fix build system (bug #589394)
Browse files Browse the repository at this point in the history
Package-Manager: portage-2.2.28
  • Loading branch information
hartwork committed Jul 22, 2016
1 parent d956f3c commit b78f591
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 0 deletions.
36 changes: 36 additions & 0 deletions media-gfx/gimp/files/gimp-2.9.4-mkdir-makefile.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
From c081a26345ad1c5bdf6f4ffec27bca517de6d594 Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <[email protected]>
Date: Sat, 23 Jul 2016 01:02:10 +0200
Subject: [PATCH] Fix creation of output directories

https://bugs.gentoo.org/show_bug.cgi?id=589394
---
icons/Symbolic-Inverted/Makefile.am | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/icons/Symbolic-Inverted/Makefile.am b/icons/Symbolic-Inverted/Makefile.am
index 2981cfc..f3fe6a5 100644
--- a/icons/Symbolic-Inverted/Makefile.am
+++ b/icons/Symbolic-Inverted/Makefile.am
@@ -10,14 +10,14 @@ include $(top_srcdir)/icons/icon-list.mk
# As exceptions, we do not want to invert some icons.
# Just use these as-is: gimp-default-colors, gimp-toilet-paper.png.
12/gimp-default-colors.png: $(top_srcdir)/icons/Symbolic/12/gimp-default-colors.png
- mkdir -p `dirname $<` && cp -f $< $@
+ mkdir -p `dirname $@` && cp -f $< $@
scalable/gimp-default-colors.svg: ../Symbolic/scalable/gimp-default-colors.svg
- mkdir -p `dirname $<` && cp -f $< $@
+ mkdir -p `dirname $@` && cp -f $< $@

%/gimp-toilet-paper.png: $(top_srcdir)/icons/Symbolic/$(@D)/gimp-toilet-paper.png
- mkdir -p `dirname $<` && cp -f $< $@
+ mkdir -p `dirname $@` && cp -f $< $@
scalable/gimp-toilet-paper.svg: ../Symbolic/scalable/gimp-toilet-paper.svg
- mkdir -p `dirname $<` && cp -f $< $@
+ mkdir -p `dirname $@` && cp -f $< $@

# Other exceptions: inverted gimp-color-picker-white|black are generated
# from each other.
--
2.9.2

4 changes: 4 additions & 0 deletions media-gfx/gimp/gimp-2.9.4.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,10 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-2.9.2-no-deprecation.patch # bug 395695, comment 9 and 16
epatch "${FILESDIR}"/${PN}-2.9.4-gegl-bin.patch

# Bug 589394
rm icons/Symbolic-Inverted/Makefile.in || die
epatch "${FILESDIR}"/${PN}-2.9.4-mkdir-makefile.patch

sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
eautoreconf # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too

Expand Down

0 comments on commit b78f591

Please sign in to comment.