Fix building with libpng15 wrt #373871 by Stuart Longland. Remove automagic USE="png zlib" and always depend on libpng and zlib.

Package-Manager: portage-2.2.0_alpha47/cvs/Linux x86_64

4 files changed, 43 insertions, 22 deletions

diff --git a/app-office/dia/ChangeLog b/app-office/dia/ChangeLog
index 562c7128ed92..0ceb6fbccc2d 100644
--- a/app-office/dia/ChangeLog
+++ b/app-office/dia/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/dia
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.131 2011/04/14 18:28:15 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.132 2011/08/07 16:14:59 ssuominen Exp $
+
+  07 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> dia-0.97.1.ebuild,
+  +files/dia-0.97.1-libpng15.patch:
+  Fix building with libpng15 wrt #373871 by Stuart Longland. Remove automagic
+  USE="png zlib" and always depend on libpng and zlib.
 
   14 Apr 2011; Jonathan Callen <abcd@gentoo.org> dia-0.97.1.ebuild:
   Add prefix support and keywords
diff --git a/app-office/dia/Manifest b/app-office/dia/Manifest
index 516de5c2712c..811b013ba86a 100644
--- a/app-office/dia/Manifest
+++ b/app-office/dia/Manifest
@@ -3,24 +3,15 @@ Hash: SHA256
 
 AUX dia-0.97-acinclude-python-fixes.patch 2524 RMD160 0383fe7394fa1dc21fc734e39077b5f743ec0987 SHA1 054b6a43a4cb6dc7243dfa2fa7d6412687bf07e9 SHA256 a4c56ee5b05c01253936b7f9ed4d5b796e8f00a5148e94f7b9bba598595e484c
 AUX dia-0.97.0-gnome-doc.patch 1961 RMD160 ccc2b5273b8fe030294041ca3277ad28cec8bea6 SHA1 13ee9f0923ecf48b5fbf3e5cf7448ea8985c4bfb SHA256 5a0161a8da6991c65eb85cda4fbb00e65d897a13ab17ca2d1924167d316fa7a6
+AUX dia-0.97.1-libpng15.patch 879 RMD160 6bfc79c1118de900f2b1cdfad47d82e0cb87cad7 SHA1 7006f1e537b35a49ad7af8788826a2f00d426e7c SHA256 8a3210af5b6d12be6422465d85ce67be048483dee1f57d61d6dcc6e4d5c79cb2
 DIST dia-0.97.1.tar.bz2 6836081 RMD160 e6c3cd2872aa7d0bd8ffa502577027d7f45c8982 SHA1 ea35e0e0f2f75b69e22faa38968e0803a8ab4f47 SHA256 8dfe8b2c9d87baf29834c8de5e3ec91497c2b17f2b77fb1b867afddf5c429142
-EBUILD dia-0.97.1.ebuild 3099 RMD160 ee6bbb7f0dd0ee9079d3735c89926e226bf3ff8c SHA1 156adb734e6213c242f9f508761ac1fea2b2904f SHA256 a12614886ce2027f41117ed096127451851b840e40a0e96371eb286d51b9623b
-MISC ChangeLog 17274 RMD160 cd6a33293a0afeb2b70c096bab61e5acabbffb3a SHA1 095135b06481e6d745b7052fa2d1c60bdf2d2418 SHA256 aeefb06e42f5a32e52bf1ac66f917aeee387204e10b367d9912a6bde559521ef
+EBUILD dia-0.97.1.ebuild 3114 RMD160 4a7f81ec69f811936ceea193768e55657b3974b2 SHA1 0e9e9d2d60053725d7696e196f63624acc2b777f SHA256 8bb326624bae771b09a09c0b0d1112dbf5ad0030db14f5ec8fe7a35316e3d8f3
+MISC ChangeLog 17522 RMD160 1e54928745294d93a70aa7d7d698fd39645f94bb SHA1 63e5cd14cbb7f481a035481cfcd1d0d5152311a2 SHA256 0718a9aabcdddf66cb42d23e44d7ba318d88a5dca7437e2e7d3d624243aaeb99
 MISC metadata.xml 578 RMD160 f6c695b300f590287280f5d79e363e83e4f066d7 SHA1 a621978dd1772191b84c756071af83cea2e76436 SHA256 9f701216a4674db9adcda07b71c272954d60cbb8764e09052db999436287766c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJNpzzJAAoJELHSF2kinlg4cnAP/2XpAcuxLJz0iaPW4jN0v7o5
