commit: b78f5911ccf841e862962d2b1b07301bd1fa4e11 Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> AuthorDate: Fri Jul 22 23:28:38 2016 +0000 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> CommitDate: Fri Jul 22 23:28:49 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b78f5911
media-gfx/gimp: Fix build system (bug #589394) Package-Manager: portage-2.2.28 .../gimp/files/gimp-2.9.4-mkdir-makefile.patch | 36 ++++++++++++++++++++++ media-gfx/gimp/gimp-2.9.4.ebuild | 4 +++ 2 files changed, 40 insertions(+) diff --git a/media-gfx/gimp/files/gimp-2.9.4-mkdir-makefile.patch b/media-gfx/gimp/files/gimp-2.9.4-mkdir-makefile.patch new file mode 100644 index 0000000..661ad69 --- /dev/null +++ b/media-gfx/gimp/files/gimp-2.9.4-mkdir-makefile.patch @@ -0,0 +1,36 @@ +From c081a26345ad1c5bdf6f4ffec27bca517de6d594 Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <sebast...@pipping.org> +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 + diff --git a/media-gfx/gimp/gimp-2.9.4.ebuild b/media-gfx/gimp/gimp-2.9.4.ebuild index 553a34c..0b34d4d 100644 --- a/media-gfx/gimp/gimp-2.9.4.ebuild +++ b/media-gfx/gimp/gimp-2.9.4.ebuild @@ -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
