* [gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/files/, media-gfx/tuxpaint/
@ 2022-01-16 1:34 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2022-01-16 1:34 UTC (permalink / raw
To: gentoo-commits
commit: cf9acaa5689862e0d346cef31ea735bd9215f711
Author: Philipp Rösner <rndxelement <AT> protonmail <DOT> com>
AuthorDate: Sat Jan 8 00:04:24 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 16 01:33:24 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf9acaa5
media-gfx/tuxpaint: cleaned up src_prepare
We fixed the QA issue that man pages were stored as .gz.
Also we moved the sed call in src_prepare to a patch file.
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Philipp Roesner <rndxelement <AT> protonmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../tuxpaint/files/tuxpaint-0.9.27-Makefile.patch | 117 +++++++++++++++++++++
media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild | 25 ++---
2 files changed, 124 insertions(+), 18 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
new file mode 100644
index 000000000000..7fd2e3ded8ec
--- /dev/null
+++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.27-Makefile.patch
@@ -0,0 +1,117 @@
+--- a./Makefile
++++ b./Makefile
+@@ -72,7 +72,7 @@ endif
+ # <HOSTROOT> is the directory containing support files for building for <HOST>:
+ # <HOSTROOT>/include Header files.
+ # <HOSTROOT>/lib Library files.
+-# <HOSTROOT>/lib/pkgconfig *.pc files.
++# <HOSTROOT>/$(LIBDIR)/pkgconfig *.pc files.
+ #
+ ifdef HOST
+ ifdef HOSTROOT
+@@ -103,7 +103,7 @@ ifdef HOST
+ # We set PKG_CONFIG_LIBDIR instead of PKG_CONFIG_PATH because we want to
+ # *change* where pkg-config looks for .pc files instead of adding to the
+ # default path which may have libraries that aren't for HOST.
+- export PKG_CONFIG_LIBDIR:=$(HOSTROOT)/lib/pkgconfig
++ export PKG_CONFIG_LIBDIR:=$(HOSTROOT)/$(LIBDIR)/pkgconfig
+ endif
+ endif
+
+@@ -169,7 +169,7 @@ windows_ARCH_CFLAGS:=
+ macos_ARCH_CFLAGS:=-isysroot $(SDKROOT) -I$(SDKROOT)/usr/include -I$(HOSTROOT)/include -mmacosx-version-min=$(MINVER) -arch $(subst $() $(), -arch ,$(ARCHS)) -w -headerpad_max_install_names -DHAVE_STRCASESTR
+ ios_ARCH_CFLAGS:=-isysroot $(SDKROOT) -I$(SDKROOT)/usr/include -I$(HOSTROOT)/include $(MINVEROPT) -arch $(subst $() $(), -arch ,$(ARCHS)) -w -fPIC -DHAVE_STRCASESTR -DUNLINK_ONLY
+ beos_ARCH_CFLAGS:=
+-linux_ARCH_CFLAGS:=
++linux_ARCH_CFLAGS:= ${CFLAGS}
+ ARCH_CFLAGS:=$($(OS)_ARCH_CFLAGS)
+
+ windows_ARCH_LDFLAGS:=
+@@ -205,7 +205,7 @@ ARCH_HEADERS:=$($(OS)_ARCH_HEADERS)
+ windows_PREFIX:=/usr/local
+ macos_PREFIX:=Resources
+ ios_PREFIX:=.
+-linux_PREFIX:=/usr/local
++linux_PREFIX:=/usr
+ PREFIX:=$($(OS)_PREFIX)
+
+ # Root directory to place files when creating packages.
+@@ -243,7 +243,7 @@ MAGIC_PREFIX:=$(DESTDIR)$(LIBDIR)/lib$(LIBDIRSUFFIX)/tuxpaint/plugins
+
+ # Docs and man page:
+ DOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint-$(VER_VERSION)
+-DEVDOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint-$(VER_VERSION)/tuxpaint-dev
++DEVDOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/${PF}/tuxpaint-dev
+ MAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man
+ DEVMAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man
+
+@@ -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
+ ios_ARCH_INSTALL:=install-iosbundle install-man install-importscript install-bash-completion
+-linux_ARCH_INSTALL:=install-xdg install-man install-importscript install-bash-completion
++linux_ARCH_INSTALL:= install-man install-importscript install-bash-completion
+ ARCH_INSTALL:=$($(OS)_ARCH_INSTALL)
+
+ # "make install" installs all of the various parts
+@@ -693,12 +693,12 @@ uninstall: uninstall-i18n
+ -rm $(BIN_PREFIX)/tuxpaint-import
+ -rm -r $(DATA_PREFIX)
+ -rm -r $(DOC_PREFIX)
+- -rm $(MAN_PREFIX)/man1/tuxpaint.1.gz
+- -rm $(MAN_PREFIX)/*/man1/tuxpaint.1.gz
+- -rm $(MAN_PREFIX)/man1/tuxpaint-import.1.gz
+- -rm $(MAN_PREFIX)/*/man1/tuxpaint-import.1.gz
+- -rm $(MAN_PREFIX)/man1/tp-magic-config.1.gz
+- -rm $(MAN_PREFIX)/*/man1/tp-magic-config.1.gz
++ -rm $(MAN_PREFIX)/man1/tuxpaint.1
++ -rm $(MAN_PREFIX)/*/man1/tuxpaint.1
++ -rm $(MAN_PREFIX)/man1/tuxpaint-import.1
++ -rm $(MAN_PREFIX)/*/man1/tuxpaint-import.1
++ -rm $(MAN_PREFIX)/man1/tp-magic-config.1
++ -rm $(MAN_PREFIX)/*/man1/tp-magic-config.1
+ -rm -f -r $(CONFDIR)
+ -rm $(COMPLETIONDIR)/tuxpaint-completion.bash
+ -rm -r $(MAGIC_PREFIX)
+@@ -962,9 +962,9 @@ install-dlls:
+ @cp -R win32/etc/ $(BIN_PREFIX)
+ @echo
+ @echo "...Installing Library Modules..."
+- @mkdir -p $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders
+- @cp $(MINGW_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders
+- @strip -s $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll
++ @mkdir -p $(BIN_PREFIX)/$(LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders
++ @cp $(MINGW_DIR)/$(LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/$(LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders
++ @strip -s $(BIN_PREFIX)/$(LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders/*.dll
+
+ # Install symlink:
+ .PHONY: install-haiku
+@@ -1039,24 +1039,20 @@ install-man:
+ @install -d $(MAN_PREFIX)/man1
+ @# tuxpaint.1
+ @cp man/en/tuxpaint.1 $(MAN_PREFIX)/man1/
+- @gzip -f $(MAN_PREFIX)/man1/tuxpaint.1
+- @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint.1.gz
++ @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint.1
+ @# tuxpaint-import.1
+ @cp man/en/tuxpaint-import.1 $(MAN_PREFIX)/man1/
+- @gzip -f $(MAN_PREFIX)/man1/tuxpaint-import.1
+- @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint-import.1.gz
++ @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint-import.1
+ @# tp-magic-config.1
+ @cp man/en/tp-magic-config.1 $(MAN_PREFIX)/man1/
+- @gzip -f $(MAN_PREFIX)/man1/tp-magic-config.1
+- @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tp-magic-config.1.gz
++ @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tp-magic-config.1
+ @echo
+ for l in `ls -d man/*.UTF-8 | cut -d '/' -f 2`; do \
+ DEST=$(MAN_PREFIX)/$$l/man1 ; \
+ echo "...Installing $$l man pages into $$DEST..." ; \
+ install -d $$DEST ; \
+ cp man/$$l/tuxpaint.1 $$DEST ; \
+- gzip -f $$DEST/tuxpaint.1 ; \
+- chmod a+rx,g-w,o-w $$DEST/tuxpaint.1.gz ; \
++ chmod a+rx,g-w,o-w $$DEST/tuxpaint.1 ; \
+ done
+ @# FIXME: The other man pages aren't localizable yet -bjk 2021.08.14
+
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild
index 9fbfe4c29e7b..43abb09a491e 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild
@@ -11,21 +11,21 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
RDEPEND="
app-text/libpaper
dev-libs/fribidi
gnome-base/librsvg:2
- media-gfx/libimagequant
>=media-libs/libpng-1.2:0=
>=media-libs/freetype-2:2
media-libs/libsdl[joystick]
- media-libs/sdl-gfx
media-libs/sdl-image[png]
media-libs/sdl-mixer
media-libs/sdl-pango
media-libs/sdl-ttf
+ media-libs/sdl-gfx
+ media-gfx/libimagequant
x11-libs/cairo
"
DEPEND="${RDEPEND}"
@@ -35,24 +35,13 @@ BDEPEND="
sys-devel/gettext
"
-src_prepare() {
-
- sed -i \
- -e 's|linux_ARCH_INSTALL:=install-xdg|linux_ARCH_INSTALL:=|' \
- -e "s|linux_PREFIX:=/usr/local|linux_PREFIX:=/usr|" \
- -e "s:/lib/:/$(get_libdir)/:g" \
- -e 's:/share/doc/tuxpaint-$(VER_VERSION)/:'"/share/doc/${PF}/:g" \
- -e '/@gzip -f/d' \
- -e '/@chmod a+rx,g-w,o-w $(MAN_PREFIX)/d' \
- -e "s|linux_ARCH_CFLAGS:=|linux_ARCH_CFLAGS:= ${CFLAGS}|" \
- Makefile || die
-
- eapply_user
-}
+PATCHES=(
+ ${FILESDIR}"/${P}-Makefile.patch"
+)
src_compile() {
# parallel build may break things
- emake -j1 CC="$(tc-getCC)"
+ emake -j1 CC="$(tc-getCC)" LIBDIR="$(get_libdir)"
}
src_install() {
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/files/, media-gfx/tuxpaint/
@ 2022-01-19 0:48 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2022-01-19 0:48 UTC (permalink / raw
To: gentoo-commits
commit: 38298eaad5e5fbd13aeab71e5753e1e79987b845
Author: Philipp Rösner <rndxelement <AT> protonmail <DOT> com>
AuthorDate: Sun Jan 16 21:44:27 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> 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 <rndxelement <AT> protonmail.com>
Signed-off-by: Sam James <sam <AT> 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
# <HOSTROOT> is the directory containing support files for building for <HOST>:
# <HOSTROOT>/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
"
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/files/, media-gfx/tuxpaint/
@ 2022-07-21 8:37 Joonas Niilola
0 siblings, 0 replies; 8+ messages in thread
From: Joonas Niilola @ 2022-07-21 8:37 UTC (permalink / raw
To: gentoo-commits
commit: f595bc4a618c8e880688c5b3000fcaaadf6c8691
Author: Philipp Rösner <rndxelement <AT> protonmail <DOT> com>
AuthorDate: Mon Jun 20 22:03:45 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Jul 21 08:37:26 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f595bc4a
media-gfx/tuxpaint: add 0.9.28
Add an ebuild for tuxpaint-0.9.28, celebrating 20 years of tuxpaint.
Signed-off-by: Philipp Rösner <rndxelement <AT> protonmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-gfx/tuxpaint/Manifest | 1 +
.../tuxpaint/files/tuxpaint-0.9.28-Makefile.patch | 158 +++++++++++++++++++++
media-gfx/tuxpaint/tuxpaint-0.9.28.ebuild | 67 +++++++++
3 files changed, 226 insertions(+)
diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest
index 9670ea86fc54..af5f57e33be0 100644
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -1,2 +1,3 @@
DIST tuxpaint-0.9.24.tar.gz 15561675 BLAKE2B 971baec8b7728cbb54a2a45b604c152a9620d0f6a1856cca99482ad0fd76f2a4493aab81f54e10e5da4d81800b0e3506cb73dda0e00510ef966b0c98f8aa5cb4 SHA512 a4ee9eea833f9a6313701a4686f9f276570df84436c68d9a3d04e9448a8ea00833207e1034965e15145be744194c7b9a7d3c91bdfa3489d06a61de84b64cc723
DIST tuxpaint-0.9.27.tar.gz 14292992 BLAKE2B f1337b828604bac968325437eba21046f871a0e07e049f2d3568f44adac400e729f4c6d46bcba9eddf9078089aaf55aab7d0774fb5ab126b96d317b59e37ee00 SHA512 197c6e23fb772edd57614e34dec23e160ece528b58e4a17d67fe4100c58cbcd6c4b5efccfbb24ca760b3a20755230b47f4e3e49969e75ba04ce722102a7f2dd9
+DIST tuxpaint-0.9.28.tar.gz 14802638 BLAKE2B 7f7a8f3d61faf052d9872b5af775a6becdefae7cee1207ebcbb5db108fc381b0fa5ba8b7a8facd55ba6dcfca59886125cba7837d2de432fd5c75d2c40b509c41 SHA512 038f92f8d7ee8d85b1c9b18f7781e814ee55067e090fbfa597028e2d13218911157d00f312de2be9db29754a07c5706fc3c3e0e6ea3c71a15f80c37bb2eceb34
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.28-Makefile.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.28-Makefile.patch
new file mode 100644
index 000000000000..f5a0ac3b76bb
--- /dev/null
+++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.28-Makefile.patch
@@ -0,0 +1,158 @@
+--- a/Makefile
++++ b/Makefile
+@@ -73,7 +73,7 @@ endif
+ # <HOSTROOT> is the directory containing support files for building for <HOST>:
+ # <HOSTROOT>/include Header files.
+ # <HOSTROOT>/lib Library files.
+-# <HOSTROOT>/lib/pkgconfig *.pc files.
++# <HOSTROOT>/pkgconfig *.pc files.
+ #
+ ifdef HOST
+ ifdef HOSTROOT
+@@ -104,7 +104,7 @@ ifdef HOST
+ # We set PKG_CONFIG_LIBDIR instead of PKG_CONFIG_PATH because we want to
+ # *change* where pkg-config looks for .pc files instead of adding to the
+ # default path which may have libraries that aren't for HOST.
+- export PKG_CONFIG_LIBDIR:=$(HOSTROOT)/lib/pkgconfig
++ export PKG_CONFIG_LIBDIR:=$(HOSTROOT)/$(LIBDIR)/pkgconfig
+ endif
+ endif
+
+@@ -170,14 +170,14 @@ windows_ARCH_CFLAGS:=
+ macos_ARCH_CFLAGS:=-isysroot $(SDKROOT) -I$(SDKROOT)/usr/include -I$(HOSTROOT)/include -mmacosx-version-min=$(MINVER) -arch $(subst $() $(), -arch ,$(ARCHS)) -w -headerpad_max_install_names -DHAVE_STRCASESTR
+ ios_ARCH_CFLAGS:=-isysroot $(SDKROOT) -I$(SDKROOT)/usr/include -I$(HOSTROOT)/include $(MINVEROPT) -arch $(subst $() $(), -arch ,$(ARCHS)) -w -fPIC -DHAVE_STRCASESTR -DUNLINK_ONLY
+ beos_ARCH_CFLAGS:=
+-linux_ARCH_CFLAGS:=
++linux_ARCH_CFLAGS:=${CFLAGS}
+ ARCH_CFLAGS:=$($(OS)_ARCH_CFLAGS)
+
+ windows_ARCH_LDFLAGS:=
+ macos_ARCH_LDFLAGS:=-isysroot $(SDKROOT) -L$(HOSTROOT)/lib -mmacosx-version-min=$(MINVER) -arch $(subst $() $(), -arch ,$(ARCHS))
+ ios_ARCH_LDFLAGS:=-isysroot $(SDKROOT) -L$(HOSTROOT)/lib $(MINVEROPT) -arch $(subst $() $(), -arch ,$(ARCHS))
+ beos_ARCH_LDFLAGS:=
+-linux_ARCH_LDFLAGS:=
++linux_ARCH_LDFLAGS:=${LDFLAGS}
+ ARCH_LDFLAGS:=$($(OS)_ARCH_LDFLAGS)
+ LDFLAGS:=$(ARCH_LDFLAGS)
+
+@@ -206,7 +206,7 @@ ARCH_HEADERS:=$($(OS)_ARCH_HEADERS)
+ windows_PREFIX:=/usr/local
+ macos_PREFIX:=Resources
+ ios_PREFIX:=.
+-linux_PREFIX:=/usr/local
++linux_PREFIX:=/usr
+ PREFIX:=$($(OS)_PREFIX)
+
+ # Root directory to place files when creating packages.
+@@ -244,7 +244,7 @@ MAGIC_PREFIX:=$(DESTDIR)$(LIBDIR)/lib$(LIBDIRSUFFIX)/tuxpaint/plugins
+
+ # Docs and man page:
+ DOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint-$(VER_VERSION)
+-DEVDOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint-$(VER_VERSION)/tuxpaint-dev
++DEVDOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/${PF}/tuxpaint-dev
+ MAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man
+ DEVMAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man
+
+@@ -359,7 +359,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:
+
+@@ -551,7 +551,7 @@ trans:
+ windows_ARCH_INSTALL:=
+ macos_ARCH_INSTALL:=install-macbundle
+ ios_ARCH_INSTALL:=install-iosbundle
+-linux_ARCH_INSTALL:=install-xdg install-man install-importscript install-bash-completion
++linux_ARCH_INSTALL:=install-man install-importscript install-bash-completion
+ ARCH_INSTALL:=$($(OS)_ARCH_INSTALL)
+
+ # "make install" installs all of the various parts
+@@ -719,12 +719,12 @@ uninstall: uninstall-i18n
+ -rm $(BIN_PREFIX)/tuxpaint-import
+ -rm -r $(DATA_PREFIX)
+ -rm -r $(DOC_PREFIX)
+- -rm $(MAN_PREFIX)/man1/tuxpaint.1.gz
+- -rm $(MAN_PREFIX)/*/man1/tuxpaint.1.gz
+- -rm $(MAN_PREFIX)/man1/tuxpaint-import.1.gz
+- -rm $(MAN_PREFIX)/*/man1/tuxpaint-import.1.gz
+- -rm $(MAN_PREFIX)/man1/tp-magic-config.1.gz
+- -rm $(MAN_PREFIX)/*/man1/tp-magic-config.1.gz
++ -rm $(MAN_PREFIX)/man1/tuxpaint.1
++ -rm $(MAN_PREFIX)/*/man1/tuxpaint.1
++ -rm $(MAN_PREFIX)/man1/tuxpaint-import.1
++ -rm $(MAN_PREFIX)/*/man1/tuxpaint-import.1
++ -rm $(MAN_PREFIX)/man1/tp-magic-config.1
++ -rm $(MAN_PREFIX)/*/man1/tp-magic-config.1
+ -rm -f -r $(CONFDIR)
+ -rm $(COMPLETIONDIR)/tuxpaint-completion.bash
+ -rm -r $(MAGIC_PREFIX)
+@@ -817,11 +817,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)/%: %
+@@ -876,7 +876,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 $<" )
+@@ -988,9 +988,9 @@ install-dlls:
+ @cp -R win32/etc/ $(BIN_PREFIX)
+ @echo
+ @echo "...Installing Library Modules..."
+- @mkdir -p $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders
+- @cp $(MINGW_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders
+- @strip -s $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll
++ @mkdir -p $(BIN_PREFIX)/$(LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders
++ @cp $(MINGW_DIR)/$(LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders
++ @strip -s $(BIN_PREFIX)/$(LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders/*.dll
+
+ # Install symlink:
+ .PHONY: install-haiku
+@@ -1065,24 +1065,20 @@ install-man:
+ @install -d $(MAN_PREFIX)/man1
+ @# tuxpaint.1
+ @cp man/en/tuxpaint.1 $(MAN_PREFIX)/man1/
+- @gzip -f $(MAN_PREFIX)/man1/tuxpaint.1
+- @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint.1.gz
++ @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint.1
+ @# tuxpaint-import.1
+ @cp man/en/tuxpaint-import.1 $(MAN_PREFIX)/man1/
+- @gzip -f $(MAN_PREFIX)/man1/tuxpaint-import.1
+- @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint-import.1.gz
++ @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint-import.1
+ @# tp-magic-config.1
+ @cp man/en/tp-magic-config.1 $(MAN_PREFIX)/man1/
+- @gzip -f $(MAN_PREFIX)/man1/tp-magic-config.1
+- @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tp-magic-config.1.gz
++ @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tp-magic-config.1
+ @echo
+ for l in `ls -d man/*.UTF-8 | cut -d '/' -f 2`; do \
+ DEST=$(MAN_PREFIX)/$$l/man1 ; \
+ echo "...Installing $$l man pages into $$DEST..." ; \
+ install -d $$DEST ; \
+ cp man/$$l/tuxpaint.1 $$DEST ; \
+- gzip -f $$DEST/tuxpaint.1 ; \
+- chmod a+rx,g-w,o-w $$DEST/tuxpaint.1.gz ; \
++ chmod a+rx,g-w,o-w $$DEST/tuxpaint.1 ; \
+ done
+ @# FIXME: The other man pages aren't localizable yet -bjk 2021.08.14
+
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.28.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.28.ebuild
new file mode 100644
index 000000000000..ea4f39c18847
--- /dev/null
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.28.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop optfeature toolchain-funcs xdg
+
+DESCRIPTION="Drawing program designed for young children"
+HOMEPAGE="https://www.tuxpaint.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-sdl1.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/${P}-sdl1
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+ app-text/libpaper
+ dev-libs/fribidi
+ gnome-base/librsvg:2
+ >=media-libs/libpng-1.2:0=
+ >=media-libs/freetype-2:2
+ media-libs/libsdl[joystick]
+ media-libs/sdl-image[png]
+ media-libs/sdl-mixer
+ media-libs/sdl-pango
+ media-libs/sdl-ttf
+ media-libs/sdl-gfx:=
+ media-gfx/libimagequant
+ sys-libs/zlib
+ x11-libs/cairo
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/gperf
+ media-gfx/graphicsmagick[jpeg,png,svg]
+ sys-devel/gettext
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-Makefile.patch
+)
+
+src_compile() {
+ emake CC="$(tc-getCC)" LIBDIR="$(get_libdir)"
+}
+
+src_install() {
+ # Parallel install may break the building process
+ # See: https://bugs.gentoo.org/859169
+ emake -j1 DESTDIR="${D}" install
+ local file size
+ for file in data/images/icon[0-9]*x[0-9]*.png; do
+ size=${file##*/icon}
+ size=${size%%x*}
+ newicon -s "${size}" "${file}" tux4kids-tuxpaint.png
+ done
+ newmenu src/tuxpaint.desktop tux4kids-tuxpaint.desktop
+ docinto /usr/share/doc/${PF}
+ dodoc docs/*.txt
+ dodoc docs/en/*.txt
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ optfeature "additional graphic stamps" media-gfx/tuxpaint-stamps
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/files/, media-gfx/tuxpaint/
@ 2022-10-12 16:23 Joonas Niilola
0 siblings, 0 replies; 8+ messages in thread
From: Joonas Niilola @ 2022-10-12 16:23 UTC (permalink / raw
To: gentoo-commits
commit: 1527c6c77dba4b0616131396eac4f328504dbabd
Author: Philipp Rösner <rndxelement <AT> protonmail <DOT> com>
AuthorDate: Wed Sep 28 17:13:22 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Oct 12 16:23:30 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1527c6c7
media-gfx/tuxpaint: fix LIBDIR, fix doc on 0.9.28
The LIBDIR variable defined while calling emake
collides with the LIBDIR variable defined in the tuxpaint
Makefile, resulting in magic tools not getting linked
properly.
Renaming LIBDIR to GENTOO_LIBDIR resolves this issue.
Furthermore, a patch for the DOC_PREFIX variable in the
Makefile was missing, resulting in installation of files
into unexpected paths.
Bug: https://bugs.gentoo.org/873286
Bug: https://bugs.gentoo.org/870232
Signed-off-by: Philipp Rösner <rndxelement <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/27518
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../files/tuxpaint-0.9.28-r2-Makefile.patch | 164 +++++++++++++++++++++
media-gfx/tuxpaint/tuxpaint-0.9.28-r2.ebuild | 67 +++++++++
2 files changed, 231 insertions(+)
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.28-r2-Makefile.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.28-r2-Makefile.patch
new file mode 100644
index 000000000000..1b513f714c05
--- /dev/null
+++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.28-r2-Makefile.patch
@@ -0,0 +1,164 @@
+--- a/Makefile
++++ b/Makefile
+@@ -73,7 +73,7 @@ endif
+ # <HOSTROOT> is the directory containing support files for building for <HOST>:
+ # <HOSTROOT>/include Header files.
+ # <HOSTROOT>/lib Library files.
+-# <HOSTROOT>/lib/pkgconfig *.pc files.
++# <HOSTROOT>/pkgconfig *.pc files.
+ #
+ ifdef HOST
+ ifdef HOSTROOT
+@@ -104,7 +104,7 @@ ifdef HOST
+ # We set PKG_CONFIG_LIBDIR instead of PKG_CONFIG_PATH because we want to
+ # *change* where pkg-config looks for .pc files instead of adding to the
+ # default path which may have libraries that aren't for HOST.
+- export PKG_CONFIG_LIBDIR:=$(HOSTROOT)/lib/pkgconfig
++ export PKG_CONFIG_LIBDIR:=$(HOSTROOT)/$(GENTOO_LIBDIR)/pkgconfig
+ endif
+ endif
+
+@@ -170,14 +170,14 @@ windows_ARCH_CFLAGS:=
+ macos_ARCH_CFLAGS:=-isysroot $(SDKROOT) -I$(SDKROOT)/usr/include -I$(HOSTROOT)/include -mmacosx-version-min=$(MINVER) -arch $(subst $() $(), -arch ,$(ARCHS)) -w -headerpad_max_install_names -DHAVE_STRCASESTR
+ ios_ARCH_CFLAGS:=-isysroot $(SDKROOT) -I$(SDKROOT)/usr/include -I$(HOSTROOT)/include $(MINVEROPT) -arch $(subst $() $(), -arch ,$(ARCHS)) -w -fPIC -DHAVE_STRCASESTR -DUNLINK_ONLY
+ beos_ARCH_CFLAGS:=
+-linux_ARCH_CFLAGS:=
++linux_ARCH_CFLAGS:=${CFLAGS}
+ ARCH_CFLAGS:=$($(OS)_ARCH_CFLAGS)
+
+ windows_ARCH_LDFLAGS:=
+ macos_ARCH_LDFLAGS:=-isysroot $(SDKROOT) -L$(HOSTROOT)/lib -mmacosx-version-min=$(MINVER) -arch $(subst $() $(), -arch ,$(ARCHS))
+ ios_ARCH_LDFLAGS:=-isysroot $(SDKROOT) -L$(HOSTROOT)/lib $(MINVEROPT) -arch $(subst $() $(), -arch ,$(ARCHS))
+ beos_ARCH_LDFLAGS:=
+-linux_ARCH_LDFLAGS:=
++linux_ARCH_LDFLAGS:=${LDFLAGS}
+ ARCH_LDFLAGS:=$($(OS)_ARCH_LDFLAGS)
+ LDFLAGS:=$(ARCH_LDFLAGS)
+
+@@ -206,7 +206,7 @@ ARCH_HEADERS:=$($(OS)_ARCH_HEADERS)
+ windows_PREFIX:=/usr/local
+ macos_PREFIX:=Resources
+ ios_PREFIX:=.
+-linux_PREFIX:=/usr/local
++linux_PREFIX:=/usr
+ PREFIX:=$($(OS)_PREFIX)
+
+ # Root directory to place files when creating packages.
+@@ -240,11 +240,11 @@ LIBDIR=$(PREFIX)
+
+ # Magic Tool plug-ins
+ INCLUDE_PREFIX:=$(DESTDIR)$(PREFIX)/include
+-MAGIC_PREFIX:=$(DESTDIR)$(LIBDIR)/lib$(LIBDIRSUFFIX)/tuxpaint/plugins
++MAGIC_PREFIX:=$(DESTDIR)$(LIBDIR)/${GENTOO_LIBDIR}/tuxpaint/plugins
+
+ # Docs and man page:
+-DOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint-$(VER_VERSION)
+-DEVDOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint-$(VER_VERSION)/tuxpaint-dev
++DOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/${PF}
++DEVDOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/${PF}/tuxpaint-dev
+ MAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man
+ DEVMAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man
+
+@@ -359,7 +359,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:
+
+@@ -551,7 +551,7 @@ trans:
+ windows_ARCH_INSTALL:=
+ macos_ARCH_INSTALL:=install-macbundle
+ ios_ARCH_INSTALL:=install-iosbundle
+-linux_ARCH_INSTALL:=install-xdg install-man install-importscript install-bash-completion
++linux_ARCH_INSTALL:=install-man install-importscript install-bash-completion
+ ARCH_INSTALL:=$($(OS)_ARCH_INSTALL)
+
+ # "make install" installs all of the various parts
+@@ -719,12 +719,12 @@ uninstall: uninstall-i18n
+ -rm $(BIN_PREFIX)/tuxpaint-import
+ -rm -r $(DATA_PREFIX)
+ -rm -r $(DOC_PREFIX)
+- -rm $(MAN_PREFIX)/man1/tuxpaint.1.gz
+- -rm $(MAN_PREFIX)/*/man1/tuxpaint.1.gz
+- -rm $(MAN_PREFIX)/man1/tuxpaint-import.1.gz
+- -rm $(MAN_PREFIX)/*/man1/tuxpaint-import.1.gz
+- -rm $(MAN_PREFIX)/man1/tp-magic-config.1.gz
+- -rm $(MAN_PREFIX)/*/man1/tp-magic-config.1.gz
++ -rm $(MAN_PREFIX)/man1/tuxpaint.1
++ -rm $(MAN_PREFIX)/*/man1/tuxpaint.1
++ -rm $(MAN_PREFIX)/man1/tuxpaint-import.1
++ -rm $(MAN_PREFIX)/*/man1/tuxpaint-import.1
++ -rm $(MAN_PREFIX)/man1/tp-magic-config.1
++ -rm $(MAN_PREFIX)/*/man1/tp-magic-config.1
+ -rm -f -r $(CONFDIR)
+ -rm $(COMPLETIONDIR)/tuxpaint-completion.bash
+ -rm -r $(MAGIC_PREFIX)
+@@ -817,11 +817,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)/%: %
+@@ -876,7 +876,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 $<" )
+@@ -988,9 +988,9 @@ install-dlls:
+ @cp -R win32/etc/ $(BIN_PREFIX)
+ @echo
+ @echo "...Installing Library Modules..."
+- @mkdir -p $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders
+- @cp $(MINGW_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders
+- @strip -s $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll
++ @mkdir -p $(BIN_PREFIX)/$(GENTOO_LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders
++ @cp $(MINGW_DIR)/$(GENTOO_LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders
++ @strip -s $(BIN_PREFIX)/$(GENTOO_LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders/*.dll
+
+ # Install symlink:
+ .PHONY: install-haiku
+@@ -1065,24 +1065,20 @@ install-man:
+ @install -d $(MAN_PREFIX)/man1
+ @# tuxpaint.1
+ @cp man/en/tuxpaint.1 $(MAN_PREFIX)/man1/
+- @gzip -f $(MAN_PREFIX)/man1/tuxpaint.1
+- @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint.1.gz
++ @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint.1
+ @# tuxpaint-import.1
+ @cp man/en/tuxpaint-import.1 $(MAN_PREFIX)/man1/
+- @gzip -f $(MAN_PREFIX)/man1/tuxpaint-import.1
+- @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint-import.1.gz
++ @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint-import.1
+ @# tp-magic-config.1
+ @cp man/en/tp-magic-config.1 $(MAN_PREFIX)/man1/
+- @gzip -f $(MAN_PREFIX)/man1/tp-magic-config.1
+- @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tp-magic-config.1.gz
++ @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tp-magic-config.1
+ @echo
+ for l in `ls -d man/*.UTF-8 | cut -d '/' -f 2`; do \
+ DEST=$(MAN_PREFIX)/$$l/man1 ; \
+ echo "...Installing $$l man pages into $$DEST..." ; \
+ install -d $$DEST ; \
+ cp man/$$l/tuxpaint.1 $$DEST ; \
+- gzip -f $$DEST/tuxpaint.1 ; \
+- chmod a+rx,g-w,o-w $$DEST/tuxpaint.1.gz ; \
++ chmod a+rx,g-w,o-w $$DEST/tuxpaint.1 ; \
+ done
+ @# FIXME: The other man pages aren't localizable yet -bjk 2021.08.14
+
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.28-r2.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.28-r2.ebuild
new file mode 100644
index 000000000000..df038424e67a
--- /dev/null
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.28-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop optfeature toolchain-funcs xdg
+
+DESCRIPTION="Drawing program designed for young children"
+HOMEPAGE="https://www.tuxpaint.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-sdl1.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${P}-sdl1
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+ app-text/libpaper:=
+ dev-libs/fribidi
+ gnome-base/librsvg:2
+ >=media-libs/libpng-1.2:0=
+ >=media-libs/freetype-2:2
+ media-libs/libsdl[X,joystick]
+ media-libs/sdl-image[png]
+ media-libs/sdl-mixer
+ media-libs/sdl-pango
+ media-libs/sdl-ttf
+ media-libs/sdl-gfx:=
+ media-gfx/libimagequant
+ sys-libs/zlib
+ x11-libs/cairo
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/gperf
+ media-gfx/graphicsmagick[jpeg,png,svg]
+ sys-devel/gettext
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PF}-Makefile.patch
+)
+
+src_compile() {
+ emake CC="$(tc-getCC)" GENTOO_LIBDIR="$(get_libdir)"
+}
+
+src_install() {
+ # Parallel install may break the building process
+ # See: https://bugs.gentoo.org/859169
+ emake -j1 DESTDIR="${D}" GENTOO_LIBDIR="$(get_libdir)" install
+ local file size
+ for file in data/images/icon[0-9]*x[0-9]*.png; do
+ size=${file##*/icon}
+ size=${size%%x*}
+ newicon -s "${size}" "${file}" tux4kids-tuxpaint.png
+ done
+ newmenu src/tuxpaint.desktop tux4kids-tuxpaint.desktop
+ docinto /usr/share/doc/${PF}
+ dodoc docs/*.txt
+ dodoc docs/en/*.txt
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ optfeature "additional graphic stamps" media-gfx/tuxpaint-stamps
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/files/, media-gfx/tuxpaint/
@ 2023-06-02 15:35 Joonas Niilola
0 siblings, 0 replies; 8+ messages in thread
From: Joonas Niilola @ 2023-06-02 15:35 UTC (permalink / raw
To: gentoo-commits
commit: 945cc3e557cf8a35f8677a2b447886c8178119df
Author: Philipp Rösner <rndxelement <AT> protonmail <DOT> com>
AuthorDate: Thu Apr 6 06:52:50 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Jun 2 15:34:02 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=945cc3e5
media-gfx/tuxpaint: add 0.9.29
Tuxpaint version 0.9.29 and further only supports
sdl2. Therefore, switched to sdl2 in this ebuild.
Also include an upstream patch for fixing the problem
of the trans directory not being created before it is
used.
Signed-off-by: Philipp Rösner <rndxelement <AT> protonmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-gfx/tuxpaint/Manifest | 1 +
.../files/tuxpaint-0.9.29-Makefile-trans.patch | 30 ++++
.../tuxpaint/files/tuxpaint-0.9.29-Makefile.patch | 164 +++++++++++++++++++++
media-gfx/tuxpaint/tuxpaint-0.9.29.ebuild | 66 +++++++++
4 files changed, 261 insertions(+)
diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest
index 602f0fbbc91e..fdf65c4da48d 100644
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -1,2 +1,3 @@
DIST tuxpaint-0.9.27.tar.gz 14292992 BLAKE2B f1337b828604bac968325437eba21046f871a0e07e049f2d3568f44adac400e729f4c6d46bcba9eddf9078089aaf55aab7d0774fb5ab126b96d317b59e37ee00 SHA512 197c6e23fb772edd57614e34dec23e160ece528b58e4a17d67fe4100c58cbcd6c4b5efccfbb24ca760b3a20755230b47f4e3e49969e75ba04ce722102a7f2dd9
DIST tuxpaint-0.9.28.tar.gz 14802638 BLAKE2B 7f7a8f3d61faf052d9872b5af775a6becdefae7cee1207ebcbb5db108fc381b0fa5ba8b7a8facd55ba6dcfca59886125cba7837d2de432fd5c75d2c40b509c41 SHA512 038f92f8d7ee8d85b1c9b18f7781e814ee55067e090fbfa597028e2d13218911157d00f312de2be9db29754a07c5706fc3c3e0e6ea3c71a15f80c37bb2eceb34
+DIST tuxpaint-0.9.29.tar.gz 17144658 BLAKE2B db00b14862ca139b0ee2851b7f57bda0df12d09ae516649dab25eb260bfc65fef35c968ab39593a71c173f196dc24426c5d4be79eee230c7139a7832d5508171 SHA512 9642c7145d32848e663b69428d7ff046e6109b292f3c3104dc40f8fcbf4152ab39815cf7dd3a217b0a6bd26ea50c57e0b14b186a23157fbac091ee10436646b3
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.29-Makefile-trans.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.29-Makefile-trans.patch
new file mode 100644
index 000000000000..20868602f65b
--- /dev/null
+++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.29-Makefile-trans.patch
@@ -0,0 +1,30 @@
+# Sometimes the trans directory isn't created before
+# accessing it.
+# Upstream commit b452d84d2544a38eca1d2e4e9686a8eaef197d0f
+# fixes this.
+--- a/Makefile
++++ b/Makefile
+@@ -535,6 +535,7 @@ endif
+ # Build the translation files for gettext
+
+ $(MOFILES): trans/%.mo: src/po/%.po
++ @-mkdir -p trans
+ msgfmt -o $@ $<
+
+ %.desktop: %.desktop.in $(POTFILES)
+@@ -552,14 +553,9 @@ translations: trans
+ @echo "Install gettext to run Tux Paint in non-U.S. English modes."
+ @echo "--------------------------------------------------------------"
+ else
+-translations: trans $(MOFILES) src/tuxpaint.desktop src/tuxpaint-fullscreen.desktop src/org.tuxpaint.Tuxpaint.appdata.xml
++translations: $(MOFILES) src/tuxpaint.desktop src/tuxpaint-fullscreen.desktop src/org.tuxpaint.Tuxpaint.appdata.xml
+ endif
+
+-trans:
+- @echo
+- @echo "...Preparing translation files..."
+- @mkdir trans
+-
+ ######
+
+ windows_ARCH_INSTALL:=
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.29-Makefile.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.29-Makefile.patch
new file mode 100644
index 000000000000..e0b1c43a03bb
--- /dev/null
+++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.29-Makefile.patch
@@ -0,0 +1,164 @@
+diff --git a/Makefile.old b/Makefile
+index 88d0d02..ab71f97 100644
+--- a/Makefile.old
++++ b/Makefile
+@@ -74,7 +74,7 @@ endif
+ # <HOSTROOT> is the directory containing support files for building for <HOST>:
+ # <HOSTROOT>/include Header files.
+ # <HOSTROOT>/lib Library files.
+-# <HOSTROOT>/lib/pkgconfig *.pc files.
++# <HOSTROOT>/pkgconfig *.pc files.
+ #
+ ifdef HOST
+ ifdef HOSTROOT
+@@ -105,7 +105,7 @@ ifdef HOST
+ # We set PKG_CONFIG_LIBDIR instead of PKG_CONFIG_PATH because we want to
+ # *change* where pkg-config looks for .pc files instead of adding to the
+ # default path which may have libraries that aren't for HOST.
+- export PKG_CONFIG_LIBDIR:=$(HOSTROOT)/lib/pkgconfig
++ export PKG_CONFIG_LIBDIR:=$(HOSTROOT)/$(GENTOO_LIBDIR)/pkgconfig
+ endif
+ endif
+
+@@ -171,14 +171,14 @@ windows_ARCH_CFLAGS:=
+ macos_ARCH_CFLAGS:=-isysroot $(SDKROOT) -I$(SDKROOT)/usr/include -I$(HOSTROOT)/include -mmacosx-version-min=$(MINVER) -arch $(subst $() $(), -arch ,$(ARCHS)) -w -headerpad_max_install_names -DHAVE_STRCASESTR
+ ios_ARCH_CFLAGS:=-isysroot $(SDKROOT) -I$(SDKROOT)/usr/include -I$(HOSTROOT)/include $(MINVEROPT) -arch $(subst $() $(), -arch ,$(ARCHS)) -w -fPIC -DHAVE_STRCASESTR -DUNLINK_ONLY
+ beos_ARCH_CFLAGS:=
+-linux_ARCH_CFLAGS:=
++linux_ARCH_CFLAGS:=${CFLAGS}
+ ARCH_CFLAGS:=$($(OS)_ARCH_CFLAGS)
+
+ windows_ARCH_LDFLAGS:=
+ macos_ARCH_LDFLAGS:=-isysroot $(SDKROOT) -L$(HOSTROOT)/lib -mmacosx-version-min=$(MINVER) -arch $(subst $() $(), -arch ,$(ARCHS))
+ ios_ARCH_LDFLAGS:=-isysroot $(SDKROOT) -L$(HOSTROOT)/lib $(MINVEROPT) -arch $(subst $() $(), -arch ,$(ARCHS))
+ beos_ARCH_LDFLAGS:=
+-linux_ARCH_LDFLAGS:=
++linux_ARCH_LDFLAGS:=${LDFLAGS}
+ ARCH_LDFLAGS:=$($(OS)_ARCH_LDFLAGS)
+ LDFLAGS:=$(ARCH_LDFLAGS)
+
+@@ -207,7 +207,7 @@ ARCH_HEADERS:=$($(OS)_ARCH_HEADERS)
+ windows_PREFIX:=/usr/local
+ macos_PREFIX:=Resources
+ ios_PREFIX:=.
+-linux_PREFIX:=/usr/local
++linux_PREFIX:=/usr
+ PREFIX:=$($(OS)_PREFIX)
+
+ # Root directory to place files when creating packages.
+@@ -241,10 +241,10 @@ LIBDIR=$(PREFIX)
+
+ # Magic Tool plug-ins
+ INCLUDE_PREFIX:=$(DESTDIR)$(PREFIX)/include
+-MAGIC_PREFIX:=$(DESTDIR)$(LIBDIR)/lib$(LIBDIRSUFFIX)/tuxpaint/plugins
++MAGIC_PREFIX:=$(DESTDIR)$(LIBDIR)/${GENTOO_LIBDIR}/tuxpaint/plugins
+
+ # Docs and man page:
+-DOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint-$(VER_VERSION)
++DOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/${PF}
+ MAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man
+ DEVMAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man
+
+@@ -367,7 +367,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:
+
+@@ -551,7 +551,7 @@ trans:
+ windows_ARCH_INSTALL:=
+ macos_ARCH_INSTALL:=install-macbundle
+ ios_ARCH_INSTALL:=install-iosbundle
+-linux_ARCH_INSTALL:=install-xdg install-man install-importscript install-bash-completion
++linux_ARCH_INSTALL:=install-man install-importscript install-bash-completion
+ ARCH_INSTALL:=$($(OS)_ARCH_INSTALL)
+
+ # "make install" installs all of the various parts
+@@ -719,12 +719,12 @@ uninstall: uninstall-i18n
+ -rm $(BIN_PREFIX)/tuxpaint-import
+ -rm -r $(DATA_PREFIX)
+ -rm -r $(DOC_PREFIX)
+- -rm $(MAN_PREFIX)/man1/tuxpaint.1.gz
+- -rm $(MAN_PREFIX)/*/man1/tuxpaint.1.gz
+- -rm $(MAN_PREFIX)/man1/tuxpaint-import.1.gz
+- -rm $(MAN_PREFIX)/*/man1/tuxpaint-import.1.gz
+- -rm $(MAN_PREFIX)/man1/tp-magic-config.1.gz
+- -rm $(MAN_PREFIX)/*/man1/tp-magic-config.1.gz
++ -rm $(MAN_PREFIX)/man1/tuxpaint.1
++ -rm $(MAN_PREFIX)/*/man1/tuxpaint.1
++ -rm $(MAN_PREFIX)/man1/tuxpaint-import.1
++ -rm $(MAN_PREFIX)/*/man1/tuxpaint-import.1
++ -rm $(MAN_PREFIX)/man1/tp-magic-config.1
++ -rm $(MAN_PREFIX)/*/man1/tp-magic-config.1
+ -rm -f -r $(CONFDIR)
+ -rm $(COMPLETIONDIR)/tuxpaint-completion.bash
+ -rm -r $(MAGIC_PREFIX)
+@@ -855,11 +855,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)/%: % install-example-starters-dirs
+@@ -876,7 +876,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 $<" )
+@@ -988,9 +988,9 @@ install-dlls:
+ @cp -R win32/etc/ $(BIN_PREFIX)
+ @echo
+ @echo "...Installing Library Modules..."
+- @mkdir -p $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders
+- @cp $(MINGW_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders
+- @strip -s $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll
++ @mkdir -p $(BIN_PREFIX)/$(GENTOO_LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders
++ @cp $(MINGW_DIR)/$(GENTOO_LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders
++ @strip -s $(BIN_PREFIX)/$(GENTOO_LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders/*.dll
+
+ # Install symlink:
+ .PHONY: install-haiku
+@@ -1065,24 +1065,20 @@ install-man:
+ @install -d $(MAN_PREFIX)/man1
+ @# tuxpaint.1
+ @cp man/en/tuxpaint.1 $(MAN_PREFIX)/man1/
+- @gzip -f $(MAN_PREFIX)/man1/tuxpaint.1
+- @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint.1.gz
++ @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint.1
+ @# tuxpaint-import.1
+ @cp man/en/tuxpaint-import.1 $(MAN_PREFIX)/man1/
+- @gzip -f $(MAN_PREFIX)/man1/tuxpaint-import.1
+- @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint-import.1.gz
++ @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint-import.1
+ @# tp-magic-config.1
+ @cp man/en/tp-magic-config.1 $(MAN_PREFIX)/man1/
+- @gzip -f $(MAN_PREFIX)/man1/tp-magic-config.1
+- @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tp-magic-config.1.gz
++ @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tp-magic-config.1
+ @echo
+ for l in `ls -d man/*.UTF-8 | cut -d '/' -f 2`; do \
+ DEST=$(MAN_PREFIX)/$$l/man1 ; \
+ echo "...Installing $$l man pages into $$DEST..." ; \
+ install -d $$DEST ; \
+ cp man/$$l/tuxpaint.1 $$DEST ; \
+- gzip -f $$DEST/tuxpaint.1 ; \
+- chmod a+rx,g-w,o-w $$DEST/tuxpaint.1.gz ; \
++ chmod a+rx,g-w,o-w $$DEST/tuxpaint.1 ; \
+ done
+ @# FIXME: The other man pages aren't localizable yet -bjk 2021.08.14
+
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.29.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.29.ebuild
new file mode 100644
index 000000000000..84464c6a3d04
--- /dev/null
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.29.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop optfeature toolchain-funcs xdg
+
+DESCRIPTION="Drawing program designed for young children"
+HOMEPAGE="https://www.tuxpaint.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+S="${WORKDIR}"/${P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ app-text/libpaper:=
+ dev-libs/fribidi
+ gnome-base/librsvg:2
+ media-gfx/libimagequant
+ >=media-libs/freetype-2:2
+ >=media-libs/libpng-1.2:0=
+ media-libs/libsdl2[X,joystick]
+ media-libs/sdl2-gfx:=
+ media-libs/sdl2-image[png]
+ media-libs/sdl2-mixer
+ media-libs/sdl2-pango
+ media-libs/sdl2-ttf
+ sys-libs/zlib
+ x11-libs/cairo
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/gperf
+ media-gfx/graphicsmagick[jpeg,png,svg]
+ sys-devel/gettext
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PF}-Makefile.patch
+ "${FILESDIR}"/${PF}-Makefile-trans.patch
+)
+
+src_compile() {
+ emake CC="$(tc-getCC)" GENTOO_LIBDIR="$(get_libdir)"
+}
+
+src_install() {
+ emake DESTDIR="${D}" GENTOO_LIBDIR="$(get_libdir)" install
+ local file size
+ for file in data/images/icon[0-9]*x[0-9]*.png; do
+ size=${file##*/icon}
+ size=${size%%x*}
+ newicon -s "${size}" "${file}" tux4kids-tuxpaint.png
+ done
+ newmenu src/tuxpaint.desktop tux4kids-tuxpaint.desktop
+ docinto /usr/share/doc/${PF}
+ dodoc docs/*.txt
+ dodoc docs/en/*.txt
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ optfeature "additional graphic stamps" media-gfx/tuxpaint-stamps
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/files/, media-gfx/tuxpaint/
@ 2024-01-11 13:33 Joonas Niilola
0 siblings, 0 replies; 8+ messages in thread
From: Joonas Niilola @ 2024-01-11 13:33 UTC (permalink / raw
To: gentoo-commits
commit: 3b16a6f7c845933de1f78dad6c3db854600664db
Author: Philipp Rösner <rndxelement <AT> protonmail <DOT> com>
AuthorDate: Tue Oct 31 21:47:06 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Jan 11 13:32:56 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b16a6f7
media-gfx/tuxpaint: add 0.9.31
Adjust Makefile patch to upstream changes to Makefile.
Respect EPREFIX in Makefile patch.
Signed-off-by: Philipp Rösner <rndxelement <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33615
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-gfx/tuxpaint/Manifest | 1 +
.../tuxpaint/files/tuxpaint-0.9.31-Makefile.patch | 159 +++++++++++++++++++++
media-gfx/tuxpaint/tuxpaint-0.9.31.ebuild | 65 +++++++++
3 files changed, 225 insertions(+)
diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest
index eb4fb24e1775..50d41b326b2a 100644
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -1,2 +1,3 @@
DIST tuxpaint-0.9.28.tar.gz 14802638 BLAKE2B 7f7a8f3d61faf052d9872b5af775a6becdefae7cee1207ebcbb5db108fc381b0fa5ba8b7a8facd55ba6dcfca59886125cba7837d2de432fd5c75d2c40b509c41 SHA512 038f92f8d7ee8d85b1c9b18f7781e814ee55067e090fbfa597028e2d13218911157d00f312de2be9db29754a07c5706fc3c3e0e6ea3c71a15f80c37bb2eceb34
DIST tuxpaint-0.9.29.tar.gz 17144658 BLAKE2B db00b14862ca139b0ee2851b7f57bda0df12d09ae516649dab25eb260bfc65fef35c968ab39593a71c173f196dc24426c5d4be79eee230c7139a7832d5508171 SHA512 9642c7145d32848e663b69428d7ff046e6109b292f3c3104dc40f8fcbf4152ab39815cf7dd3a217b0a6bd26ea50c57e0b14b186a23157fbac091ee10436646b3
+DIST tuxpaint-0.9.31.tar.gz 21733142 BLAKE2B 00041eacd062ac4e535451d4b4a6ac6d92fb7a0b6328dad4c7424b1bf0b95f0d3d2915e5ed7392cbf2f36174e56ceff5fadcf795c3368b3f2a958d794ce0b66a SHA512 7a3df8dce3e354cc22af34d55546de6e033e8ed4f44530b89986c3e1a07961e5e1a132f12f2d3fc5b699c500e7b9e7ab3503d2bafc5041d9fb2dbc8d1479b79f
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.31-Makefile.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.31-Makefile.patch
new file mode 100644
index 000000000000..fc35fb9b0212
--- /dev/null
+++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.31-Makefile.patch
@@ -0,0 +1,159 @@
+# Replace "lib" with GENTOO_LIBDIR, remove .gz suffixes and
+# replace ImageMagick calls by GraphicsMagick calls.
+--- a/Makefile
++++ b/Makefile
+@@ -111,7 +111,7 @@ ifdef HOST
+ # We set PKG_CONFIG_LIBDIR instead of PKG_CONFIG_PATH because we want to
+ # *change* where pkg-config looks for .pc files instead of adding to the
+ # default path which may have libraries that aren't for HOST.
+- export PKG_CONFIG_LIBDIR:=$(HOSTROOT)/lib/pkgconfig
++ export PKG_CONFIG_LIBDIR:=$(HOSTROOT)/$(GENTOO_LIBDIR)/pkgconfig
+ endif
+ endif
+
+@@ -177,14 +177,14 @@ windows_ARCH_CFLAGS:=
+ macos_ARCH_CFLAGS:=-isysroot $(SDKROOT) -I$(SDKROOT)/usr/include -I$(HOSTROOT)/include -mmacosx-version-min=$(MINVER) -arch $(subst $() $(), -arch ,$(ARCHS)) -w -headerpad_max_install_names -DHAVE_STRCASESTR
+ ios_ARCH_CFLAGS:=-isysroot $(SDKROOT) -I$(SDKROOT)/usr/include -I$(HOSTROOT)/include $(MINVEROPT) -arch $(subst $() $(), -arch ,$(ARCHS)) -w -fPIC -DHAVE_STRCASESTR -DUNLINK_ONLY
+ beos_ARCH_CFLAGS:=
+-linux_ARCH_CFLAGS:=
++linux_ARCH_CFLAGS:=${CFLAGS}
+ ARCH_CFLAGS:=$($(OS)_ARCH_CFLAGS)
+
+ windows_ARCH_LDFLAGS:=
+ macos_ARCH_LDFLAGS:=-isysroot $(SDKROOT) -L$(HOSTROOT)/lib -mmacosx-version-min=$(MINVER) -arch $(subst $() $(), -arch ,$(ARCHS))
+ ios_ARCH_LDFLAGS:=-isysroot $(SDKROOT) -L$(HOSTROOT)/lib $(MINVEROPT) -arch $(subst $() $(), -arch ,$(ARCHS))
+ beos_ARCH_LDFLAGS:=
+-linux_ARCH_LDFLAGS:=
++linux_ARCH_LDFLAGS:=${LDFLAGS}
+ ARCH_LDFLAGS:=$($(OS)_ARCH_LDFLAGS)
+ LDFLAGS:=$(ARCH_LDFLAGS)
+
+@@ -213,7 +213,7 @@ ARCH_HEADERS:=$($(OS)_ARCH_HEADERS)
+ windows_PREFIX:=/usr/local
+ macos_PREFIX:=Resources
+ ios_PREFIX:=.
+-linux_PREFIX:=/usr/local
++linux_PREFIX:=${EPREFIX}/usr
+ PREFIX:=$($(OS)_PREFIX)
+
+ # Root directory to place files when creating packages.
+@@ -247,10 +247,10 @@ LIBDIR=$(PREFIX)
+
+ # Magic Tool plug-ins
+ INCLUDE_PREFIX:=$(DESTDIR)$(PREFIX)/include
+-MAGIC_PREFIX:=$(DESTDIR)$(LIBDIR)/lib$(LIBDIRSUFFIX)/tuxpaint/plugins
++MAGIC_PREFIX:=$(DESTDIR)$(LIBDIR)/$(GENTOO_LIBDIR)/tuxpaint/plugins
+
+ # Docs and man page:
+-DOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint-$(VER_VERSION)
++DOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/${PF}
+ MAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man
+ DEVMAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man
+
+@@ -381,7 +381,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:
+
+@@ -575,11 +575,7 @@ endif
+ windows_ARCH_INSTALL:=
+ macos_ARCH_INSTALL:=install-macbundle
+ ios_ARCH_INSTALL:=install-iosbundle
+-ifeq ($(PACKAGE_ONLY),yes)
+- linux_ARCH_INSTALL:=install-pkgxdg install-man install-importscript install-bash-completion
+-else
+- linux_ARCH_INSTALL:=install-xdg install-man install-importscript install-bash-completion
+-endif
++linux_ARCH_INSTALL:=install-man install-importscript install-bash-completion
+ ARCH_INSTALL:=$($(OS)_ARCH_INSTALL)
+
+ # "make install" installs all of the various parts
+@@ -763,12 +759,12 @@ uninstall: uninstall-i18n
+ -rm $(BIN_PREFIX)/tuxpaint-import
+ -rm -r $(DATA_PREFIX)
+ -rm -r $(DOC_PREFIX)
+- -rm $(MAN_PREFIX)/man1/tuxpaint.1.gz
+- -rm $(MAN_PREFIX)/*/man1/tuxpaint.1.gz
+- -rm $(MAN_PREFIX)/man1/tuxpaint-import.1.gz
+- -rm $(MAN_PREFIX)/*/man1/tuxpaint-import.1.gz
+- -rm $(MAN_PREFIX)/man1/tp-magic-config.1.gz
+- -rm $(MAN_PREFIX)/*/man1/tp-magic-config.1.gz
++ -rm $(MAN_PREFIX)/man1/tuxpaint.1
++ -rm $(MAN_PREFIX)/*/man1/tuxpaint.1
++ -rm $(MAN_PREFIX)/man1/tuxpaint-import.1
++ -rm $(MAN_PREFIX)/*/man1/tuxpaint-import.1
++ -rm $(MAN_PREFIX)/man1/tp-magic-config.1
++ -rm $(MAN_PREFIX)/*/man1/tp-magic-config.1
+ -rm -f -r $(CONFDIR)
+ -rm $(COMPLETIONDIR)/tuxpaint-completion.bash
+ -rm -r $(MAGIC_PREFIX)
+@@ -869,11 +865,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 -f $@ ) ; \
++ gm convert $(CONVERT_OPTS) $(STARTER_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \
+ fi
+
+ $(INSTALLED_THUMB_STARTERS): $(DATA_PREFIX)/%: % install-example-starters-dirs
+@@ -928,7 +924,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 -f $@ ) ; \
++ @gm convert $(CONVERT_OPTS) $(TEMPLATE_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \
+
+ $(INSTALLED_THUMB_TEMPLATES): $(DATA_PREFIX)/%: %
+ @install -D -m 644 $< $@ || ( echo "NO THUMB $<" )
+@@ -1072,9 +1068,9 @@ install-dlls:
+ @cp -R win32/etc/ $(BIN_PREFIX)
+ @echo
+ @echo "...Installing Library Modules..."
+- @mkdir -p $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders
+- @cp $(MINGW_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders
+- @strip -s $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll
++ @mkdir -p $(BIN_PREFIX)/$(GENTOO_LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders
++ @cp $(MINGW_DIR)/$(GENTOO_LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/$(GENTOO_LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders
++ @strip -s $(BIN_PREFIX)/$(GENTOO_LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders/*.dll
+
+ # Install symlink:
+ .PHONY: install-haiku
+@@ -1149,24 +1145,20 @@ install-man:
+ @install -d $(MAN_PREFIX)/man1
+ @# tuxpaint.1
+ @cp man/en/tuxpaint.1 $(MAN_PREFIX)/man1/
+- @gzip -f $(MAN_PREFIX)/man1/tuxpaint.1
+- @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint.1.gz
++ @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint.1
+ @# tuxpaint-import.1
+ @cp man/en/tuxpaint-import.1 $(MAN_PREFIX)/man1/
+- @gzip -f $(MAN_PREFIX)/man1/tuxpaint-import.1
+- @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint-import.1.gz
++ @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint-import.1
+ @# tp-magic-config.1
+ @cp man/en/tp-magic-config.1 $(MAN_PREFIX)/man1/
+- @gzip -f $(MAN_PREFIX)/man1/tp-magic-config.1
+- @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tp-magic-config.1.gz
++ @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tp-magic-config.1
+ @echo
+ for l in `ls -d man/*.UTF-8 | cut -d '/' -f 2`; do \
+ DEST=$(MAN_PREFIX)/$$l/man1 ; \
+ echo "...Installing $$l man pages into $$DEST..." ; \
+ install -d $$DEST ; \
+ cp man/$$l/tuxpaint.1 $$DEST ; \
+- gzip -f $$DEST/tuxpaint.1 ; \
+- chmod a+rx,g-w,o-w $$DEST/tuxpaint.1.gz ; \
++ chmod a+rx,g-w,o-w $$DEST/tuxpaint.1 ; \
+ done
+ @# FIXME: The other man pages aren't localizable yet -bjk 2021.08.14
+
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.31.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.31.ebuild
new file mode 100644
index 000000000000..24afdcf2e995
--- /dev/null
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.31.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop optfeature toolchain-funcs xdg
+
+DESCRIPTION="Drawing program designed for young children"
+HOMEPAGE="https://www.tuxpaint.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+S="${WORKDIR}"/${P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+ app-text/libpaper:=
+ dev-libs/fribidi
+ gnome-base/librsvg:2
+ media-gfx/libimagequant
+ >=media-libs/freetype-2:2
+ >=media-libs/libpng-1.2:0=
+ media-libs/libsdl2[X,joystick]
+ media-libs/sdl2-gfx
+ media-libs/sdl2-image[png]
+ media-libs/sdl2-mixer
+ media-libs/sdl2-pango
+ media-libs/sdl2-ttf
+ sys-libs/zlib
+ x11-libs/cairo
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/gperf
+ media-gfx/graphicsmagick[jpeg,png,svg]
+ sys-devel/gettext
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-Makefile.patch
+)
+
+src_compile() {
+ emake CC="$(tc-getCC)" GENTOO_LIBDIR="$(get_libdir)"
+}
+
+src_install() {
+ emake DESTDIR="${D}" GENTOO_LIBDIR="$(get_libdir)" install
+ local file size
+ for file in data/images/icon[0-9]*x[0-9]*.png; do
+ size=${file##*/icon}
+ size=${size%%x*}
+ newicon -s "${size}" "${file}" tux4kids-tuxpaint.png
+ done
+ newmenu src/tuxpaint.desktop tux4kids-tuxpaint.desktop
+ docinto /usr/share/doc/${PF}
+ dodoc docs/*.txt
+ dodoc docs/en/*.txt
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ optfeature "additional graphic stamps" media-gfx/tuxpaint-stamps
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/files/, media-gfx/tuxpaint/
@ 2024-01-11 13:33 Joonas Niilola
0 siblings, 0 replies; 8+ messages in thread
From: Joonas Niilola @ 2024-01-11 13:33 UTC (permalink / raw
To: gentoo-commits
commit: 0d2576134095973eef22132d7456133e82dd8c1b
Author: Philipp Rösner <rndxelement <AT> protonmail <DOT> com>
AuthorDate: Tue Oct 31 21:42:46 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Jan 11 13:31:16 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d257613
media-gfx/tuxpaint: drop 0.9.27-r1
Signed-off-by: Philipp Rösner <rndxelement <AT> protonmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-gfx/tuxpaint/Manifest | 1 -
.../tuxpaint/files/tuxpaint-0.9.27-Makefile.patch | 159 ---------------------
media-gfx/tuxpaint/tuxpaint-0.9.27-r1.ebuild | 63 --------
3 files changed, 223 deletions(-)
diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest
index fdf65c4da48d..eb4fb24e1775 100644
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -1,3 +1,2 @@
-DIST tuxpaint-0.9.27.tar.gz 14292992 BLAKE2B f1337b828604bac968325437eba21046f871a0e07e049f2d3568f44adac400e729f4c6d46bcba9eddf9078089aaf55aab7d0774fb5ab126b96d317b59e37ee00 SHA512 197c6e23fb772edd57614e34dec23e160ece528b58e4a17d67fe4100c58cbcd6c4b5efccfbb24ca760b3a20755230b47f4e3e49969e75ba04ce722102a7f2dd9
DIST tuxpaint-0.9.28.tar.gz 14802638 BLAKE2B 7f7a8f3d61faf052d9872b5af775a6becdefae7cee1207ebcbb5db108fc381b0fa5ba8b7a8facd55ba6dcfca59886125cba7837d2de432fd5c75d2c40b509c41 SHA512 038f92f8d7ee8d85b1c9b18f7781e814ee55067e090fbfa597028e2d13218911157d00f312de2be9db29754a07c5706fc3c3e0e6ea3c71a15f80c37bb2eceb34
DIST tuxpaint-0.9.29.tar.gz 17144658 BLAKE2B db00b14862ca139b0ee2851b7f57bda0df12d09ae516649dab25eb260bfc65fef35c968ab39593a71c173f196dc24426c5d4be79eee230c7139a7832d5508171 SHA512 9642c7145d32848e663b69428d7ff046e6109b292f3c3104dc40f8fcbf4152ab39815cf7dd3a217b0a6bd26ea50c57e0b14b186a23157fbac091ee10436646b3
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.27-Makefile.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.27-Makefile.patch
deleted file mode 100644
index 05b37e1e4812..000000000000
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.27-Makefile.patch
+++ /dev/null
@@ -1,159 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -72,7 +72,7 @@ endif
- # <HOSTROOT> is the directory containing support files for building for <HOST>:
- # <HOSTROOT>/include Header files.
- # <HOSTROOT>/lib Library files.
--# <HOSTROOT>/lib/pkgconfig *.pc files.
-+# <HOSTROOT>/$(LIBDIR)/pkgconfig *.pc files.
- #
- ifdef HOST
- ifdef HOSTROOT
-@@ -103,7 +103,7 @@ ifdef HOST
- # We set PKG_CONFIG_LIBDIR instead of PKG_CONFIG_PATH because we want to
- # *change* where pkg-config looks for .pc files instead of adding to the
- # default path which may have libraries that aren't for HOST.
-- export PKG_CONFIG_LIBDIR:=$(HOSTROOT)/lib/pkgconfig
-+ export PKG_CONFIG_LIBDIR:=$(HOSTROOT)/$(LIBDIR)/pkgconfig
- endif
- endif
-
-@@ -169,7 +169,7 @@ windows_ARCH_CFLAGS:=
- macos_ARCH_CFLAGS:=-isysroot $(SDKROOT) -I$(SDKROOT)/usr/include -I$(HOSTROOT)/include -mmacosx-version-min=$(MINVER) -arch $(subst $() $(), -arch ,$(ARCHS)) -w -headerpad_max_install_names -DHAVE_STRCASESTR
- ios_ARCH_CFLAGS:=-isysroot $(SDKROOT) -I$(SDKROOT)/usr/include -I$(HOSTROOT)/include $(MINVEROPT) -arch $(subst $() $(), -arch ,$(ARCHS)) -w -fPIC -DHAVE_STRCASESTR -DUNLINK_ONLY
- beos_ARCH_CFLAGS:=
--linux_ARCH_CFLAGS:=
-+linux_ARCH_CFLAGS:= ${CFLAGS}
- ARCH_CFLAGS:=$($(OS)_ARCH_CFLAGS)
-
- windows_ARCH_LDFLAGS:=
-@@ -176,7 +176,7 @@ windows_ARCH_LDFLAGS:=
- macos_ARCH_LDFLAGS:=-isysroot $(SDKROOT) -L$(HOSTROOT)/lib -mmacosx-version-min=$(MINVER) -arch $(subst $() $(), -arch ,$(ARCHS))
- ios_ARCH_LDFLAGS:=-isysroot $(SDKROOT) -L$(HOSTROOT)/lib $(MINVEROPT) -arch $(subst $() $(), -arch ,$(ARCHS))
- beos_ARCH_LDFLAGS:=
--linux_ARCH_LDFLAGS:=
-+linux_ARCH_LDFLAGS:=${LDFLAGS}
- ARCH_LDFLAGS:=$($(OS)_ARCH_LDFLAGS)
- LDFLAGS:=$(ARCH_LDFLAGS)
-
-@@ -205,7 +205,7 @@ ARCH_HEADERS:=$($(OS)_ARCH_HEADERS)
- windows_PREFIX:=/usr/local
- macos_PREFIX:=Resources
- ios_PREFIX:=.
--linux_PREFIX:=/usr/local
-+linux_PREFIX:=/usr
- PREFIX:=$($(OS)_PREFIX)
-
- # Root directory to place files when creating packages.
-@@ -243,7 +243,7 @@ MAGIC_PREFIX:=$(DESTDIR)$(LIBDIR)/lib$(LIBDIRSUFFIX)/tuxpaint/plugins
-
- # Docs and man page:
- DOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint-$(VER_VERSION)
--DEVDOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint-$(VER_VERSION)/tuxpaint-dev
-+DEVDOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/${PF}/tuxpaint-dev
- 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
- ios_ARCH_INSTALL:=install-iosbundle install-man install-importscript install-bash-completion
--linux_ARCH_INSTALL:=install-xdg install-man install-importscript install-bash-completion
-+linux_ARCH_INSTALL:= install-man install-importscript install-bash-completion
- ARCH_INSTALL:=$($(OS)_ARCH_INSTALL)
-
- # "make install" installs all of the various parts
-@@ -693,12 +693,12 @@ uninstall: uninstall-i18n
- -rm $(BIN_PREFIX)/tuxpaint-import
- -rm -r $(DATA_PREFIX)
- -rm -r $(DOC_PREFIX)
-- -rm $(MAN_PREFIX)/man1/tuxpaint.1.gz
-- -rm $(MAN_PREFIX)/*/man1/tuxpaint.1.gz
-- -rm $(MAN_PREFIX)/man1/tuxpaint-import.1.gz
-- -rm $(MAN_PREFIX)/*/man1/tuxpaint-import.1.gz
-- -rm $(MAN_PREFIX)/man1/tp-magic-config.1.gz
-- -rm $(MAN_PREFIX)/*/man1/tp-magic-config.1.gz
-+ -rm $(MAN_PREFIX)/man1/tuxpaint.1
-+ -rm $(MAN_PREFIX)/*/man1/tuxpaint.1
-+ -rm $(MAN_PREFIX)/man1/tuxpaint-import.1
-+ -rm $(MAN_PREFIX)/*/man1/tuxpaint-import.1
-+ -rm $(MAN_PREFIX)/man1/tp-magic-config.1
-+ -rm $(MAN_PREFIX)/*/man1/tp-magic-config.1
- -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
- @echo "...Installing Library Modules..."
-- @mkdir -p $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders
-- @cp $(MINGW_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders
-- @strip -s $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll
-+ @mkdir -p $(BIN_PREFIX)/$(LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders
-+ @cp $(MINGW_DIR)/$(LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/$(LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders
-+ @strip -s $(BIN_PREFIX)/$(LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders/*.dll
-
- # Install symlink:
- .PHONY: install-haiku
-@@ -1039,24 +1039,20 @@ install-man:
- @install -d $(MAN_PREFIX)/man1
- @# tuxpaint.1
- @cp man/en/tuxpaint.1 $(MAN_PREFIX)/man1/
-- @gzip -f $(MAN_PREFIX)/man1/tuxpaint.1
-- @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint.1.gz
-+ @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint.1
- @# tuxpaint-import.1
- @cp man/en/tuxpaint-import.1 $(MAN_PREFIX)/man1/
-- @gzip -f $(MAN_PREFIX)/man1/tuxpaint-import.1
-- @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint-import.1.gz
-+ @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint-import.1
- @# tp-magic-config.1
- @cp man/en/tp-magic-config.1 $(MAN_PREFIX)/man1/
-- @gzip -f $(MAN_PREFIX)/man1/tp-magic-config.1
-- @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tp-magic-config.1.gz
-+ @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tp-magic-config.1
- @echo
- for l in `ls -d man/*.UTF-8 | cut -d '/' -f 2`; do \
- DEST=$(MAN_PREFIX)/$$l/man1 ; \
- echo "...Installing $$l man pages into $$DEST..." ; \
- install -d $$DEST ; \
- cp man/$$l/tuxpaint.1 $$DEST ; \
-- gzip -f $$DEST/tuxpaint.1 ; \
-- chmod a+rx,g-w,o-w $$DEST/tuxpaint.1.gz ; \
-+ chmod a+rx,g-w,o-w $$DEST/tuxpaint.1 ; \
- done
- @# FIXME: The other man pages aren't localizable yet -bjk 2021.08.14
-
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.27-r1.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.27-r1.ebuild
deleted file mode 100644
index 7cca8f0ed211..000000000000
--- a/media-gfx/tuxpaint/tuxpaint-0.9.27-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop optfeature toolchain-funcs xdg
-
-DESCRIPTION="Drawing program designed for young children"
-HOMEPAGE="http://www.tuxpaint.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-RDEPEND="
- app-text/libpaper:=
- dev-libs/fribidi
- gnome-base/librsvg:2
- >=media-libs/libpng-1.2:0=
- >=media-libs/freetype-2:2
- media-libs/libsdl[joystick]
- media-libs/sdl-image[png]
- media-libs/sdl-mixer
- media-libs/sdl-pango
- media-libs/sdl-ttf
- media-libs/sdl-gfx
- media-gfx/libimagequant
- x11-libs/cairo
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-util/gperf
- media-gfx/graphicsmagick[jpeg,png,svg]
- sys-devel/gettext
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-Makefile.patch
-)
-
-src_compile() {
- # parallel build may break things
- emake -j1 CC="$(tc-getCC)" LIBDIR="$(get_libdir)"
-}
-
-src_install() {
- emake -j1 DESTDIR="${D}" install
- local file size
- for file in data/images/icon[0-9]*x[0-9]*.png; do
- size=${file##*/icon}
- size=${size%%x*}
- newicon -s "${size}" "${file}" tux4kids-tuxpaint.png
- done
- newmenu src/tuxpaint.desktop tux4kids-tuxpaint.desktop
- dodoc docs/*.txt
- dodoc docs/en/*.txt
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- optfeature "additional graphic stamps" media-gfx/tuxpaint-stamps
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/files/, media-gfx/tuxpaint/
@ 2024-06-17 22:36 Conrad Kostecki
0 siblings, 0 replies; 8+ messages in thread
From: Conrad Kostecki @ 2024-06-17 22:36 UTC (permalink / raw
To: gentoo-commits
commit: 96de139c8e07f70a37ac7e89fab4876ddbfb6593
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun May 26 10:25:33 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Jun 17 22:33:38 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96de139c
media-gfx/tuxpaint: drop old
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/36825
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
media-gfx/tuxpaint/Manifest | 2 -
.../files/tuxpaint-0.9.28-r2-Makefile.patch | 231 ---------------------
.../files/tuxpaint-0.9.29-Makefile-trans.patch | 30 ---
.../tuxpaint/files/tuxpaint-0.9.29-Makefile.patch | 164 ---------------
media-gfx/tuxpaint/tuxpaint-0.9.28-r3.ebuild | 65 ------
media-gfx/tuxpaint/tuxpaint-0.9.29-r1.ebuild | 66 ------
6 files changed, 558 deletions(-)
diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest
index 50d41b326b2a..5a7935a9caa0 100644
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -1,3 +1 @@
-DIST tuxpaint-0.9.28.tar.gz 14802638 BLAKE2B 7f7a8f3d61faf052d9872b5af775a6becdefae7cee1207ebcbb5db108fc381b0fa5ba8b7a8facd55ba6dcfca59886125cba7837d2de432fd5c75d2c40b509c41 SHA512 038f92f8d7ee8d85b1c9b18f7781e814ee55067e090fbfa597028e2d13218911157d00f312de2be9db29754a07c5706fc3c3e0e6ea3c71a15f80c37bb2eceb34
-DIST tuxpaint-0.9.29.tar.gz 17144658 BLAKE2B db00b14862ca139b0ee2851b7f57bda0df12d09ae516649dab25eb260bfc65fef35c968ab39593a71c173f196dc24426c5d4be79eee230c7139a7832d5508171 SHA512 9642c7145d32848e663b69428d7ff046e6109b292f3c3104dc40f8fcbf4152ab39815cf7dd3a217b0a6bd26ea50c57e0b14b186a23157fbac091ee10436646b3
DIST tuxpaint-0.9.31.tar.gz 21733142 BLAKE2B 00041eacd062ac4e535451d4b4a6ac6d92fb7a0b6328dad4c7424b1bf0b95f0d3d2915e5ed7392cbf2f36174e56ceff5fadcf795c3368b3f2a958d794ce0b66a SHA512 7a3df8dce3e354cc22af34d55546de6e033e8ed4f44530b89986c3e1a07961e5e1a132f12f2d3fc5b699c500e7b9e7ab3503d2bafc5041d9fb2dbc8d1479b79f
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.28-r2-Makefile.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.28-r2-Makefile.patch
deleted file mode 100644
index 6ea373620e3e..000000000000
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.28-r2-Makefile.patch
+++ /dev/null
@@ -1,231 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -73,7 +73,7 @@ endif
- # <HOSTROOT> is the directory containing support files for building for <HOST>:
- # <HOSTROOT>/include Header files.
- # <HOSTROOT>/lib Library files.
--# <HOSTROOT>/lib/pkgconfig *.pc files.
-+# <HOSTROOT>/pkgconfig *.pc files.
- #
- ifdef HOST
- ifdef HOSTROOT
-@@ -104,7 +104,7 @@ ifdef HOST
- # We set PKG_CONFIG_LIBDIR instead of PKG_CONFIG_PATH because we want to
- # *change* where pkg-config looks for .pc files instead of adding to the
- # default path which may have libraries that aren't for HOST.
-- export PKG_CONFIG_LIBDIR:=$(HOSTROOT)/lib/pkgconfig
-+ export PKG_CONFIG_LIBDIR:=$(HOSTROOT)/$(GENTOO_LIBDIR)/pkgconfig
- endif
- endif
-
-@@ -170,14 +170,14 @@ windows_ARCH_CFLAGS:=
- macos_ARCH_CFLAGS:=-isysroot $(SDKROOT) -I$(SDKROOT)/usr/include -I$(HOSTROOT)/include -mmacosx-version-min=$(MINVER) -arch $(subst $() $(), -arch ,$(ARCHS)) -w -headerpad_max_install_names -DHAVE_STRCASESTR
- ios_ARCH_CFLAGS:=-isysroot $(SDKROOT) -I$(SDKROOT)/usr/include -I$(HOSTROOT)/include $(MINVEROPT) -arch $(subst $() $(), -arch ,$(ARCHS)) -w -fPIC -DHAVE_STRCASESTR -DUNLINK_ONLY
- beos_ARCH_CFLAGS:=
--linux_ARCH_CFLAGS:=
-+linux_ARCH_CFLAGS:=${CFLAGS}
- ARCH_CFLAGS:=$($(OS)_ARCH_CFLAGS)
-
- windows_ARCH_LDFLAGS:=
- macos_ARCH_LDFLAGS:=-isysroot $(SDKROOT) -L$(HOSTROOT)/lib -mmacosx-version-min=$(MINVER) -arch $(subst $() $(), -arch ,$(ARCHS))
- ios_ARCH_LDFLAGS:=-isysroot $(SDKROOT) -L$(HOSTROOT)/lib $(MINVEROPT) -arch $(subst $() $(), -arch ,$(ARCHS))
- beos_ARCH_LDFLAGS:=
--linux_ARCH_LDFLAGS:=
-+linux_ARCH_LDFLAGS:=${LDFLAGS}
- ARCH_LDFLAGS:=$($(OS)_ARCH_LDFLAGS)
- LDFLAGS:=$(ARCH_LDFLAGS)
-
-@@ -206,7 +206,7 @@ ARCH_HEADERS:=$($(OS)_ARCH_HEADERS)
- windows_PREFIX:=/usr/local
- macos_PREFIX:=Resources
- ios_PREFIX:=.
--linux_PREFIX:=/usr/local
-+linux_PREFIX:=/usr
- PREFIX:=$($(OS)_PREFIX)
-
- # Root directory to place files when creating packages.
-@@ -240,11 +240,11 @@ LIBDIR=$(PREFIX)
-
- # Magic Tool plug-ins
- INCLUDE_PREFIX:=$(DESTDIR)$(PREFIX)/include
--MAGIC_PREFIX:=$(DESTDIR)$(LIBDIR)/lib$(LIBDIRSUFFIX)/tuxpaint/plugins
-+MAGIC_PREFIX:=$(DESTDIR)$(LIBDIR)/${GENTOO_LIBDIR}/tuxpaint/plugins
-
- # Docs and man page:
--DOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint-$(VER_VERSION)
--DEVDOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint-$(VER_VERSION)/tuxpaint-dev
-+DOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/${PF}
-+DEVDOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/${PF}/tuxpaint-dev
- MAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man
- DEVMAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man
-
-@@ -359,7 +359,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:
-
-@@ -447,7 +447,7 @@ INSTALLED_MODIRS:=$(patsubst trans/%.mo,$(LOCALE_PREFIX)/%/LC_MESSAGES,$(MOFILES
-
- $(INSTALLED_MODIRS): $(LOCALE_PREFIX)/%/LC_MESSAGES: trans/%.mo
- install -d -m 755 $@
--$(INSTALLED_MOFILES): $(LOCALE_PREFIX)/%/LC_MESSAGES/tuxpaint.mo: trans/%.mo
-+$(INSTALLED_MOFILES): $(LOCALE_PREFIX)/%/LC_MESSAGES/tuxpaint.mo: trans/%.mo $(INSTALLED_MODIRS)
- install -m 644 $< $@
-
- .PHONY: uninstall-i18n
-@@ -526,7 +526,7 @@ endif
-
- # Build the translation files for gettext
-
--$(MOFILES): trans/%.mo: src/po/%.po
-+$(MOFILES): trans/%.mo: src/po/%.po trans
- msgfmt -o $@ $<
-
- .PHONY: translations
-@@ -551,7 +551,7 @@ trans:
- windows_ARCH_INSTALL:=
- macos_ARCH_INSTALL:=install-macbundle
- ios_ARCH_INSTALL:=install-iosbundle
--linux_ARCH_INSTALL:=install-xdg install-man install-importscript install-bash-completion
-+linux_ARCH_INSTALL:=install-man install-importscript install-bash-completion
- ARCH_INSTALL:=$($(OS)_ARCH_INSTALL)
-
- # "make install" installs all of the various parts
-@@ -627,7 +627,7 @@ install-magic-plugins:
- $(DATA_PREFIX)/sounds/magic/*.ogg
-
- .PHONY: install-magic-plugins
--install-magic-plugin-dev: src/tp_magic_api.h
-+install-magic-plugin-dev: src/tp_magic_api.h install-bin
- @echo
- @echo "...Installing Magic Tool plug-in development files and docs..."
- @cp tp-magic-config $(BIN_PREFIX)
-@@ -719,12 +719,12 @@ uninstall: uninstall-i18n
- -rm $(BIN_PREFIX)/tuxpaint-import
- -rm -r $(DATA_PREFIX)
- -rm -r $(DOC_PREFIX)
-- -rm $(MAN_PREFIX)/man1/tuxpaint.1.gz
-- -rm $(MAN_PREFIX)/*/man1/tuxpaint.1.gz
-- -rm $(MAN_PREFIX)/man1/tuxpaint-import.1.gz
-- -rm $(MAN_PREFIX)/*/man1/tuxpaint-import.1.gz
-- -rm $(MAN_PREFIX)/man1/tp-magic-config.1.gz
-- -rm $(MAN_PREFIX)/*/man1/tp-magic-config.1.gz
-+ -rm $(MAN_PREFIX)/man1/tuxpaint.1
-+ -rm $(MAN_PREFIX)/*/man1/tuxpaint.1
-+ -rm $(MAN_PREFIX)/man1/tuxpaint-import.1
-+ -rm $(MAN_PREFIX)/*/man1/tuxpaint-import.1
-+ -rm $(MAN_PREFIX)/man1/tp-magic-config.1
-+ -rm $(MAN_PREFIX)/*/man1/tp-magic-config.1
- -rm -f -r $(CONFDIR)
- -rm $(COMPLETIONDIR)/tuxpaint-completion.bash
- -rm -r $(MAGIC_PREFIX)
-@@ -783,7 +783,7 @@ install-example-stamps:
- STARTERS:=$(wildcard starters/*.*)
- INSTALLED_STARTERS:=$(patsubst %,$(DATA_PREFIX)/%,$(STARTERS))
-
--$(INSTALLED_STARTERS): $(DATA_PREFIX)/%: %
-+$(INSTALLED_STARTERS): $(DATA_PREFIX)/%: % install-example-starters-dirs
- install -m 644 $< $@
-
- install-example-starters-dirs:
-@@ -817,14 +817,14 @@ $(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)/%: %
-+$(INSTALLED_THUMB_STARTERS): $(DATA_PREFIX)/%: % install-example-starters-dirs
- @install -D -m 644 $< $@ || ( echo "NO THUMB $<" )
-
- .PHONY: echo-thumb-starters
-@@ -849,7 +849,7 @@ install-thumb-starters: echo-install-thumb-starters $(INSTALLED_THUMB_STARTERS)
- TEMPLATES:=$(wildcard templates/*.*)
- INSTALLED_TEMPLATES:=$(patsubst %,$(DATA_PREFIX)/%,$(TEMPLATES))
-
--$(INSTALLED_TEMPLATES): $(DATA_PREFIX)/%: %
-+$(INSTALLED_TEMPLATES): $(DATA_PREFIX)/%: % install-example-template-dirs
- install -m 644 $< $@
-
- install-example-template-dirs:
-@@ -876,7 +876,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 $<" )
-@@ -988,9 +988,9 @@ install-dlls:
- @cp -R win32/etc/ $(BIN_PREFIX)
- @echo
- @echo "...Installing Library Modules..."
-- @mkdir -p $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders
-- @cp $(MINGW_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders
-- @strip -s $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll
-+ @mkdir -p $(BIN_PREFIX)/$(GENTOO_LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders
-+ @cp $(MINGW_DIR)/$(GENTOO_LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders
-+ @strip -s $(BIN_PREFIX)/$(GENTOO_LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders/*.dll
-
- # Install symlink:
- .PHONY: install-haiku
-@@ -1001,7 +1001,7 @@ install-haiku:
-
- # Install the import script:
- .PHONY: install-importscript
--install-importscript:
-+install-importscript: install-bin
- @echo
- @echo "...Installing 'tuxpaint-import' script..."
- @cp src/tuxpaint-import.sh $(BIN_PREFIX)/tuxpaint-import
-@@ -1065,24 +1065,20 @@ install-man:
- @install -d $(MAN_PREFIX)/man1
- @# tuxpaint.1
- @cp man/en/tuxpaint.1 $(MAN_PREFIX)/man1/
-- @gzip -f $(MAN_PREFIX)/man1/tuxpaint.1
-- @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint.1.gz
-+ @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint.1
- @# tuxpaint-import.1
- @cp man/en/tuxpaint-import.1 $(MAN_PREFIX)/man1/
-- @gzip -f $(MAN_PREFIX)/man1/tuxpaint-import.1
-- @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint-import.1.gz
-+ @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint-import.1
- @# tp-magic-config.1
- @cp man/en/tp-magic-config.1 $(MAN_PREFIX)/man1/
-- @gzip -f $(MAN_PREFIX)/man1/tp-magic-config.1
-- @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tp-magic-config.1.gz
-+ @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tp-magic-config.1
- @echo
- for l in `ls -d man/*.UTF-8 | cut -d '/' -f 2`; do \
- DEST=$(MAN_PREFIX)/$$l/man1 ; \
- echo "...Installing $$l man pages into $$DEST..." ; \
- install -d $$DEST ; \
- cp man/$$l/tuxpaint.1 $$DEST ; \
-- gzip -f $$DEST/tuxpaint.1 ; \
-- chmod a+rx,g-w,o-w $$DEST/tuxpaint.1.gz ; \
-+ chmod a+rx,g-w,o-w $$DEST/tuxpaint.1 ; \
- done
- @# FIXME: The other man pages aren't localizable yet -bjk 2021.08.14
-
-@@ -1382,7 +1378,7 @@ SHARED_FLAGS:=-shared -fpic -lm
- MAGIC_C:=$(wildcard magic/src/*.c)
- MAGIC_SO:=$(patsubst magic/src/%.c,magic/%.$(SO_TYPE),$(MAGIC_C))
-
--$(MAGIC_SO): magic/%.$(SO_TYPE): magic/src/%.c
-+$(MAGIC_SO): magic/%.$(SO_TYPE): magic/src/%.c src/tp_magic_api.h
- $(CC) $(MAGIC_CFLAGS) $(LDFLAGS) $(SHARED_FLAGS) -o $@ $< $(PLUGIN_LIBS)
- # Probably should separate the various flags like the following:
- # $(CC) $(PLUG_CPPFLAGS) $(PLUG_CFLAGS) $(PLUG_LDFLAGS) -o $@ $< $(PLUG_LIBS)
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.29-Makefile-trans.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.29-Makefile-trans.patch
deleted file mode 100644
index 20868602f65b..000000000000
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.29-Makefile-trans.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-# Sometimes the trans directory isn't created before
-# accessing it.
-# Upstream commit b452d84d2544a38eca1d2e4e9686a8eaef197d0f
-# fixes this.
---- a/Makefile
-+++ b/Makefile
-@@ -535,6 +535,7 @@ endif
- # Build the translation files for gettext
-
- $(MOFILES): trans/%.mo: src/po/%.po
-+ @-mkdir -p trans
- msgfmt -o $@ $<
-
- %.desktop: %.desktop.in $(POTFILES)
-@@ -552,14 +553,9 @@ translations: trans
- @echo "Install gettext to run Tux Paint in non-U.S. English modes."
- @echo "--------------------------------------------------------------"
- else
--translations: trans $(MOFILES) src/tuxpaint.desktop src/tuxpaint-fullscreen.desktop src/org.tuxpaint.Tuxpaint.appdata.xml
-+translations: $(MOFILES) src/tuxpaint.desktop src/tuxpaint-fullscreen.desktop src/org.tuxpaint.Tuxpaint.appdata.xml
- endif
-
--trans:
-- @echo
-- @echo "...Preparing translation files..."
-- @mkdir trans
--
- ######
-
- windows_ARCH_INSTALL:=
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.29-Makefile.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.29-Makefile.patch
deleted file mode 100644
index e0b1c43a03bb..000000000000
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.29-Makefile.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-diff --git a/Makefile.old b/Makefile
-index 88d0d02..ab71f97 100644
---- a/Makefile.old
-+++ b/Makefile
-@@ -74,7 +74,7 @@ endif
- # <HOSTROOT> is the directory containing support files for building for <HOST>:
- # <HOSTROOT>/include Header files.
- # <HOSTROOT>/lib Library files.
--# <HOSTROOT>/lib/pkgconfig *.pc files.
-+# <HOSTROOT>/pkgconfig *.pc files.
- #
- ifdef HOST
- ifdef HOSTROOT
-@@ -105,7 +105,7 @@ ifdef HOST
- # We set PKG_CONFIG_LIBDIR instead of PKG_CONFIG_PATH because we want to
- # *change* where pkg-config looks for .pc files instead of adding to the
- # default path which may have libraries that aren't for HOST.
-- export PKG_CONFIG_LIBDIR:=$(HOSTROOT)/lib/pkgconfig
-+ export PKG_CONFIG_LIBDIR:=$(HOSTROOT)/$(GENTOO_LIBDIR)/pkgconfig
- endif
- endif
-
-@@ -171,14 +171,14 @@ windows_ARCH_CFLAGS:=
- macos_ARCH_CFLAGS:=-isysroot $(SDKROOT) -I$(SDKROOT)/usr/include -I$(HOSTROOT)/include -mmacosx-version-min=$(MINVER) -arch $(subst $() $(), -arch ,$(ARCHS)) -w -headerpad_max_install_names -DHAVE_STRCASESTR
- ios_ARCH_CFLAGS:=-isysroot $(SDKROOT) -I$(SDKROOT)/usr/include -I$(HOSTROOT)/include $(MINVEROPT) -arch $(subst $() $(), -arch ,$(ARCHS)) -w -fPIC -DHAVE_STRCASESTR -DUNLINK_ONLY
- beos_ARCH_CFLAGS:=
--linux_ARCH_CFLAGS:=
-+linux_ARCH_CFLAGS:=${CFLAGS}
- ARCH_CFLAGS:=$($(OS)_ARCH_CFLAGS)
-
- windows_ARCH_LDFLAGS:=
- macos_ARCH_LDFLAGS:=-isysroot $(SDKROOT) -L$(HOSTROOT)/lib -mmacosx-version-min=$(MINVER) -arch $(subst $() $(), -arch ,$(ARCHS))
- ios_ARCH_LDFLAGS:=-isysroot $(SDKROOT) -L$(HOSTROOT)/lib $(MINVEROPT) -arch $(subst $() $(), -arch ,$(ARCHS))
- beos_ARCH_LDFLAGS:=
--linux_ARCH_LDFLAGS:=
-+linux_ARCH_LDFLAGS:=${LDFLAGS}
- ARCH_LDFLAGS:=$($(OS)_ARCH_LDFLAGS)
- LDFLAGS:=$(ARCH_LDFLAGS)
-
-@@ -207,7 +207,7 @@ ARCH_HEADERS:=$($(OS)_ARCH_HEADERS)
- windows_PREFIX:=/usr/local
- macos_PREFIX:=Resources
- ios_PREFIX:=.
--linux_PREFIX:=/usr/local
-+linux_PREFIX:=/usr
- PREFIX:=$($(OS)_PREFIX)
-
- # Root directory to place files when creating packages.
-@@ -241,10 +241,10 @@ LIBDIR=$(PREFIX)
-
- # Magic Tool plug-ins
- INCLUDE_PREFIX:=$(DESTDIR)$(PREFIX)/include
--MAGIC_PREFIX:=$(DESTDIR)$(LIBDIR)/lib$(LIBDIRSUFFIX)/tuxpaint/plugins
-+MAGIC_PREFIX:=$(DESTDIR)$(LIBDIR)/${GENTOO_LIBDIR}/tuxpaint/plugins
-
- # Docs and man page:
--DOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint-$(VER_VERSION)
-+DOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/${PF}
- MAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man
- DEVMAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man
-
-@@ -367,7 +367,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:
-
-@@ -551,7 +551,7 @@ trans:
- windows_ARCH_INSTALL:=
- macos_ARCH_INSTALL:=install-macbundle
- ios_ARCH_INSTALL:=install-iosbundle
--linux_ARCH_INSTALL:=install-xdg install-man install-importscript install-bash-completion
-+linux_ARCH_INSTALL:=install-man install-importscript install-bash-completion
- ARCH_INSTALL:=$($(OS)_ARCH_INSTALL)
-
- # "make install" installs all of the various parts
-@@ -719,12 +719,12 @@ uninstall: uninstall-i18n
- -rm $(BIN_PREFIX)/tuxpaint-import
- -rm -r $(DATA_PREFIX)
- -rm -r $(DOC_PREFIX)
-- -rm $(MAN_PREFIX)/man1/tuxpaint.1.gz
-- -rm $(MAN_PREFIX)/*/man1/tuxpaint.1.gz
-- -rm $(MAN_PREFIX)/man1/tuxpaint-import.1.gz
-- -rm $(MAN_PREFIX)/*/man1/tuxpaint-import.1.gz
-- -rm $(MAN_PREFIX)/man1/tp-magic-config.1.gz
-- -rm $(MAN_PREFIX)/*/man1/tp-magic-config.1.gz
-+ -rm $(MAN_PREFIX)/man1/tuxpaint.1
-+ -rm $(MAN_PREFIX)/*/man1/tuxpaint.1
-+ -rm $(MAN_PREFIX)/man1/tuxpaint-import.1
-+ -rm $(MAN_PREFIX)/*/man1/tuxpaint-import.1
-+ -rm $(MAN_PREFIX)/man1/tp-magic-config.1
-+ -rm $(MAN_PREFIX)/*/man1/tp-magic-config.1
- -rm -f -r $(CONFDIR)
- -rm $(COMPLETIONDIR)/tuxpaint-completion.bash
- -rm -r $(MAGIC_PREFIX)
-@@ -855,11 +855,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)/%: % install-example-starters-dirs
-@@ -876,7 +876,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 $<" )
-@@ -988,9 +988,9 @@ install-dlls:
- @cp -R win32/etc/ $(BIN_PREFIX)
- @echo
- @echo "...Installing Library Modules..."
-- @mkdir -p $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders
-- @cp $(MINGW_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders
-- @strip -s $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll
-+ @mkdir -p $(BIN_PREFIX)/$(GENTOO_LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders
-+ @cp $(MINGW_DIR)/$(GENTOO_LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders
-+ @strip -s $(BIN_PREFIX)/$(GENTOO_LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders/*.dll
-
- # Install symlink:
- .PHONY: install-haiku
-@@ -1065,24 +1065,20 @@ install-man:
- @install -d $(MAN_PREFIX)/man1
- @# tuxpaint.1
- @cp man/en/tuxpaint.1 $(MAN_PREFIX)/man1/
-- @gzip -f $(MAN_PREFIX)/man1/tuxpaint.1
-- @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint.1.gz
-+ @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint.1
- @# tuxpaint-import.1
- @cp man/en/tuxpaint-import.1 $(MAN_PREFIX)/man1/
-- @gzip -f $(MAN_PREFIX)/man1/tuxpaint-import.1
-- @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint-import.1.gz
-+ @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint-import.1
- @# tp-magic-config.1
- @cp man/en/tp-magic-config.1 $(MAN_PREFIX)/man1/
-- @gzip -f $(MAN_PREFIX)/man1/tp-magic-config.1
-- @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tp-magic-config.1.gz
-+ @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tp-magic-config.1
- @echo
- for l in `ls -d man/*.UTF-8 | cut -d '/' -f 2`; do \
- DEST=$(MAN_PREFIX)/$$l/man1 ; \
- echo "...Installing $$l man pages into $$DEST..." ; \
- install -d $$DEST ; \
- cp man/$$l/tuxpaint.1 $$DEST ; \
-- gzip -f $$DEST/tuxpaint.1 ; \
-- chmod a+rx,g-w,o-w $$DEST/tuxpaint.1.gz ; \
-+ chmod a+rx,g-w,o-w $$DEST/tuxpaint.1 ; \
- done
- @# FIXME: The other man pages aren't localizable yet -bjk 2021.08.14
-
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.28-r3.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.28-r3.ebuild
deleted file mode 100644
index 460469ada58d..000000000000
--- a/media-gfx/tuxpaint/tuxpaint-0.9.28-r3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop optfeature toolchain-funcs xdg
-
-DESCRIPTION="Drawing program designed for young children"
-HOMEPAGE="https://www.tuxpaint.org/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}-sdl1.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${P}-sdl1
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-RDEPEND="
- app-text/libpaper:=
- dev-libs/fribidi
- gnome-base/librsvg:2
- >=media-libs/libpng-1.2:0=
- >=media-libs/freetype-2:2
- media-libs/libsdl[X,joystick]
- media-libs/sdl-image[png]
- media-libs/sdl-mixer
- media-libs/sdl-pango
- media-libs/sdl-ttf
- media-libs/sdl-gfx:=
- media-gfx/libimagequant
- sys-libs/zlib
- x11-libs/cairo
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-util/gperf
- media-gfx/graphicsmagick[jpeg,png]
- sys-devel/gettext
-"
-
-PATCHES=(
- "${FILESDIR}"/${PF}-Makefile.patch
-)
-
-src_compile() {
- emake CC="$(tc-getCC)" GENTOO_LIBDIR="$(get_libdir)"
-}
-
-src_install() {
- emake DESTDIR="${D}" GENTOO_LIBDIR="$(get_libdir)" install
- local file size
- for file in data/images/icon[0-9]*x[0-9]*.png; do
- size=${file##*/icon}
- size=${size%%x*}
- newicon -s "${size}" "${file}" tux4kids-tuxpaint.png
- done
- newmenu src/tuxpaint.desktop tux4kids-tuxpaint.desktop
- docinto /usr/share/doc/${PF}
- dodoc docs/*.txt
- dodoc docs/en/*.txt
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- optfeature "additional graphic stamps" media-gfx/tuxpaint-stamps
-}
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.29-r1.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.29-r1.ebuild
deleted file mode 100644
index 3b3a59f7cfb6..000000000000
--- a/media-gfx/tuxpaint/tuxpaint-0.9.29-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop optfeature toolchain-funcs xdg
-
-DESCRIPTION="Drawing program designed for young children"
-HOMEPAGE="https://www.tuxpaint.org/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
-S="${WORKDIR}"/${P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-RDEPEND="
- app-text/libpaper:=
- dev-libs/fribidi
- gnome-base/librsvg:2
- media-gfx/libimagequant
- >=media-libs/freetype-2:2
- >=media-libs/libpng-1.2:0=
- media-libs/libsdl2[X,joystick]
- media-libs/sdl2-gfx
- media-libs/sdl2-image[png]
- media-libs/sdl2-mixer
- media-libs/sdl2-pango
- media-libs/sdl2-ttf
- sys-libs/zlib
- x11-libs/cairo
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-util/gperf
- media-gfx/graphicsmagick[jpeg,png]
- sys-devel/gettext
-"
-
-PATCHES=(
- "${FILESDIR}"/${PF}-Makefile.patch
- "${FILESDIR}"/${PF}-Makefile-trans.patch
-)
-
-src_compile() {
- emake CC="$(tc-getCC)" GENTOO_LIBDIR="$(get_libdir)"
-}
-
-src_install() {
- emake DESTDIR="${D}" GENTOO_LIBDIR="$(get_libdir)" install
- local file size
- for file in data/images/icon[0-9]*x[0-9]*.png; do
- size=${file##*/icon}
- size=${size%%x*}
- newicon -s "${size}" "${file}" tux4kids-tuxpaint.png
- done
- newmenu src/tuxpaint.desktop tux4kids-tuxpaint.desktop
- docinto /usr/share/doc/${PF}
- dodoc docs/*.txt
- dodoc docs/en/*.txt
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- optfeature "additional graphic stamps" media-gfx/tuxpaint-stamps
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-06-17 22:36 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-02 15:35 [gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/files/, media-gfx/tuxpaint/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2024-06-17 22:36 Conrad Kostecki
2024-01-11 13:33 Joonas Niilola
2024-01-11 13:33 Joonas Niilola
2022-10-12 16:23 Joonas Niilola
2022-07-21 8:37 Joonas Niilola
2022-01-19 0:48 Sam James
2022-01-16 1:34 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox