Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--media-gfx/tuxpaint/Manifest1
-rw-r--r--media-gfx/tuxpaint/files/tuxpaint-0.9.20-gentoo.patch136
-rw-r--r--media-gfx/tuxpaint/files/tuxpaint-0.9.21-LDFLAGS.patch22
-rw-r--r--media-gfx/tuxpaint/files/tuxpaint-0.9.21-libpng1.5.patch19
-rw-r--r--media-gfx/tuxpaint/files/tuxpaint-0.9.21-underlinking.patch17
-rw-r--r--media-gfx/tuxpaint/tuxpaint-0.9.21-r2.ebuild81
6 files changed, 0 insertions, 276 deletions
diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest
index 97bc4b03c544..9a3f246ba0d6 100644
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -1,2 +1 @@
-DIST tuxpaint-0.9.21.tar.gz 9543034 BLAKE2B 196a743542d72e3dc5cea69b9e66a3baecdde7e3b288cb6759632d2b472f69db8d70ad404737416afe7f2ef4d0c0d21c7b2caadb64ca8d21a909e275ee6fcc46 SHA512 fafd80fe7a5a4d65236c8b5a4f15c644c76180e0e4ed7e774795572b70cc38ddb3273be2a93f041d74a1e536a5a9386c18e51987425ea1a3ff910661e4b0afb3
DIST tuxpaint-0.9.24.tar.gz 15561675 BLAKE2B 971baec8b7728cbb54a2a45b604c152a9620d0f6a1856cca99482ad0fd76f2a4493aab81f54e10e5da4d81800b0e3506cb73dda0e00510ef966b0c98f8aa5cb4 SHA512 a4ee9eea833f9a6313701a4686f9f276570df84436c68d9a3d04e9448a8ea00833207e1034965e15145be744194c7b9a7d3c91bdfa3489d06a61de84b64cc723
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.20-gentoo.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.20-gentoo.patch
deleted file mode 100644
index 00af3cb2a867..000000000000
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.20-gentoo.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-diff -ru tuxpaint-0.9.20.orig/Makefile tuxpaint-0.9.20/Makefile
---- tuxpaint-0.9.20.orig/Makefile 2008-12-21 15:04:36.000000000 +0100
-+++ tuxpaint-0.9.20/Makefile 2008-12-21 15:42:24.000000000 +0100
-@@ -137,9 +137,12 @@
- # Icons and launchers:
- ICON_PREFIX:=$(DESTDIR)$(PREFIX)/share/pixmaps
- X11_ICON_PREFIX:=$(DESTDIR)$(PREFIX)/X11R6/include/X11/pixmaps
--GNOME_PREFIX:=$(shell gnome-config --prefix 2> /dev/null)
--KDE_PREFIX:=$(shell kde-config --install apps --expandvars 2> /dev/null)
--KDE_ICON_PREFIX:=$(shell kde-config --install icon --expandvars 2> /dev/null)
-+GNOME_PREFIX:=
-+KDE_PREFIX:=
-+KDE_ICON_PREFIX:=
-+DESKTOP_ICON_PREFIX:=$(PREFIX)/share/icons
-+
-+ENABLE_GETTEXT:=0
-
- # Maemo flag
- MAEMOFLAG:=
-@@ -200,7 +203,7 @@
-
- #-ffast-math
- OPTFLAGS:=-O2
--CFLAGS:=$(CPPFLAGS) $(OPTFLAGS) -W -Wall -fno-common -ffloat-store \
-+CFLAGS:=$(CPPFLAGS) -W -Wall -fno-common -ffloat-store \
- $(call comptest,-fvisibility=hidden,) \
- -Wcast-align -Wredundant-decls \
- -Wbad-function-cast -Wwrite-strings \
-@@ -232,7 +235,10 @@
- # "make" with no arguments builds the program and man page from sources:
- #
- .PHONY: all
--all: tuxpaint translations magic-plugins tp-magic-config
-+all: tuxpaint magic-plugins tp-magic-config
-+ @if [ -n "$(ENABLE_GETTEXT)" ] && [ $(ENABLE_GETTEXT) -eq 1 ]; then \
-+ make translations; \
-+ fi
- @echo
- @echo "--------------------------------------------------------------"
- @echo
-@@ -390,7 +396,7 @@
- windows_ARCH_INSTALL:=
- osx_ARCH_INSTALL:=
- beos_ARCH_INSTALL:=
--linux_ARCH_INSTALL:=install-gnome install-kde install-kde-icons
-+linux_ARCH_INSTALL:=install-desktop-data
- ARCH_INSTALL:=$($(OS)_ARCH_INSTALL)
-
- # "make install" installs all of the various parts
-@@ -400,10 +406,13 @@
- install: install-bin install-data install-man install-doc \
- install-magic-plugins \
- install-magic-plugin-dev \
-- install-icon install-gettext install-im install-importscript \
-+ install-icon install-im install-importscript \
- install-default-config install-example-stamps \
- install-example-starters \
- $(ARCH_INSTALL)
-+ @if [ -n "$(ENABLE_GETTEXT)" ] && [ $(ENABLE_GETTEXT) -eq 1 ]; then \
-+ make install-gettext ; \
-+ fi
- @echo
- @echo "--------------------------------------------------------------"
- @echo
-@@ -581,17 +590,50 @@
-
- # Install a launcher icon in the Gnome menu
- .PHONY: install-gnome
--install-gnome:
-+install-desktop-data:
- @echo
-- @echo "...Installing launcher icon into GNOME..."
-- @if [ "x$(GNOME_PREFIX)" != "x" ]; then \
-- install -d $(DESTDIR)$(GNOME_PREFIX)/share/pixmaps; \
-- cp data/images/icon.png $(DESTDIR)/$(GNOME_PREFIX)/share/pixmaps/tuxpaint.png; \
-- chmod 644 $(DESTDIR)$(GNOME_PREFIX)/share/pixmaps/tuxpaint.png; \
-- install -d $(DESTDIR)$(GNOME_PREFIX)/share/applications; \
-- cp src/tuxpaint.desktop $(DESTDIR)$(GNOME_PREFIX)/share/applications/; \
-- chmod 644 $(DESTDIR)$(GNOME_PREFIX)/share/applications/tuxpaint.desktop; \
-- fi
-+ @echo "...Installing launcher entry..."
-+ @if [ "x$(PREFIX)" != "x" ]; then \
-+ install -d $(PKG_ROOT)$(PREFIX)/share/applications; \
-+ cp src/tuxpaint.desktop $(PKG_ROOT)$(PREFIX)/share/applications/; \
-+ chmod 644 $(PKG_ROOT)$(PREFIX)/share/applications/tuxpaint.desktop; \
-+ install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/scalable/apps/; \
-+ install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/192x192/apps/; \
-+ install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/128x128/apps/; \
-+ install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/96x96/apps/; \
-+ install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/64x64/apps/; \
-+ install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/48x48/apps/; \
-+ install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/32x32/apps/; \
-+ install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/22x22/apps/; \
-+ install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/16x16/apps/; \
-+ cp data/images/tuxpaint-icon.svg \
-+ $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/scalable/apps/tuxpaint.svg; \
-+ chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/scalable/apps/tuxpaint.svg; \
-+ cp data/images/icon192x192.png \
-+ $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/192x192/apps/tuxpaint.png; \
-+ chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/192x192/apps/tuxpaint.png; \
-+ cp data/images/icon128x128.png \
-+ $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/128x128/apps/tuxpaint.png; \
-+ chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/128x128/apps/tuxpaint.png; \
-+ cp data/images/icon96x96.png \
-+ $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/96x96/apps/tuxpaint.png; \
-+ chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/96x96/apps/tuxpaint.png; \
-+ cp data/images/icon64x64.png \
-+ $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/64x64/apps/tuxpaint.png; \
-+ chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/64x64/apps/tuxpaint.png; \
-+ cp data/images/icon48x48.png \
-+ $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/48x48/apps/tuxpaint.png; \
-+ chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/48x48/apps/tuxpaint.png; \
-+ cp data/images/icon32x32.png \
-+ $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/32x32/apps/tuxpaint.png; \
-+ chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/32x32/apps/tuxpaint.png; \
-+ cp data/images/icon22x22.png \
-+ $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/22x22/apps/tuxpaint.png; \
-+ chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/22x22/apps/tuxpaint.png; \
-+ cp data/images/icon16x16.png \
-+ $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/16x16/apps/tuxpaint.png; \
-+ chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/16x16/apps/tuxpaint.png; \
-+ fi
-
-
- # Install a launcher icon for the Nokia 770.
-@@ -684,9 +726,6 @@
- @install -d $(ICON_PREFIX)
- @cp data/images/icon.png $(ICON_PREFIX)/tuxpaint.png
- @chmod 644 $(ICON_PREFIX)/tuxpaint.png
-- @install -d $(X11_ICON_PREFIX)
-- @cp data/images/icon32x32.xpm $(X11_ICON_PREFIX)/tuxpaint.xpm
-- @chmod 644 $(X11_ICON_PREFIX)/tuxpaint.xpm
-
-
- # Install the program:
-Only in tuxpaint-0.9.20: Makefile.bak
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.21-LDFLAGS.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.21-LDFLAGS.patch
deleted file mode 100644
index f864a8382f09..000000000000
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.21-LDFLAGS.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-=== modified file 'Makefile'
---- a/Makefile 2011-08-09 15:19:01 +0000
-+++ b/Makefile 2011-08-09 15:19:43 +0000
-@@ -871,7 +871,7 @@
- $(ARCH_LIBS)
- @echo
- @echo "...Linking Tux Paint..."
-- $(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(FRIBIDI_CFLAGS) $(DEFS) \
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(FRIBIDI_CFLAGS) $(DEFS) \
- -o tuxpaint $^ \
- $(SDL_LIBS) $(SVG_LIB) $(ARCH_LINKS)
- @$(RSRC_CMD)
-@@ -1043,7 +1043,7 @@
- MAGIC_SO:=$(patsubst magic/src/%.c,magic/%.$(SO_TYPE),$(MAGIC_C))
-
- $(MAGIC_SO): magic/%.$(SO_TYPE): magic/src/%.c
-- $(CC) $(MAGIC_CFLAGS) $(SHARED_FLAGS) -o $@ $< $(PLUGIN_LIBS)
-+ $(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.21-libpng1.5.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.21-libpng1.5.patch
deleted file mode 100644
index 2970eac15516..000000000000
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.21-libpng1.5.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-http://tuxpaint.cvs.sourceforge.net/viewvc/tuxpaint/tuxpaint/src/tuxpaint.c?r1=1.828&r2=1.829
-No longer directly accessing PNG structure members directly, now using png_set_IHDR(). (Patch from SF.net Bug #3386433)
-
---- a/src/tuxpaint.c 2011/07/29 21:27:39 1.828
-+++ b/src/tuxpaint.c 2011/08/08 17:59:12 1.829
-@@ -13425,12 +13425,7 @@
- {
- png_init_io(png_ptr, fi);
-
-- info_ptr->width = surf->w;
-- info_ptr->height = surf->h;
-- info_ptr->bit_depth = 8;
-- info_ptr->color_type = PNG_COLOR_TYPE_RGB;
-- info_ptr->interlace_type = 1;
-- info_ptr->valid = 0; /* will be updated by various png_set_FOO() functions */
-+ png_set_IHDR(png_ptr, info_ptr, surf->w, surf->h, 8, PNG_COLOR_TYPE_RGB, 1, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
-
- png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr,
- PNG_sRGB_INTENT_PERCEPTUAL);
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.21-underlinking.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.21-underlinking.patch
deleted file mode 100644
index 295684918f50..000000000000
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.21-underlinking.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sat Oct 26 19:16:54 UTC 2013
-Subject: fix underlinking
-
-https://bugs.gentoo.org/show_bug.cgi?id=484434
-
---- tuxpaint-0.9.21/Makefile
-+++ tuxpaint-0.9.21/Makefile
-@@ -80,7 +80,7 @@
- windows_ARCH_LINKS:=-lintl $(PNG) -lwinspool -lshlwapi $(FRIBIDI_LIB)
- osx_ARCH_LINKS:=$(PAPER_LIB) $(FRIBIDI_LIB)
- beos_ARCH_LINKS:="-lintl $(PNG) -lz -lbe -liconv $(FRIBIDI_LIB)"
--linux_ARCH_LINKS:=$(PAPER_LIB) $(FRIBIDI_LIB)
-+linux_ARCH_LINKS:=$(PAPER_LIB) $(PNG) $(FRIBIDI_LIB)
- ARCH_LINKS:=$($(OS)_ARCH_LINKS)
-
- # Install a launcher icon for the Nokia 770.
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.21-r2.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.21-r2.ebuild
deleted file mode 100644
index 6c8458138345..000000000000
--- a/media-gfx/tuxpaint/tuxpaint-0.9.21-r2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs xdg-utils
-
-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"
-IUSE="nls"
-
-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
- media-libs/sdl-image[png]
- media-libs/sdl-mixer
- media-libs/sdl-pango
- media-libs/sdl-ttf
- x11-libs/cairo
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- nls? ( sys-devel/gettext )
-"
-
-DOCS=(
- docs/{ADVANCED-STAMPS-HOWTO,AUTHORS,CHANGES,default_colors,dejavu}.txt
- docs/{EXTENDING,FAQ,OPTIONS,PNG,README,SVG}.txt
-)
-
-PATCHES=(
- # Sanitize the Makefile and correct a few other issues
- "${FILESDIR}/${PN}-0.9.20-gentoo.patch"
- "${FILESDIR}/${P}-libpng1.5.patch" #378199
- "${FILESDIR}/${P}-LDFLAGS.patch" #334571
- "${FILESDIR}/${P}-underlinking.patch" #484434
-)
-
-src_prepare() {
- default
- sed -i \
- -e "s|linux_PREFIX:=/usr/local|linux_PREFIX:=/usr|" \
- -e "s:/lib/:/$(get_libdir)/:" \
- -e "s:/share/doc/tuxpaint.*:/share/doc/${PF}:g" \
- Makefile || die
-}
-
-src_compile() {
- # parallel build may break things
- emake -j1 CC="$(tc-getCC)" \
- $(use nls && echo ENABLE_GETTEXT=1)
-}
-
-src_install() {
- emake -j1 PKG_ROOT="${D}" \
- $(usex nls ENABLE_GETTEXT=1 '') install
-
- einstalldocs
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
-
- if ! has_version "${CATEGORY}/${PN}"; then
- elog "For additional graphic stamps, you can emerge the"
- elog "media-gfx/tuxpaint-stamps package."
- fi
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}