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 +}
