summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Meier <maekke@gentoo.org>2008-10-20 20:58:39 +0000
committerMarkus Meier <maekke@gentoo.org>2008-10-20 20:58:39 +0000
commit986a86bdd8bfec6c74c0d8061c5bb64e6eda9970 (patch)
tree2006f87fe9693fa57ca34b2a242c608a502c2dab /media-gfx
parentVersion bump. Now installs scanpci except when USE=minimal. (diff)
downloadgentoo-2-986a86bdd8bfec6c74c0d8061c5bb64e6eda9970.tar.gz
gentoo-2-986a86bdd8bfec6c74c0d8061c5bb64e6eda9970.tar.bz2
gentoo-2-986a86bdd8bfec6c74c0d8061c5bb64e6eda9970.zip
fix libpng linking, reported in bug #242790
(Portage version: 2.2_rc12/cvs/Linux 2.6.27.1 i686)
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/tuxpaint/ChangeLog6
-rw-r--r--media-gfx/tuxpaint/files/tuxpaint-0.9.19-libpng.patch19
-rw-r--r--media-gfx/tuxpaint/tuxpaint-0.9.19.ebuild3
3 files changed, 26 insertions, 2 deletions
diff --git a/media-gfx/tuxpaint/ChangeLog b/media-gfx/tuxpaint/ChangeLog
index b33dda4a22a4..d915b5611c49 100644
--- a/media-gfx/tuxpaint/ChangeLog
+++ b/media-gfx/tuxpaint/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-gfx/tuxpaint
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/ChangeLog,v 1.41 2008/09/18 19:59:20 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/ChangeLog,v 1.42 2008/10/20 20:58:39 maekke Exp $
+
+ 20 Oct 2008; Markus Meier <maekke@gentoo.org>
+ +files/tuxpaint-0.9.19-libpng.patch, tuxpaint-0.9.19.ebuild:
+ fix libpng linking, reported in bug #242790
*tuxpaint-0.9.19 (18 Sep 2008)
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.19-libpng.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.19-libpng.patch
new file mode 100644
index 000000000000..4ec56d4ec811
--- /dev/null
+++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.19-libpng.patch
@@ -0,0 +1,19 @@
+diff -ru tuxpaint-0.9.19.orig/Makefile tuxpaint-0.9.19/Makefile
+--- tuxpaint-0.9.19.orig/Makefile 2008-10-20 00:06:22.000000000 +0200
++++ tuxpaint-0.9.19/Makefile 2008-10-20 00:07:24.000000000 +0200
+@@ -130,6 +130,7 @@
+ -I/usr/include/cairo
+
+ PAPER_LIB=-lpaper
++PNG_LIB=-lpng12
+ ARCH_LIBS=obj/postscript_print.o
+
+
+@@ -925,6 +926,7 @@
+ $(SDL_LIBS) \
+ $(SVG_LIB) \
+ $(PAPER_LIB) \
++ $(PNG_LIB) \
+ $(ARCH_LINKS)
+ @$(RSRC_CMD)
+ @$(MIMESET_CMD)
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.19.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.19.ebuild
index afd4585e99f1..a698b3409376 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.19.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.19.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/tuxpaint-0.9.19.ebuild,v 1.1 2008/09/18 19:59:20 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/tuxpaint-0.9.19.ebuild,v 1.2 2008/10/20 20:58:39 maekke Exp $
inherit eutils gnome2-utils multilib
@@ -33,6 +33,7 @@ src_unpack() {
# Sanitize the Makefile and correct a few other issues.
epatch "${FILESDIR}/${P}-gentoo.patch"
+ epatch "${FILESDIR}/${P}-libpng.patch"
# Make multilib-strict compliant, see bug #200740
sed -i -e "s:/GET_LIBDIR/:/$(get_libdir)/:" Makefile || die "sed failed"