diff options
Diffstat (limited to 'media-gfx/tuxpaint/files')
4 files changed, 194 insertions, 0 deletions
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.20-gentoo.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.20-gentoo.patch new file mode 100644 index 000000000000..00af3cb2a867 --- /dev/null +++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.20-gentoo.patch @@ -0,0 +1,136 @@ +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 new file mode 100644 index 000000000000..f864a8382f09 --- /dev/null +++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.21-LDFLAGS.patch @@ -0,0 +1,22 @@ +=== 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 new file mode 100644 index 000000000000..2970eac15516 --- /dev/null +++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.21-libpng1.5.patch @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000000..295684918f50 --- /dev/null +++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.21-underlinking.patch @@ -0,0 +1,17 @@ +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. |