From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0ECE8158088 for ; Wed, 19 Jan 2022 00:48:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EA6382BC012; Wed, 19 Jan 2022 00:48:35 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2AE952BC012 for ; Wed, 19 Jan 2022 00:48:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D77AB342F92 for ; Wed, 19 Jan 2022 00:48:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 476FA24E for ; Wed, 19 Jan 2022 00:48:32 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1642553301.38298eaad5e5fbd13aeab71e5753e1e79987b845.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/files/, media-gfx/tuxpaint/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/tuxpaint/files/tuxpaint-0.9.27-Makefile.patch media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild X-VCS-Directories: media-gfx/tuxpaint/files/ media-gfx/tuxpaint/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 38298eaad5e5fbd13aeab71e5753e1e79987b845 X-VCS-Branch: master Date: Wed, 19 Jan 2022 00:48:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8cea888c-3ff5-49b2-b3bb-92ed1353ae3f X-Archives-Hash: 33ad9ea8da0171fe7b68914821b19eac commit: 38298eaad5e5fbd13aeab71e5753e1e79987b845 Author: Philipp Rösner protonmail com> AuthorDate: Sun Jan 16 21:44:27 2022 +0000 Commit: Sam James gentoo org> CommitDate: Wed Jan 19 00:48:21 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38298eaa media-gfx/tuxpaint: switched to graphicsmagick We switched from virtual/imagemagic-tools to media-gfx/graphicsmagic and added required use flags to the media-gfx/graphicsmagic build dependency. Bug: https://bugs.gentoo.org/831292 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Philipp Roesner protonmail.com> Signed-off-by: Sam James gentoo.org> .../tuxpaint/files/tuxpaint-0.9.27-Makefile.patch | 37 ++++++++++++++++++++-- media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild | 2 +- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.27-Makefile.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.27-Makefile.patch index 7fd2e3ded8ec..fdbd5136f322 100644 --- a/media-gfx/tuxpaint/files/tuxpaint-0.9.27-Makefile.patch +++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.27-Makefile.patch @@ -1,5 +1,5 @@ ---- a./Makefile -+++ b./Makefile +--- a/Makefile ++++ b/Makefile @@ -72,7 +72,7 @@ endif # is the directory containing support files for building for : # /include Header files. @@ -45,6 +45,15 @@ MAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man DEVMAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man +@@ -358,7 +358,7 @@ MOUSE_CFLAGS:=-Isrc/$(MOUSEDIR) -D$(CURSOR_SHAPES)_CURSOR_SHAPES + # are 132x80. On larger screens, they will be bigger (since the New dialog + # is always 4x4 thumbnails); therefore, generating larger thumbs, which can + # be still be scaled down fairly quickly (esp. complicated SVG ones). +-CONVERT_OPTS:=-alpha Background -alpha Off +depth -resize !264x160 -background white -interlace none ++CONVERT_OPTS:=-resize 264x160 -background white -extent 0x0 -interlace none + + .SUFFIXES: + @@ -545,7 +545,7 @@ trans: windows_ARCH_INSTALL:=install-dlls install-tpconf-i18n macos_ARCH_INSTALL:=install-macbundle TuxPaint.dmg install-man install-importscript install-bash-completion @@ -73,6 +82,30 @@ -rm -f -r $(CONFDIR) -rm $(COMPLETIONDIR)/tuxpaint-completion.bash -rm -r $(MAGIC_PREFIX) +@@ -791,11 +791,11 @@ $(THUMB_STARTERS): + @mkdir -p starters/.thumbs + @if [ "x" != "x"$(STARTER_BACK_NAME) ] ; \ + then \ +- composite $(STARTER_NAME) $(STARTER_BACK_NAME) obj/tmp_$(notdir $(STARTER_NAME)).png ; \ +- convert $(CONVERT_OPTS) obj/tmp_$(notdir $(STARTER_NAME)).png $@ 2> /dev/null ; \ ++ gm composite $(STARTER_NAME) $(STARTER_BACK_NAME) obj/tmp_$(notdir $(STARTER_NAME)).png 2> /dev/null ; \ ++ gm convert $(CONVERT_OPTS) obj/tmp_$(notdir $(STARTER_NAME)).png $@ || echo "($@ failed)" ; \ + rm obj/tmp_$(notdir $(STARTER_NAME)).png ; \ + else \ +- convert $(CONVERT_OPTS) $(STARTER_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \ ++ gm convert $(CONVERT_OPTS) $(STARTER_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \ + fi + + $(INSTALLED_THUMB_STARTERS): $(DATA_PREFIX)/%: % +@@ -850,7 +850,7 @@ TEMPLATE_NAME=$(or $(wildcard $(subst templates/.thumbs,templates,$(@:-t.png=.sv + $(THUMB_TEMPLATES): + @printf "." + @mkdir -p templates/.thumbs +- @convert $(CONVERT_OPTS) $(TEMPLATE_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \ ++ @gm convert $(CONVERT_OPTS) $(TEMPLATE_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \ + + $(INSTALLED_THUMB_TEMPLATES): $(DATA_PREFIX)/%: % + @install -D -m 644 $< $@ || ( echo "NO THUMB $<" ) @@ -962,9 +962,9 @@ install-dlls: @cp -R win32/etc/ $(BIN_PREFIX) @echo diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild index 7a1dffc5100d..393cf77443e4 100644 --- a/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild +++ b/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild @@ -31,7 +31,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" dev-util/gperf - virtual/imagemagick-tools + media-gfx/graphicsmagick[jpeg,png,svg] sys-devel/gettext "