Backport upstream compability patch for libpng16 wrt #465658 by Richard Grenville

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 206 insertions, 9 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 7ef37d6de19e..789ce4191bcb 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.333 2013/04/27 05:20:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.334 2013/04/27 10:25:10 ssuominen Exp $
+
+*cairo-1.12.14-r2 (27 Apr 2013)
+
+  27 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> +cairo-1.12.14-r2.ebuild,
+  +files/cairo-1.12.14-libpng16.patch:
+  Backport upstream compability patch for libpng16 wrt #465658 by Richard
+  Grenville
 
 *cairo-1.12.14-r1 (27 Apr 2013)
 
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index a6381689bc78..19c42387ac9e 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -9,6 +9,7 @@ AUX cairo-1.10.2-ubuntu.patch 1777 SHA256 150d5b9f7f842d574a6e10e579bc8f27ca7b20
 AUX cairo-1.12.10-xlib-corruption.patch 3199 SHA256 917c8d49ef881982e124a8e3b22bd4a2160ec3372c3518cf6c45287e10a434b3 SHA512 e7d6ec9729bcc3e755fdf7214d662728686ddecaee10a43ec50fa3bea010db156e063ba9f817ffdbf46ee85bfd4097a927b101b525505dd15eaec79ed622b479 WHIRLPOOL 3783515ab7e0b7700e77b56f699645060531a328b14975259250745a6f180bc36d9d2ac4feb494608a0a073e2729f5cb4662dafe25582ea3617e653497b2fc72
 AUX cairo-1.12.10-xshm-corruption.patch 1039 SHA256 3bf1147514160a76dbd6282e1e1b834155710a34c0f8fae6fe979f91b0cab735 SHA512 e7c793a2468fc3173be9058a250feea8390b3090c81f59ba00c052885077d2ff65e08bbc0536b96e2c7fee136bb2307aa8e8193e54e6dd3fd47107529a65d5c7 WHIRLPOOL 3cc47b61920197c069063805b89c1e0ab8964996c4331eb018049a268ee08275ac0dbb58dce891b58b335808b8c4fb6be565bf95181e6d1bc7a9551e17b5def9
 AUX cairo-1.12.12-disable-test-suite.patch 461 SHA256 da474e8982b1177ee6f8df70ce0867ee4e451a1ff6a94dce53ca2d62a936cd95 SHA512 1985a369fd6d707e816d9bb22aed89039b09fee105c84ffa4c63232dba15e87f12888d6ac735c766c075851e64e53c052df8af1eef08a75d6b908a5244ae2303 WHIRLPOOL c4ad092277b83d110094400af19f98b569297359be32b3e9a07a6e46acd43bcbdc3721838e833180809d647a2c7b941c9be1e8a00a437c3de3602dd8935610b2
+AUX cairo-1.12.14-libpng16.patch 1525 SHA256 f1af9d30e658b795062a42be3ef0bd0e215a69d7f8d3d295910a2459cf7aa21a SHA512 94483ddc3dc6ad4ff6e37c902e845d38375485077fbb682b512ead0b62abbe6708ad4e708bf84abb877c993b938c3412d581b42248ad3e2b77eda03c98437808 WHIRLPOOL fb5721a399059fbc1ea324192b5cd0ce63c9604f8cd3df9ecb51a239b9479450a2cba3786594a5ffec111212daeb72d6a5f14dcff9d081757a97b5344edbd6c0
 AUX cairo-1.8.8-interix.patch 619 SHA256 505be82a1a0b7f963cb49ff85ecf1fa1389a4e43621df76b91fc1529616b2299 SHA512 651b73124ee5b65e2735deefde36727122e9c513da134441be923fb875aedfd3dbd81de8652e3919f3fa04d1de13dee6ec28e4fcd687aaec427d3b0dd94ac703 WHIRLPOOL a1803cbd8f32a8e926a8af932e099c5275920e3e09f7a53ee49898823e81ee7a2533a4db8d2125f200fa409d98fb8e2cbdeb01f00f64b7ba64ba8dffb8487bc3
 AUX cairo-libpng16.patch 1750 SHA256 80493f7340523ff25b1651ddad9ae052fa982a5361e528cf3d5402b664bfce41 SHA512 46f20a84217e5dd0c1197749eeead506995677b76b0b3a6421a2aee639793735632f5084429c72b4d7482eddb5fee3b5f3b22a4b17f552e320afd77abaee5e78 WHIRLPOOL 55f787a1e8c968225eaa333e64ae0e7b7f48b94d38a84a994ab0ec053f5916a4080bb536e858402e2e4db988b7346d7b3a3844e9bca5a3d1f77296a1e7abf6c2
 AUX cairo-respect-fontconfig.patch 538 SHA256 1732f21adfe5ab291d987b7537b13470266253f599901a4707d27fd2b3d66734 SHA512 4d4d473f956b56f11b31f513de06751dcc77342e0f04ecf37064a74b8217f9d3536c0a8a41b09e580f34576ff2d06815b4cbc2bc091c201f947965509677415e WHIRLPOOL c7d8f364a787b095054507a6dceafe08e8112322853e261303adc07b79a9070be63200dbd4ff465943e2303126bcd7eec51b0f6c53f1d4e9a49fd363acbccde2
