From 676f5ea737a214d7f006084c0950f9785a4778f7 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Sun, 7 Aug 2011 08:59:48 +0000 Subject: [PATCH] Fix building with libpng15 wrt #356287 by Hanno Boeck Package-Manager: portage-2.2.0_alpha47/cvs/Linux x86_64 --- app-office/abiword/ChangeLog | 6 +++- app-office/abiword/Manifest | 13 ++++---- app-office/abiword/abiword-2.8.6-r1.ebuild | 8 +++-- .../files/abiword-2.8.6-libpng15.patch | 33 +++++++++++++++++++ 4 files changed, 50 insertions(+), 10 deletions(-) create mode 100644 app-office/abiword/files/abiword-2.8.6-libpng15.patch diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog index 5f57bef0f242..9c055418ea43 100644 --- a/app-office/abiword/ChangeLog +++ b/app-office/abiword/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/abiword # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.245 2011/08/04 16:29:45 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.246 2011/08/07 08:59:48 ssuominen Exp $ + + 07 Aug 2011; Samuli Suominen abiword-2.8.6-r1.ebuild, + +files/abiword-2.8.6-libpng15.patch: + Fix building with libpng15 wrt #356287 by Hanno Boeck 04 Aug 2011; Tomáš Chvátal abiword-2.8.6-r1.ebuild: media-libs/libwpg app-text/libwpg diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest index cd39ef13eb1e..bce3782ff1c1 100644 --- a/app-office/abiword/Manifest +++ b/app-office/abiword/Manifest @@ -1,14 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 +AUX abiword-2.8.6-libpng15.patch 1248 RMD160 4f6e4f6e99cf9a087a46fc4cf377650303d7f9ed SHA1 6186b59aee2fcb2f732a9629526ec62d5ca34512 SHA256 a648e144047f679bb51696e6080d1f97d2728137c4820f91e91608ffc351703f DIST abiword-2.8.6.tar.gz 9218827 RMD160 caabab25d197f9553ea12376de36fc7f5a771a58 SHA1 998f69d038000b3fc027d4259548f02d67c8d0df SHA256 d99089a63a6cfc1a6a4a026be9278028d47d224088d24b1853acb67e95683a15 -EBUILD abiword-2.8.6-r1.ebuild 4528 RMD160 dd0f50bd1dd9de2c9b5772413dc25dfc0ea32fca SHA1 9d93d502f32bfe548b23c69ebfc04cbad4012a62 SHA256 594211b2bbc0ef0b31776d2e1947f405b6ca6524d4804dbf3ed642ee80499ff3 -MISC ChangeLog 32815 RMD160 5bbca1f87f7eec459aa15db5d407f95fc6c779e1 SHA1 0de564bf44063ffb2ee03dde737530349175de6a SHA256 96d565cbe1d10c1744bce5fa3b280751c6ae250a364afe9bd5dbce386cdc45f9 +EBUILD abiword-2.8.6-r1.ebuild 4576 RMD160 0423f8f86327768e121ef16045a1ec2801bc8f9e SHA1 20c1e9d6503744c3e7c3b4a775a5e2c48699e32a SHA256 6adb56eceab2a2a4063c0845214d5b6e314aba937c75f012bf1b05e5f4bc4c4f +MISC ChangeLog 32990 RMD160 2563f16d2691ae203100f4f206103afc0b6f39da SHA1 40ebb3c4fa1bb8731c5ef6661681108e578014a3 SHA256 4ba6228c9ff453fc5d6f991bd8bd099c104ab458bf7fa01d0c0bb85aa406a09c MISC metadata.xml 879 RMD160 df1f57e78a294b266ece583d9c04e685fc6f2b53 SHA1 8876780818c62eb42318ba47ef68c15cc80a2a10 SHA256 68442b26d087af39be60f2b41749ae53e94073770449f80bf8f6fd2286e0be84 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk46yPUACgkQHB6c3gNBRYcWmwCdFNhrvNukakNVhkVBuk8kgZhw -xAwAoJl1tyiM595T7JQIQeCx/dAWXKsq -=m9+N +iF4EAREIAAYFAk4+Uz4ACgkQXkR9YqOcLPEjnwD+OnvFKSyL5WuYLWJVwy4FsBSG +WJRs9UZN/MovW57KS54A/i+G0Rd9YQOK8p9QOS5JU/jvaxfP/mSfWNbosZcFMxuo +=g3Ve -----END PGP SIGNATURE----- diff --git a/app-office/abiword/abiword-2.8.6-r1.ebuild b/app-office/abiword/abiword-2.8.6-r1.ebuild index 01a51bf64e92..ae94b7a790c8 100644 --- a/app-office/abiword/abiword-2.8.6-r1.ebuild +++ b/app-office/abiword/abiword-2.8.6-r1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.8.6-r1.ebuild,v 1.10 2011/08/04 16:29:45 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.8.6-r1.ebuild,v 1.11 2011/08/07 08:59:48 ssuominen Exp $ EAPI="3" -inherit alternatives gnome2 versionator +inherit alternatives eutils gnome2 versionator MY_MAJORV=$(get_version_component_range 1-2) @@ -27,7 +27,7 @@ RDEPEND=" >=gnome-base/librsvg-2.16:2 >=gnome-extra/libgsf-1.14.15 >=media-libs/libpng-1.2 - virtual/jpeg:0 + virtual/jpeg >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.14:2[cups?] gnome? ( @@ -117,6 +117,8 @@ src_configure() { } src_prepare() { + epatch "${FILESDIR}"/${P}-libpng15.patch + gnome2_src_prepare # install icon to pixmaps (bug #220097) diff --git a/app-office/abiword/files/abiword-2.8.6-libpng15.patch b/app-office/abiword/files/abiword-2.8.6-libpng15.patch new file mode 100644 index 000000000000..b9853e80a4fd --- /dev/null +++ b/app-office/abiword/files/abiword-2.8.6-libpng15.patch @@ -0,0 +1,33 @@ +http://bugzilla.abisource.com/show_bug.cgi?id=13008 + +--- src/af/util/xp/ut_png.cpp ++++ src/af/util/xp/ut_png.cpp +@@ -71,7 +71,7 @@ + * the normal method of doing things with libpng). REQUIRED unless you + * set up your own error handlers in the png_create_read_struct() earlier. + */ +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + /* Free all of the memory associated with the png_ptr and info_ptr */ + png_destroy_read_struct(&png_ptr, &info_ptr, static_cast(NULL)); +--- src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp ++++ src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp +@@ -185,7 +185,7 @@ + /** needed for the stejmp context */ + UT_Error IE_ImpGraphic_GdkPixbuf::_png_write(GdkPixbuf * pixbuf) + { +- if (setjmp(m_pPNG->jmpbuf)) ++ if (setjmp(png_jmpbuf(m_pPNG))) + { + DELETEP(m_pPngBB); + png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); +@@ -446,7 +446,7 @@ + * the normal method of doing things with libpng). REQUIRED unless you + * set up your own error handlers in the png_create_read_struct() earlier. + */ +- if (setjmp(m_pPNG->jmpbuf)) ++ if (setjmp(png_jmpbuf(m_pPNG))) + { + /* Free all of the memory associated with the png_ptr and info_ptr */ + png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); -- 2.26.2