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

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 148 insertions, 1 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/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
+