@@ -22,19 +23,20 @@ EBUILD cairo-1.12.10-r2.ebuild 4008 SHA256 2a07f7d76ab06fb01ebfeaaa6e0c06f9e3eec
 EBUILD cairo-1.12.12-r1.ebuild 4064 SHA256 d10f80a855542c6a22c6399aa6e18c91a10d6cd5eeaaed88bcb953ff41706f5c SHA512 9106521698f9c8cb003dda679d795807a742c60b3afab041df197f84a696259c01935b2613b1a8186ea98f795e4e00be860324e7bab38d6b4f6573f39a976d43 WHIRLPOOL 8d765ea2f8b74b699dd3213187ee4102688b0d4a764cbc00f6304f3a760d5bea4bd1b97f207dc28ef0a71252e05e7d751ba4fe9398146ac3ab657d2cae092cae
 EBUILD cairo-1.12.12.ebuild 3970 SHA256 4e5a30d52b663cab1a271e8c632d41587baf035f0db7a704f31d4c6ea8fce479 SHA512 e982ce45c10aee5c30f1bed54e2aa3c3b17b2a26e8dff4054955a4617a366ea01905c8d8121da8b91d57f6cdb97cad3b1edd42faf068488f40bbcb90076a1e16 WHIRLPOOL e5193d6dd6e7b52f091d08de1bfeb6e05a9d19ddccecf883a86e0dbe6a933bd2b887e289a536affdc0b4face528c47bb9052324b03eae12201f482fefb2a6101
 EBUILD cairo-1.12.14-r1.ebuild 4142 SHA256 c7cf518261cf4cae4d4100c45da840ab24b66e16d87ec9fd8725261fc0343bbc SHA512 0f3238fe8b71122aa06a80e649b16f43d5b82cea59dd5a411e5797c35d5c48b142dea8dc0e6130aed8a53b4f3e5db92d055072b1764a3dd2ecf7044975c86185 WHIRLPOOL e50a667e9921200e2cc61635f688a3cbf6e0ba16db831cde63257c97836cdddf9d97ea3160e7adbdb173f72c004a58496a83053edf8e9fb688d44dcfbc58aed4
