fix libpng linking, reported in bug #242790

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27.1 i686

4 files changed, 32 insertions, 7 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/Manifest b/media-gfx/tuxpaint/Manifest
index 410365c92ee8..5a617ac7797e 100644
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -6,6 +6,7 @@ AUX tuxpaint-0.9.17-gentoo.patch 6283 RMD160 9f4dbb3201dccf111d44235c77d5c9e6d60
 AUX tuxpaint-0.9.17-printing.patch 1523 RMD160 9ec54087ac22b8de0e439bf014f1b6908c2e465a SHA1 597b4f215af2a13293e002c116b632f5e550fe70 SHA256 b653979d753231537272d5c70e0ee3df642c792537014598887a6f42220983c3
 AUX tuxpaint-0.9.18-gentoo.patch 6612 RMD160 ddcf3bdab81b12eac05fc6d7fbee451ae9579099 SHA1 14f373b5b5e590b186b4f8e58d2e4db1145ef773 SHA256 df5351c00515150006b2cda92d5c68e306a130c2de4ae425d577c5031bf981c5
 AUX tuxpaint-0.9.19-gentoo.patch 6972 RMD160 967654628f2e05b86d6e60d7b726073ea9cf0cfd SHA1 e162721aeb0601511493fb9b7d0d648fd5b52f6e SHA256 a82ec54f4c33e1c399b7637a49e0e91e939e28a6aef7703655f8fb98bc8a612e
+AUX tuxpaint-0.9.19-libpng.patch 455 RMD160 5d1dce369310631b6b167d2917b4267dc2fd8382 SHA1 06dd0ad8b667aa0dc54e13ca62c119d026e7b374 SHA256 e689db548f3341e17487e4676ebe7863286d535fdd18ec977f3eb25ba3073695
 DIST tuxpaint-0.9.16.tar.gz 6785134 RMD160 f263455fa3bd4d51e7280a5451d7cc021b2c9639 SHA1 7c09582abe69d0fc6f0e1077c839b8931899fbe7 SHA256 af2dd9dcac7c7377e344bb964b8a523402aeffde877522c844f98c9e1e5881e0
 DIST tuxpaint-0.9.17.tar.gz 7570223 RMD160 c7cf3636875cad87646cda4df978f9adbbf18630 SHA1 88e42d19339bb1faa03bce45a28d3fe11fbe05b4 SHA256 d01159625fa475739f79f6a5cb2a7dd65e486d165c52d6d8d56cf5222a6fe1ad
 DIST tuxpaint-0.9.18.tar.gz 8243665 RMD160 2d6f7063c65aa073b9af1553a9b5914373e847ee SHA1 34c59dc7789e4bd85ba5b34f3e173227b5879e5b SHA256 7fe48a8c2fd39bc4485eeb5e6c55567f48f50960b3132c091a06e0067d91b9b9
@@ -13,13 +14,13 @@ DIST tuxpaint-0.9.19.tar.gz 8474855 RMD160 52a21da2c8e5c15af4a06f4592245434dfdba
 EBUILD tuxpaint-0.9.16-r1.ebuild 1337 RMD160 741dd82d5ab85bcbc0ab1ce2caed9e90bba31705 SHA1 0ddf2f0db2d52dbc44618b672847f658626fca9c SHA256 247982f464ce8b3bf173dd3175fce95512e9be365fa06f4211360656a5642c9b
 EBUILD tuxpaint-0.9.17-r1.ebuild 1514 RMD160 6daee04c9a6d0ea127b5c86b6b288f51c739bb86 SHA1 2a0ecd64d9ca9bc230bd076eab79d14b24c5a6d1 SHA256 b67d922f0157b73fce8f89b7833f79d3cac18029a9f571039491e26c04bd314c
 EBUILD tuxpaint-0.9.18.ebuild 1443 RMD160 2e3585d106a67e260be2346463b9477d7ff2dc52 SHA1 d112dc718cad59e36f0f7c5593442a21b477e859 SHA256 9027e68306427619ea0ea11353e166e8cc995d59f6ac5b60bf1873ec042b0d24
-EBUILD tuxpaint-0.9.19.ebuild 1575 RMD160 d1ca5e8f9acd38b9b6b1fa85b447062b469b9274 SHA1 cda639bbd2d4a6cf666a182c185bf63dfdc0c29b SHA256 48598b1588357a632d36528282a1ac830a1ae9fb6148e05e821b8b818514dc2b
-MISC ChangeLog 6610 RMD160 33b1ca9092e12fdb356fe7525c40a23bc6dbc365 SHA1 466114435f3fdf958649b1a55380947f252e2947 SHA256 4365655e2633fad90c5b3ec9e023504bc2a9035b5f53b6cb9ec70e59a31c6129
+EBUILD tuxpaint-0.9.19.ebuild 1615 RMD160 d56511de10a9b72e04b09642215eb20992107e1a SHA1 b010c28c4439c465941fa29ffd05a143a3e1d75a SHA256 eda6fe4a192be3d682638c77493ad850bde46805a3db52c59bb6cd2609239e01
+MISC ChangeLog 6768 RMD160 37baf048756371b82baeed0fdf8022cdaff6eda5 SHA1 92bd1d48d3e1801ce8fbed5d2c2d6d2e2d6a0fcf SHA256 9bd22587589bb9a6babf851b843300bde7bb8484f71e0c7e75f5f9da965e3fbd
 MISC metadata.xml 648 RMD160 9637df32ab38d7c4e98c32194c34393eae4786fb SHA1 710e2dfd4045a91e222ac33769adf2d74512ac86 SHA256 5f951324251b981f6dd24414b0b34a590a8ff051f29f2f24a6e1d08c71c82025
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjSs28ACgkQkKaRLQcq0GLfUgCeMAe9Ya0KcNwxusgD69KCVdrZ
-MaAAniaQsOThj780ewdnEyOyJtgChLCm
-=1GSH
+iEYEARECAAYFAkj88WIACgkQkKaRLQcq0GLScQCfccEILcLuz4P2fCHwDgWMFTDh
+7UYAoIi9gHfDCnCF8Vmuh3OFc5Mvqnee
+=skeE
 -----END PGP SIGNATURE-----
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"