Fix crash and test failure (#508566 by Kolan Sh. and Drunkard Zhang; #458460 by flameeyes and eroen)

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 154 insertions, 5 deletions

diff --git a/app-office/dia/ChangeLog b/app-office/dia/ChangeLog
index 24f326824527..d4f270b8ae15 100644
--- a/app-office/dia/ChangeLog
+++ b/app-office/dia/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/dia
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.169 2014/06/12 18:00:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/ChangeLog,v 1.170 2014/06/25 09:53:46 pacho Exp $
+
+*dia-0.97.3_pre20140417-r1 (25 Jun 2014)
+
+  25 Jun 2014; Pacho Ramos <pacho@gentoo.org> +dia-0.97.3_pre20140417-r1.ebuild,
+  +files/dia-0.97.2-png-crash.patch:
+  Fix crash and test failure (#508566 by Kolan Sh. and Drunkard Zhang; #458460
+  by flameeyes and eroen)
 
   12 Jun 2014; Pacho Ramos <pacho@gentoo.org>
   +files/dia-0.97.2-disable-cairo.patch, -dia-0.97.2-r2.ebuild,
diff --git a/app-office/dia/Manifest b/app-office/dia/Manifest
index 7543be1614d6..d63d876e41d7 100644
--- a/app-office/dia/Manifest
+++ b/app-office/dia/Manifest
@@ -3,15 +3,17 @@ Hash: SHA256
 
 AUX dia-0.97.0-gnome-doc.patch 1961 SHA256 5a0161a8da6991c65eb85cda4fbb00e65d897a13ab17ca2d1924167d316fa7a6 SHA512 5200051f19d4a199f8c4e17e5f23c16ad4c13a9531b843be0a4d491aa8884efd4d90e6850c1cd1488e80b344ff18e5dc2b2ad7e57cb7417b6c574ad1e8d6f186 WHIRLPOOL d60ea1f01be0a5823c5de654476528cba55fd3587dbf8abbf681e6de939033b3c70b7fc9ffe034b33cdd3344fc2cebe821eca12a635b766ed38169d268e7f910
 AUX dia-0.97.2-disable-cairo.patch 412 SHA256 1e11138c0cbc6d783770bd571b9712ff9d991f330836162c3a28b64389235e2d SHA512 0dc42b550befd1ed72626f1518f7d4156ae92c978cbb00322c815bf7d931224779ae6521c13cd20a308ef7bb37cb14f3bca04a55780110d3acf53ea0f30a712b WHIRLPOOL fee4e08f84ed04ec1f384eb1f4e45c38d264fae7b77b671cceac01df62268e683a4813692736d45c367f49c0da69f27e005b59387a8f913559d8d029e31d8606
+AUX dia-0.97.2-png-crash.patch 1096 SHA256 5d5f5f4b3264851cd8414281694d71dfd7da606164a761d0ccf672dd8c548701 SHA512 54aeb56e86a8e80979aba9860a8c7f1375d43046489002e91021cf0e8dd6261bd926f7fd2d203bf88ef11b5a14cb9f09108dc791793ea4fc725bb6145b30a407 WHIRLPOOL 3e27f50f6e0fa036bfe3ee4800370d412df3b2ce1aa4f9615d6ae5f71f1cb2fe8f9c059b5fd205764d48a62d0c563cc6026d9bfdaaeb028e505bb2f230b05c6d
 AUX dia-0.97.2-underlinking.patch 1024 SHA256 3b5cbe564c9a48453e4300b89fa24de7454268b388a56036afe187c56e46c951 SHA512 d45eb49c39227e9f11ce999083de0a83c60bfac2a5db2403e4bf083c275efdef6bd1adca678712253ec53f7b3d22a5c23f6f886839c32e6cb07a93c001f45e2e WHIRLPOOL 90ea84704a2a3f14730d54044075cae6339c5f21d1fff00567f0c9834bdeae187c83f4eedc7ae7839f0cccecc2caca7ca133968e914ab79333c3005e431c70a5
 DIST dia-0.97.3_pre20140417.tar.xz 5393236 SHA256 d9afac3b2f7bb5fa35733e24f35afd69c7b3cd04af5f6b0a806400a35b5b43db SHA512 1dbd189ca3499a5adb3c6537ffdcfc776b56fb927a3daeb266685dd4a359aa18ea9b472d12865813e823c71652f49e5739ac9d98789629a39e0cd891fe2265a6 WHIRLPOOL 28d4fcd98f853ad0dec48296a0ada9d842eb32a7953a1e11fe59fe21170be4d14e693a53e0d85c392e1b7cf4f117a3206894e3326436c5e53d115c8efb06a842
+EBUILD dia-0.97.3_pre20140417-r1.ebuild 3068 SHA256 2695e8cf8a473bd32f1a3ac58f7e12951c79ccf05a03adae72a3e594812658d3 SHA512 12de206c01c3ac7d18c80ce6aa7684b62c3fb55be4a801605f13713af45fdb413d5af47109d8e291cd754da14d1f1e115542c439205338092f21ec3f03c4a3b6 WHIRLPOOL 4e4f350a5ddab823fdc8aa1abb5db74cc356fb33c9e7fa1f189f7fa13c2d6b29bc336fd342dcde263ce35e235b0975bce1bbae69bcb10301aedb5ad4ffdd2625
 EBUILD dia-0.97.3_pre20140417.ebuild 3003 SHA256 cca88dcaea43b4d238e7d5614f089ef8a3c0af9ab0a6d2abb97b9216eae7ba5f SHA512 3bb8fa0718ffb14cc82f7cf71e59629de43ce95152078ba41fb2de03e786c475b0fd8ef7123eb9bbed4cb0100c1fb862a0b0f9a6d7cd0744c52460201f1a50f3 WHIRLPOOL bd6756a595f3cdc4d24b315c2a31574065658afeed8774bfcd654418fd409d144a835a7c5301584242860fd32974b6f4bf4c6f6bac2f787c4d3cafe07aed0dc6
-MISC ChangeLog 22714 SHA256 17bd0edfb61d9f6cc281a6c1d9965654fdf4982308b10a39a08d08ae9d5e079b SHA512 041250026b4ee160087ebbce78ffde64a8b0298ed4bbab63247e69eacdd841c1aebfd970b2180a76964a4fb94d762fe9456b97b56a0738617c0860b7570f447c WHIRLPOOL a91d6da46cfa1cf9b7aa0875bb1a4be5b06cc70378ee9e517ec7db187166b471ad09a66f9618dbc7811d0c888d26dcc96f116a407e021e300dce749186368d3b
+MISC ChangeLog 22980 SHA256 77d97ec7cdb57453973dac545bf6e262b27800a11e4a2765b775bc584c6e4b70 SHA512 078eeb299cbecdb01a20f0d23fc499bc674a99b08bf08743fa55556ae6d1bcaae66711a0ac1155cd8c41ee2c2232b5472f74c4da6922caca5b0d2001af7e2e09 WHIRLPOOL d839ff8f1fabd2e5220f3fd81fe6fbe1bd5eb86c917a5433a96c06d557998a175f06c3c48648078bb5059a28f1ccf6c624c8ae634c1aa52d7548b0859c6812f7
 MISC metadata.xml 578 SHA256 9f701216a4674db9adcda07b71c272954d60cbb8764e09052db999436287766c SHA512 bc6988cb36508fde98810d60e99975bb626bf5f1d938bc289e010a2268da5a044c674bd0b626609358bd98c2e23ea91c1ca678e6ab181645fe4de1d610e0325f WHIRLPOOL d8827938a36ccf7fb2cbde3d0e9134c111e8bf9ab7640942e212964a6be51ff66da905017393ebcfb1a507e9c12be6425f323115d32f2bc6bbc93546a28ba26a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEUEAREIAAYFAlOZ6scACgkQCaWpQKGI+9RboQCWKQ9BxY/JuvTSDYwKee5kziUh
-fACffStCRVgUtaf0WWcRGaPCjjruQXc=
-=2jXm
+iEYEAREIAAYFAlOqnCsACgkQCaWpQKGI+9QfCgCfeGmuYGXtvjR2VhDaINGCyz44
+nFMAn3xl1rz9rLyywqRpaS+aTmQwRqQA
+=Scqz
 -----END PGP SIGNATURE-----
diff --git a/app-office/dia/dia-0.97.3_pre20140417-r1.ebuild b/app-office/dia/dia-0.97.3_pre20140417-r1.ebuild
new file mode 100644
index 000000000000..d59ddc91e142
--- /dev/null
+++ b/app-office/dia/dia-0.97.3_pre20140417-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.97.3_pre20140417-r1.ebuild,v 1.1 2014/06/25 09:53:46 pacho Exp $
+
+EAPI=5
+GCONF_DEBUG=yes
+GNOME2_LA_PUNT=yes
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit autotools eutils gnome2 python-single-r1 multilib
+
+DESCRIPTION="Diagram/flowchart creation program"
+HOMEPAGE="https://wiki.gnome.org/Apps/Dia"
+
+SRC_URI="http://dev.gentoo.org/~pacho/gnome/${PN}-0.97.3_pre20140417.tar.xz"
+S="${WORKDIR}/${PN}-0.97.2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~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
+# cairo support is preferred as explained by upstream at:
+# https://bugzilla.gnome.org/show_bug.cgi?id=729668#c6
+IUSE="+cairo doc python"
+
+RDEPEND="
+	>=dev-libs/glib-2:2
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/popt
+	>=media-libs/freetype-2
+	>=media-libs/libart_lgpl-2
+	media-libs/libpng:0
+	sys-libs/zlib
+	x11-libs/gtk+:2
+	x11-libs/pango
+	cairo? ( x11-libs/cairo )
+	doc? (
+		app-text/docbook-xml-dtd:4.5
+		app-text/docbook-xsl-stylesheets )
+	python? (
+		>=dev-python/pygtk-2
+		${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-apps/sed
+	virtual/pkgconfig
+	doc? ( dev-libs/libxslt )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	DOCS="AUTHORS ChangeLog KNOWN_BUGS MAINTAINERS NEWS README RELEASE-PROCESS THANKS TODO"
+
+	epatch "${FILESDIR}"/${PN}-0.97.0-gnome-doc.patch #159381 , upstream #470812 #558690
+	epatch "${FILESDIR}"/${PN}-0.97.2-underlinking.patch #420685
+	epatch "${FILESDIR}"/${PN}-0.97.2-disable-cairo.patch #509636
+	epatch "${FILESDIR}"/${PN}-0.97.2-png-crash.patch #508566
+
+	if use python; then
+		python_fix_shebang .
+		sed -i -e "s/\.so/$(get_libname)/" acinclude.m4 || die #298232
+	fi
+
+	if ! use doc; then
+		# Skip man generation
+		sed -i -e '/if HAVE_DB2MAN/,/endif/d' doc/*/Makefile.am || die
+	fi
+
+	# Fix naming conflict on Darwin/OSX, upstream bug #????
+	sed -i -e 's/isspecial/char_isspecial/' objects/GRAFCET/boolequation.c || die
+
+	sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in || die
+
+	sed -i -e "/localedir/d" configure.in || die
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# --exec-prefix makes Python look for modules in the Prefix
+	# --enable-gnome only adds support for deprecated stuff, bug #442294
+	# https://bugzilla.redhat.com/show_bug.cgi?id=996759
+	gnome2_src_configure \
+		--exec-prefix="${EPREFIX}/usr" \
+		--disable-gnome \
+		--disable-libemf \
+		$(use_enable doc db2html) \
+		$(use_with cairo) \
+		$(use_with python) \
+		--without-swig \
+		--without-hardbooks
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Install second desktop file for integrated mode (bug #415495)
+	sed -e 's|^Exec=dia|Exec=dia --integrated|' \
+			-e '/^Name/ s|$| (integrated mode)|' \
+			"${ED}"/usr/share/applications/dia.desktop \
+			> "${ED}"/usr/share/applications/dia-integrated.desktop || die
+}
diff --git a/app-office/dia/files/dia-0.97.2-png-crash.patch b/app-office/dia/files/dia-0.97.2-png-crash.patch
new file mode 100644
index 000000000000..1dfc072c1c5f
--- /dev/null
+++ b/app-office/dia/files/dia-0.97.2-png-crash.patch
@@ -0,0 +1,33 @@
+From 8b8ae09fcc16cc0522679099728f779e291d959c Mon Sep 17 00:00:00 2001
+From: Hans Breuer <hans@breuer.org>
+Date: Fri, 18 Apr 2014 13:28:45 +0200
+Subject: Bug 728405 - back-port some bounding box calculation fixes from
+ master
+
+... so that the unit test works without complaints.
+
+diff --git a/lib/boundingbox.c b/lib/boundingbox.c
+index fd50da7..46adbfa 100644
+--- a/lib/boundingbox.c
++++ b/lib/boundingbox.c
+@@ -494,7 +494,7 @@ polybezier_bbox(const BezPoint *pts, int numpoints,
+        account with the "pointy corners" X (and PS) add when LINEJOIN_MITER mode is 
+        in force. */
+ 
+-    if ((!start) && (!end)) { /* We have a non-extremity vertex. */
++    if (!end) { /* only the last segment might not produce overshoot. */
+       Point vpx,vxn;
+       real co,alpha;
+ 
+@@ -515,7 +515,7 @@ polybezier_bbox(const BezPoint *pts, int numpoints,
+         real overshoot;
+         Point vovs,pto;
+ 
+-	if (finite(alpha))
++	if (alpha > 0.0 && alpha < M_PI)
+ 	  overshoot = extra->middle_trans / sin(alpha/2.0);
+ 	else /* prependicular? */
+ 	  overshoot = extra->middle_trans;
+-- 
+cgit v0.10.1
+