+EBUILD cairo-1.12.14-r2.ebuild 4072 SHA256 7751da8d2c9e49d7790aa2071868d340952c744edf8f49e8b75def6a99e83049 SHA512 73b1b9f6c29969a7dc1c114c6fc143caf288468fb15ae3adb46fa33228685561596609f088e750e2dbb77478a220fca319e178ff439616d176fba95bd2837a75 WHIRLPOOL 30fb79cde036185635c939f3eb0f1064364f4c4161b27fbeb0897d283677bf8f843da370e8eeb48eed28410c395cc3d55515ae6d74770c7a69c61b20ece4d719
 EBUILD cairo-1.12.14.ebuild 4064 SHA256 c471b151d44577403db207d354dc75c91f342f0ed1e7308db5d47979cb2753a6 SHA512 832ea8f9b33a76c37a41351f93e5133dc4e38b0feacd33594fbae2ea43df5a9d011cff9c6cb8989e6e5be14c37a134027a24b89cca8241031af69611063c8c4e WHIRLPOOL 1bd2d3642a736ed82673d1978e4944b0177f3db2c95b96000a399da8fe0deb860bc21a997de8ac84f156600811f92d904cb0a4a47623a7a995cef3ccb224e0e2
 EBUILD cairo-1.12.8.ebuild 3904 SHA256 4fe87359c63f2097c219ef1e701016516316ed05fcbb8160be940d9d9e0b7bb6 SHA512 8da56cca2a1f5348168102b4880489f5f4c9de843a5a08a035ebe3a0dab509f18ccce81eb00befedb9915070ca65c95539c32c7df7905ae08685a4c702cce53b WHIRLPOOL f7b95a469bb32c3d98989e59160c7b7fa8565625c12fe8bc64da301492f98f3e4f16741a2f8aed4a3bf4f517ab445913af0de79ee4c60f5f7684c91c7bfafe31
 EBUILD cairo-9999.ebuild 4007 SHA256 9f2dbcd21b11ee3036d0bd7a350720b4a37337a45a988b763d52a40229af72e5 SHA512 c42e19feaddbf018eeef02549dae0d61ab67e3ae599d67b5d9d47f0126c1c304529ee6eb836bafe8865bbd0ddd52182016e9febcb45ab6bdb9ae8c53425e72c6 WHIRLPOOL 11959b93e814adf2cf9b5f7b613c8b396b96bbec8a762f12f1dbc9478cef7cd0a674494dd380f254ab9c3955cf3b233d53205977098b3ccad2eb7ed200b72cc8
