diff options
| author | David Spencer <baildon.research@googlemail.com> | 2015-08-04 14:45:37 +0100 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2016-01-17 09:40:16 +0700 |
| commit | f21ae975846cda9de7916e2d2c19068533e924be (patch) | |
| tree | 7dcf99274feae4c76fe61019a89cd5ef6469a0e1 /graphics/tuxpaint/patch.diff | |
| parent | 4cb2dba1c39c0f00180e609e7c08975d5b8630b3 (diff) | |
graphics/tuxpaint: Updated for version 0.9.22.
Fixes build failure with libpng16 on -current.
Signed-off-by: David Spencer <baildon.research@googlemail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'graphics/tuxpaint/patch.diff')
| -rw-r--r-- | graphics/tuxpaint/patch.diff | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/graphics/tuxpaint/patch.diff b/graphics/tuxpaint/patch.diff index 6501c5a7cac72..829b669363137 100644 --- a/graphics/tuxpaint/patch.diff +++ b/graphics/tuxpaint/patch.diff @@ -1,11 +1,11 @@ -diff -ur tuxpaint-0.9.21.org/Makefile tuxpaint-0.9.21/Makefile ---- tuxpaint-0.9.21.org/Makefile 2009-04-29 02:18:57.000000000 -0300 -+++ tuxpaint-0.9.21/Makefile 2009-10-31 20:56:18.000000000 -0300 -@@ -120,14 +120,14 @@ +diff -u -r tuxpaint-0.9.22/Makefile tuxpaint-0.9.22-patched/Makefile +--- tuxpaint-0.9.22/Makefile 2014-08-19 08:28:33.000000000 +0100 ++++ tuxpaint-0.9.22-patched/Makefile 2015-08-04 14:35:11.258065084 +0100 +@@ -138,14 +138,14 @@ # Magic Tool plug-ins INCLUDE_PREFIX:=$(DESTDIR)$(PREFIX)/include --MAGIC_PREFIX:=$(DESTDIR)$(PREFIX)/lib/tuxpaint/plugins +-MAGIC_PREFIX:=$(DESTDIR)$(LIBDIR)/lib/tuxpaint/plugins +MAGIC_PREFIX:=$(DESTDIR)$(PREFIX)/lib$(LIBDIRSUFFIX)/tuxpaint/plugins @@ -19,9 +19,9 @@ diff -ur tuxpaint-0.9.21.org/Makefile tuxpaint-0.9.21/Makefile +MAN_PREFIX:=$(DESTDIR)$(PREFIX)/man +DEVMAN_PREFIX:=$(DESTDIR)$(PREFIX)/man - - # 'System-wide' Config file: -@@ -139,10 +139,10 @@ + # BASH tab-completion file: + COMPLETIONDIR:=$(DESTDIR)/etc/bash_completion.d +@@ -163,10 +163,10 @@ # Icons and launchers: ICON_PREFIX:=$(DESTDIR)$(PREFIX)/share/pixmaps @@ -35,16 +35,16 @@ diff -ur tuxpaint-0.9.21.org/Makefile tuxpaint-0.9.21/Makefile # Maemo flag MAEMOFLAG:= -@@ -393,7 +393,7 @@ +@@ -435,7 +435,7 @@ windows_ARCH_INSTALL:= osx_ARCH_INSTALL:= - beos_ARCH_INSTALL:= + beos_ARCH_INSTALL:=install-haiku -linux_ARCH_INSTALL:=install-gnome install-kde install-kde-icons +linux_ARCH_INSTALL:=install-kde install-kde-icons ARCH_INSTALL:=$($(OS)_ARCH_INSTALL) # "make install" installs all of the various parts -@@ -449,7 +449,8 @@ +@@ -494,7 +494,8 @@ @cp src/tp_magic_api.h $(INCLUDE_PREFIX)/tuxpaint @chmod a+r,g-w,o-w $(INCLUDE_PREFIX)/tuxpaint/tp_magic_api.h @install -d $(DEVDOC_PREFIX) @@ -54,7 +54,7 @@ diff -ur tuxpaint-0.9.21.org/Makefile tuxpaint-0.9.21/Makefile @chmod a=rX,g=rX,u=rwX $(DEVDOC_PREFIX) # Installs the various parts for the MinGW/MSYS development/testing environment. -@@ -521,7 +522,7 @@ +@@ -573,7 +574,7 @@ rm /usr/share/pixmaps/tuxpaint.png; \ fi -if [ "x$(KDE_PREFIX)" != "x" ]; then \ @@ -63,7 +63,7 @@ diff -ur tuxpaint-0.9.21.org/Makefile tuxpaint-0.9.21/Makefile fi -rm $(ICON_PREFIX)/tuxpaint.png -rm $(X11_ICON_PREFIX)/tuxpaint.xpm -@@ -628,9 +629,9 @@ +@@ -761,9 +762,9 @@ @echo @echo "...Installing launcher icon into KDE..." @if [ "x$(KDE_PREFIX)" != "x" ]; then \ @@ -76,7 +76,7 @@ diff -ur tuxpaint-0.9.21.org/Makefile tuxpaint-0.9.21/Makefile fi .PHONY: install-kde-icons -@@ -791,8 +792,7 @@ +@@ -944,8 +945,7 @@ @echo @echo "...Installing documentation..." @install -d $(DOC_PREFIX) @@ -86,7 +86,7 @@ diff -ur tuxpaint-0.9.21.org/Makefile tuxpaint-0.9.21/Makefile @chmod -R a=rX,g=rX,u=rwX $(DOC_PREFIX) -@@ -806,21 +806,21 @@ +@@ -959,21 +959,21 @@ @# tuxpaint.1 @cp src/manpage/tuxpaint.1 $(MAN_PREFIX)/man1 @gzip -f $(MAN_PREFIX)/man1/tuxpaint.1 |