-L7J7dWpN3C4N32jJGZEjJ7lOuYTbQcu94+f8ssE0aOgpapJPwX+nVt/KksErFqhu
-QZyK2LbFm/MtJHYkAnwe4zUYwNFYxSu9tZMczQnV9HrX2zDWpS/CJvDW5TI/WBw/
-iH6m2LRcg9UnjkHFIrkyIOTKPKQAwBVDBz3U/MGD5wNZ4NHXURrOCf0R1wh6KX1t
-B1naJlGKze6iVQv6dTWyUp81yPzVP6+m+H8oh3uy+8WFFKGTJ4PP5XusfqNTPhFo
-lTbdYxHW6KxES8TPKjhqpiAw3lzTCcnoWgmOYnZszU0Zzi9EUHy/O8fM8wOmM2SS
-mqaSo5i56+ml1q3hbEx9IAbNASZGbzk/puF1SeaxdLKa7cRFItrgIFLxVWoeijwq
-0iFJRgcsWxrYK4JNrbTbVvBb9EVdbGr4D0WBzi0DwW8g9e+WWtxsZffT6J2gZgHj
-INhrKnwyFRG5m8ckR3iK2kLwbTz9XJV3yppWmVXMj7vpnGE10lDEalOgZmpSpqAk
-gN/p7uP4Z4p5aPgjpVDU6PZoMqhuGbLOX6lCvBZ4Cz2Qv7/ibfrSCrd7//7I1siC
-lqigOkGnRwPOFh78tlgrC2O7yQPfd4fU9tO4sVApkaG9z6dJYBwfUrC5JXfgZTXr
-LoXnOO/xx5plcPU/U3az
-=VzpR
+iF4EAREIAAYFAk4+uTwACgkQXkR9YqOcLPHTpQEAgiaRBXrv/G96aISlCAvXPTba
+IViQX80oUbNaGecZwLcA/iXLaBFYjDWga+i9mJ5l+c3IoiAf4eVhYYfp8hWdqwbR
+=K1bR
 -----END PGP SIGNATURE-----
diff --git a/app-office/dia/dia-0.97.1.ebuild b/app-office/dia/dia-0.97.1.ebuild
index 50ca7230f07c..29b2321b454e 100644
--- a/app-office/dia/dia-0.97.1.ebuild
+++ b/app-office/dia/dia-0.97.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.97.1.ebuild,v 1.12 2011/04/14 18:28:15 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.97.1.ebuild,v 1.13 2011/08/07 16:14:59 ssuominen Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -20,7 +20,7 @@ SRC_URI="mirror://gnome/sources/${PN}/${MY_PV_MM}/${MY_P}.tar.bz2"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
 # the doc USE flag doesn't seem to do anything without docbook2html
-IUSE="cairo doc gnome png python zlib"
+IUSE="cairo doc gnome python"
 
 RDEPEND=">=x11-libs/gtk+-2.6.0:2
 	>=dev-libs/glib-2.6.0
@@ -29,10 +29,9 @@ RDEPEND=">=x11-libs/gtk+-2.6.0:2
 	>=dev-libs/libxslt-1
 	>=media-libs/freetype-2.0.95
 	dev-libs/popt
-	zlib? ( sys-libs/zlib )
-	png? (
-		  media-libs/libpng
-		>=media-libs/libart_lgpl-2 )
+	sys-libs/zlib
+	media-libs/libpng
+	>=media-libs/libart_lgpl-2
 	gnome? (
 		>=gnome-base/libgnome-2.0
 		>=gnome-base/libgnomeui-2.0 )
@@ -65,6 +64,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-libpng15.patch
+
 	gnome2_src_prepare
 
 	# Fix compilation in a gnome environment, bug #159831
diff --git a/app-office/dia/files/dia-0.97.1-libpng15.patch b/app-office/dia/files/dia-0.97.1-libpng15.patch
new file mode 100644
index 000000000000..37939748c54a
--- /dev/null
+++ b/app-office/dia/files/dia-0.97.1-libpng15.patch
@@ -0,0 +1,24 @@
+From 59f67782b9e382b2d71aeabbd493799b179bdec0 Mon Sep 17 00:00:00 2001
+From: Hans Breuer <hans@breuer.org>
+Date: Sun, 27 Feb 2011 20:32:47 +0000
+Subject: Bug 642764 - use png_jmpbuf() rather than direct member access
+
+Fix from Hanno Boeck to make Dia compile with libpng 1.5
+https://bugzilla.gnome.org/show_bug.cgi?id=642764
+(cherry picked from commit 8e28086b95578d17386c3be9aea132064be829a0)
+---
+diff --git a/plug-ins/libart/export_png.c b/plug-ins/libart/export_png.c
+index f8bbdc1..33ea6c3 100644
+--- a/plug-ins/libart/export_png.c
++++ b/plug-ins/libart/export_png.c
+@@ -178,7 +178,7 @@ export_png_ok(GtkButton *button, gpointer userdata)
+   }
+ 
+   /* set error handling ... */
+-  if (setjmp(png->jmpbuf)) {
++  if (setjmp(png_jmpbuf(png))) {
+     fclose(fp);
+     png_destroy_write_struct(&png, &info);
+     message_error(_("Error occurred while writing PNG"));
+--
+cgit v0.9