-MISC ChangeLog 49040 SHA256 2a291a6b43f894c7a98063beeadc989d3fbb472050b061492fa4d3039ada0407 SHA512 64a264543786f99b24bf4d1cbaa812627095706bba8e5cbdf4bcb73ce0a10901a43d2c06cada093007c82fe0952c444712a2ab2802e5b3f9526eb7debfebd2de WHIRLPOOL 54b935552e61104a7f14063d42c9ccfa167e738b5fdeefb1d9d72a9b83ebe31f1047117bedfd14fd9ed3163d569eff319208f54522317a71d44bcc4332b99d10
+MISC ChangeLog 49279 SHA256 0bff5ee9d22a2e3b38a069584d6bfec76f59ae213e43bbe496da6675b4220c58 SHA512 ff0639afa8140d19a0e5e7fcdcfe3dc7048eac3f4f0a5b75b35610d8c2b1469c0a986b8784a1e2b9fc991a151cc0d08ba87328383fe26d6efcefb49981d660e3 WHIRLPOOL 0c7c3e2345206a71c42e859abe6857dc98ba963823a8f02b646d65238544cb8f50226138ddcebbc6219607d9215605787063e7cc740b118cfd55f14e861e656c
 MISC metadata.xml 798 SHA256 f9797b2bdea41285e7b75db0f303570d00928b6135f40f869584e77c4dcdfeb1 SHA512 6cf758886d5711ec28d0f4e37f8c5fd863827c69c43930a3bc5755f397838f8a209dcc7f4652cd4d61a126bceb5565a60675ed7d941f49d67ef8a6e2b2b496e1 WHIRLPOOL 40b5b64a9933fa7facc9842409e0f4b4612d74bc940ccf6ec701da649af54507f95abf35820fe3d629e1c0cd15185c881a528e8e4a738375756a74936cb6cb46
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRe1/SAAoJEEdUh39IaPFNr4kIAJfeuXjdZI5LjVk/5E/yRzZU
-XyBkF53gYyHSkhT6QDE9LiQQyHQVFrOwXUUVVMNP2l7W+nFB6oP9VR+PVVMuzccQ
-tbXrkQhqDtVrrjSzUM7imnD/c5zUKMQqMaCWL3ppbdPVgLNxj2CfHasc7iHzUHBM
-DzQdIpVht+bw4KFb9/IcdaK8/Mha9SeehA/ElbWk7Hg1G1W0g5UIwGcjLvAT4jAU
-9aJ6pKkVOZ0faUpiUeTHhQHjiM2qK/rPOwpH7POfCUqREJfSAq28myu0BGBZj3bO
-kiiPQzUw6mRX70W8v4qn5wi8ZiMHDyKfhhhSvR12+4SzsaJKSbeqfiQYwA+f/e0=
-=IIEI
+iQEcBAEBCAAGBQJRe6cuAAoJEEdUh39IaPFN7lcH/3fO8RwOwjx0wDwd2J+qYcS1
+sNAW9lGKbeYxLaB+02SbkCqW8hA/A9K3FRsJRXmFxKxj3F1sWVCfsBNMBmxdAkuO
+X11jKkXI4i6tZNLnf5vli4ltN4kVBimXIO/s5oVPB+6VJ0OUzq6MQE5pBNvruBfb
+bj9kpCZHxKTHmi7WSk1+9NTIZf6dYxDaD8MMOvBIWsIIopiYbATXHCYIg5NDEq9s
+NSdo4mur7QH7mlbEaoYe8mlQ7KN2JCnAoUQJ8/PZHW3cAC/1gn/Ei83lwD5rfp9P
+ME5HI/BSNMoAjssnbcE9jNXd+z911i7x62TX8/fsTaCl1JLiyUKlqpRSeWXjD7Q=
+=Zj4n
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/cairo/cairo-1.12.14-r2.ebuild b/x11-libs/cairo/cairo-1.12.14-r2.ebuild
new file mode 100644
index 000000000000..3d6843f1b9f1
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.12.14-r2.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.14-r2.ebuild,v 1.1 2013/04/27 10:25:10 ssuominen Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic autotools
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://anongit.freedesktop.org/git/cairo"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://cairographics.org/releases/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A vector graphics library with cross-device output support"
+HOMEPAGE="http://cairographics.org/"
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+IUSE="X aqua debug directfb doc drm gallium +glib legacy-drivers opengl openvg qt4 static-libs +svg xcb"
+
+# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
+RESTRICT="test"
+
+RDEPEND="media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/libpng:0=
+	sys-libs/zlib
+	>=x11-libs/pixman-0.28.0
+	directfb? ( dev-libs/DirectFB )
+	glib? ( >=dev-libs/glib-2.28.6:2 )
+	opengl? ( || ( media-libs/mesa[egl] media-libs/opengl-apple ) )
+	openvg? ( media-libs/mesa[openvg] )
+	qt4? ( >=dev-qt/qtgui-4.8:4 )
+	X? (
+		>=x11-libs/libXrender-0.6
+		x11-libs/libXext
+		x11-libs/libX11
+		drm? (
+			>=virtual/udev-136
+			gallium? ( media-libs/mesa[gallium] )
+		)
+	)
+	xcb? (
+		x11-libs/libxcb
+		x11-libs/xcb-util
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/libtool-2
+	doc? (
+		>=dev-util/gtk-doc-1.6
+		~app-text/docbook-xml-dtd-4.2
+	)
+	X? (
+		x11-proto/renderproto
+		drm? (
+			x11-proto/xproto
+			>=x11-proto/xextproto-7.1
+		)
+	)"
+
+# drm module requires X
+# for gallium we need to enable drm
+REQUIRED_USE="
+	drm? ( X )
+	gallium? ( drm )
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
+	use legacy-drivers && epatch "${FILESDIR}"/${PN}-1.10.0-buggy_gradients.patch
+	epatch "${FILESDIR}"/${PN}-respect-fontconfig.patch
+	epatch "${FILESDIR}"/${PN}-1.12.12-disable-test-suite.patch
+	epatch "${FILESDIR}"/${PN}-1.12.14-libpng16.patch
+	epatch_user
+
+	# Slightly messed build system YAY
+	if [[ ${PV} == *9999* ]]; then
+		touch boilerplate/Makefile.am.features
+		touch src/Makefile.am.features
+		touch ChangeLog
+	fi
+
+	# We need to run elibtoolize to ensure correct so versioning on FreeBSD
+	# upgraded to an eautoreconf for the above interix patch.
+	eautoreconf
+}
+
+src_configure() {
+	local myopts
+
+	# SuperH doesn't have native atomics yet
+	use sh && myopts+=" --disable-atomic"
+
+	[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
+	# http://bugs.freedesktop.org/show_bug.cgi?id=15463
+	[[ ${CHOST} == *-solaris* ]] && append-flags -D_POSIX_PTHREAD_SEMANTICS
+
+	#gets rid of fbmmx.c inlining warnings
+	append-flags -finline-limit=1200
+
+	use X && myopts+=" --enable-tee=yes"
+
+	use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
+
+	# --disable-xcb-lib:
+	#	do not override good xlib backed by hardforcing rendering over xcb
+	# --disable-valgrind:
+	#   valgrind code is busted as per upstream
+	econf \
+		--disable-dependency-tracking \
+		$(use_with X x) \
+		$(use_enable X xlib) \
+		$(use_enable X xlib-xrender) \
+		$(use_enable aqua quartz) \
+		$(use_enable aqua quartz-image) \
+		$(use_enable debug test-surfaces) \
+		$(use_enable directfb) \
+		$(use_enable glib gobject) \
+		$(use_enable doc gtk-doc) \
+		$(use_enable openvg vg) \
+		$(use_enable opengl gl) \
+		$(use_enable qt4 qt) \
+		$(use_enable static-libs static) \
+		$(use_enable svg) \
+		$(use_enable xcb) \
+		$(use_enable xcb xcb-shm) \
+		$(use_enable drm) \
+		$(use_enable gallium) \
+		--enable-ft \
+		--enable-pdf \
+		--enable-png \
+		--enable-ps \
+		--disable-xlib-xcb \
+		--disable-valgrind \
+		${myopts}
+}
+
+src_install() {
+	# parallel make install fails
+	emake -j1 DESTDIR="${D}" install
+	find "${ED}" -name '*.la' -exec rm -f {} +
+	dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/x11-libs/cairo/files/cairo-1.12.14-libpng16.patch b/x11-libs/cairo/files/cairo-1.12.14-libpng16.patch
new file mode 100644
index 000000000000..c16317811982
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.12.14-libpng16.patch
@@ -0,0 +1,40 @@
+From 2dd2c826a5b367d32cf2d48ed69754795990c5db Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue, 16 Apr 2013 09:58:56 +0000
+Subject: png: Avoid marking the surface as in error after a png warning
+
+It turns out that libpng will continue to load an image after throwing a
+warning, and that libpng16 now throws warnings for images that libpng15
+and earlier loaded without error. As we were happily loading those
+images into cairo surfaces before, we are therefore being overzealous
+in throwing an error now - so just squelch the warning.
+
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/src/cairo-png.c b/src/cairo-png.c
+index e74a4a8..068617d 100644
+--- a/src/cairo-png.c
++++ b/src/cairo-png.c
+@@ -149,13 +149,13 @@ static void
+ png_simple_warning_callback (png_structp png,
+ 	                     png_const_charp error_msg)
+ {
+-    cairo_status_t *error = png_get_error_ptr (png);
+-
+-    /* default to the most likely error */
+-    if (*error == CAIRO_STATUS_SUCCESS)
+-	*error = _cairo_error (CAIRO_STATUS_NO_MEMORY);
+-
+-    /* png does not expect to abort and will try to tidy up after a warning */
++    /* png does not expect to abort and will try to tidy up and continue
++     * loading the image after a warning. So we also want to return the
++     * (incorrect?) surface.
++     *
++     * We use our own warning callback to squelch any attempts by libpng
++     * to write to stderr as we may not be in control of that output.
++     */
+ }
+ 
+ 
+--
+cgit v0.9.0.2-2-gbebe