| 1 |
commit: 38298eaad5e5fbd13aeab71e5753e1e79987b845 |
| 2 |
Author: Philipp Rösner <rndxelement <AT> protonmail <DOT> com> |
| 3 |
AuthorDate: Sun Jan 16 21:44:27 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 19 00:48:21 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38298eaa |
| 7 |
|
| 8 |
media-gfx/tuxpaint: switched to graphicsmagick |
| 9 |
|
| 10 |
We switched from virtual/imagemagic-tools to media-gfx/graphicsmagic and |
| 11 |
added required use flags to the media-gfx/graphicsmagic build dependency. |
| 12 |
|
| 13 |
Bug: https://bugs.gentoo.org/831292 |
| 14 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 15 |
Signed-off-by: Philipp Roesner <rndxelement <AT> protonmail.com> |
| 16 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 17 |
|
| 18 |
.../tuxpaint/files/tuxpaint-0.9.27-Makefile.patch | 37 ++++++++++++++++++++-- |
| 19 |
media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild | 2 +- |
| 20 |
2 files changed, 36 insertions(+), 3 deletions(-) |
| 21 |
|
| 22 |
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.27-Makefile.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.27-Makefile.patch |
| 23 |
index 7fd2e3ded8ec..fdbd5136f322 100644 |
| 24 |
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.27-Makefile.patch |
| 25 |
+++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.27-Makefile.patch |
| 26 |
@@ -1,5 +1,5 @@ |
| 27 |
---- a./Makefile |
| 28 |
-+++ b./Makefile |
| 29 |
+--- a/Makefile |
| 30 |
++++ b/Makefile |
| 31 |
@@ -72,7 +72,7 @@ endif |
| 32 |
# <HOSTROOT> is the directory containing support files for building for <HOST>: |
| 33 |
# <HOSTROOT>/include Header files. |
| 34 |
@@ -45,6 +45,15 @@ |
| 35 |
MAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man |
| 36 |
DEVMAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man |
| 37 |
|
| 38 |
+@@ -358,7 +358,7 @@ MOUSE_CFLAGS:=-Isrc/$(MOUSEDIR) -D$(CURSOR_SHAPES)_CURSOR_SHAPES |
| 39 |
+ # are 132x80. On larger screens, they will be bigger (since the New dialog |
| 40 |
+ # is always 4x4 thumbnails); therefore, generating larger thumbs, which can |
| 41 |
+ # be still be scaled down fairly quickly (esp. complicated SVG ones). |
| 42 |
+-CONVERT_OPTS:=-alpha Background -alpha Off +depth -resize !264x160 -background white -interlace none |
| 43 |
++CONVERT_OPTS:=-resize 264x160 -background white -extent 0x0 -interlace none |
| 44 |
+ |
| 45 |
+ .SUFFIXES: |
| 46 |
+ |
| 47 |
@@ -545,7 +545,7 @@ trans: |
| 48 |
windows_ARCH_INSTALL:=install-dlls install-tpconf-i18n |
| 49 |
macos_ARCH_INSTALL:=install-macbundle TuxPaint.dmg install-man install-importscript install-bash-completion |
| 50 |
@@ -73,6 +82,30 @@ |
| 51 |
-rm -f -r $(CONFDIR) |
| 52 |
-rm $(COMPLETIONDIR)/tuxpaint-completion.bash |
| 53 |
-rm -r $(MAGIC_PREFIX) |
| 54 |
+@@ -791,11 +791,11 @@ $(THUMB_STARTERS): |
| 55 |
+ @mkdir -p starters/.thumbs |
| 56 |
+ @if [ "x" != "x"$(STARTER_BACK_NAME) ] ; \ |
| 57 |
+ then \ |
| 58 |
+- composite $(STARTER_NAME) $(STARTER_BACK_NAME) obj/tmp_$(notdir $(STARTER_NAME)).png ; \ |
| 59 |
+- convert $(CONVERT_OPTS) obj/tmp_$(notdir $(STARTER_NAME)).png $@ 2> /dev/null ; \ |
| 60 |
++ gm composite $(STARTER_NAME) $(STARTER_BACK_NAME) obj/tmp_$(notdir $(STARTER_NAME)).png 2> /dev/null ; \ |
| 61 |
++ gm convert $(CONVERT_OPTS) obj/tmp_$(notdir $(STARTER_NAME)).png $@ || echo "($@ failed)" ; \ |
| 62 |
+ rm obj/tmp_$(notdir $(STARTER_NAME)).png ; \ |
| 63 |
+ else \ |
| 64 |
+- convert $(CONVERT_OPTS) $(STARTER_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \ |
| 65 |
++ gm convert $(CONVERT_OPTS) $(STARTER_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \ |
| 66 |
+ fi |
| 67 |
+ |
| 68 |
+ $(INSTALLED_THUMB_STARTERS): $(DATA_PREFIX)/%: % |
| 69 |
+@@ -850,7 +850,7 @@ TEMPLATE_NAME=$(or $(wildcard $(subst templates/.thumbs,templates,$(@:-t.png=.sv |
| 70 |
+ $(THUMB_TEMPLATES): |
| 71 |
+ @printf "." |
| 72 |
+ @mkdir -p templates/.thumbs |
| 73 |
+- @convert $(CONVERT_OPTS) $(TEMPLATE_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \ |
| 74 |
++ @gm convert $(CONVERT_OPTS) $(TEMPLATE_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \ |
| 75 |
+ |
| 76 |
+ $(INSTALLED_THUMB_TEMPLATES): $(DATA_PREFIX)/%: % |
| 77 |
+ @install -D -m 644 $< $@ || ( echo "NO THUMB $<" ) |
| 78 |
@@ -962,9 +962,9 @@ install-dlls: |
| 79 |
@cp -R win32/etc/ $(BIN_PREFIX) |
| 80 |
@echo |
| 81 |
|
| 82 |
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild |
| 83 |
index 7a1dffc5100d..393cf77443e4 100644 |
| 84 |
--- a/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild |
| 85 |
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild |
| 86 |
@@ -31,7 +31,7 @@ RDEPEND=" |
| 87 |
DEPEND="${RDEPEND}" |
| 88 |
BDEPEND=" |
| 89 |
dev-util/gperf |
| 90 |
- virtual/imagemagick-tools |
| 91 |
+ media-gfx/graphicsmagick[jpeg,png,svg] |
| 92 |
sys-devel/gettext |
| 93 |
" |
Archives