Fix for bug #313359. Thanks Diego for reporting and Xartisius for suggestions. Further fixes for some segfaults

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 42 insertions, 6 deletions

diff --git a/sci-electronics/pcb/ChangeLog b/sci-electronics/pcb/ChangeLog
index 2237bb6b83ae..0af7437556b0 100644
--- a/sci-electronics/pcb/ChangeLog
+++ b/sci-electronics/pcb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-electronics/pcb
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/pcb/ChangeLog,v 1.51 2010/02/19 23:37:58 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/pcb/ChangeLog,v 1.52 2010/07/19 14:00:19 tomjbe Exp $
+
+  19 Jul 2010; Thomas Beierlein <tomjbe@gentoo.org> pcb-20091103.ebuild,
+  +files/pcb-20091103-png.patch:
+  Fix for bug #313359. Thanks Diego for reporting and Xartisius for
+  suggestions. Further fixes for some segfaults
 
 *pcb-20091103 (19 Feb 2010)
 
diff --git a/sci-electronics/pcb/Manifest b/sci-electronics/pcb/Manifest
index e168416b812d..fe602780aa6e 100644
--- a/sci-electronics/pcb/Manifest
+++ b/sci-electronics/pcb/Manifest
@@ -1,6 +1,7 @@
+AUX pcb-20091103-png.patch 654 RMD160 df78bcc4b84a2d08aa702fbc569a5df18b840b51 SHA1 58856014cbace34b25fa0da1574d74f0a9910c00 SHA256 6ccd6a9995b1241efd6ff5a9a583fc29fb318264edd3fb23a3b093f18774b4d4
 DIST pcb-20081128.tar.gz 4524268 RMD160 3a121a3fa991e6f6d40caf086704cb6de0f76752 SHA1 9fbb4feb4e7851b349dfa0fe434e5d5fd822b8df SHA256 2e55067741a5f48ca6962c135fcbe6d1c1b70b95c825156c7db046277929cf28
 DIST pcb-20091103.tar.gz 4503621 RMD160 6e0cd1a4e1bf92a403f3d805aa3b0649360cb04e SHA1 49b1bf551b0e4d8811abf55af515d77a59797e31 SHA256 db8cf094b6eb25dce78393c3dcc604ab2372bec793e6de8840e4b2db0df5ddc3
 EBUILD pcb-20081128-r1.ebuild 3052 RMD160 db155ddcfcd8f683a7cc97fc95fe2040390f5bae SHA1 de708b1846a521c1758c4ef172a2315ea7c7a903 SHA256 a94ba556c2254f473a790688724080af8ed8da477fef659293b18fd80c3ee8aa
-EBUILD pcb-20091103.ebuild 3862 RMD160 5fdcb4fe2410d2f5f9cdc3530dc97843c8fbf8de SHA1 89bbcf59f4d21d89085466e5c7829f89580bd343 SHA256 b542d8725127c3badb55a6b8a61af31f2efe9a9bb908be89f0f675fe50404a72
-MISC ChangeLog 8152 RMD160 594aadab9c7caf832e3b117c0828c94df487e616 SHA1 ef25ff54c0274f42a939a6b307962b430b421a50 SHA256 8ed2b1985627a8b33fe456c327c168578a900aecfe617005934c726b9cc4d807
+EBUILD pcb-20091103.ebuild 4149 RMD160 afcff11d2e32d6a509eab08e44c82d85183b62c1 SHA1 b8fc2d35b8ab52199d5e166e3d0d18a5e2e459a4 SHA256 6f8b91261834c03845560601143b0e0970e682cc3c24886fef4727bf07608e6e
+MISC ChangeLog 8374 RMD160 4733a35d33a27bbd31c3f7003fa0e59502c105ec SHA1 7d2f61c524de9b0e1377cc1013c4e2257df704fd SHA256 1a75368f56c11e05b5bf26647073cd6c599e78bf58891e999613ccd5374a75d4
 MISC metadata.xml 810 RMD160 673ec0a37b4748cc0128e579c4eaaccc9eefaf90 SHA1 f357e6ff7f02449a7135cff3b7d73643c4a89616 SHA256 cabcb0c8d85ac5dd0aff6997ad546d3f8064ce05e806c4b131d84a6890b2530a
diff --git a/sci-electronics/pcb/files/pcb-20091103-png.patch b/sci-electronics/pcb/files/pcb-20091103-png.patch
new file mode 100644
index 000000000000..aad951d7b00b
--- /dev/null
+++ b/sci-electronics/pcb/files/pcb-20091103-png.patch
@@ -0,0 +1,20 @@
+--- src/hid/png/png.c.orig	2010-07-19 15:36:17.000000000 +0200
++++ src/hid/png/png.c	2010-07-19 15:37:53.000000000 +0200
+@@ -137,6 +137,8 @@
+   NULL
+ };
+ 
++#define NUM_FILETYPES (sizeof(filetypes)/sizeof(filetypes[0]) - 1)
++
+ HID_Attribute png_attribute_list[] = {
+   /* other HIDs expect this to be first.  */
+   {"outfile", "Graphics output file",
+@@ -176,7 +178,7 @@
+ #define HA_use_alpha 8
+ 
+   {"format", "Graphics file format",
+-   HID_Enum, 0, 0, {2, 0, 0}, filetypes, 0},
++   HID_Enum, 0, 0, {NUM_FILETYPES-1, 0, 0}, filetypes, 0},
+ #define HA_filetype 9
+ 
+   {"png-bloat", "Amount (in/mm/mil/pix) to add to trace/pad/pin edges (1 = 1/100 mil)",
diff --git a/sci-electronics/pcb/pcb-20091103.ebuild b/sci-electronics/pcb/pcb-20091103.ebuild
index dffce2f7badd..1e58326b3bcb 100644
--- a/sci-electronics/pcb/pcb-20091103.ebuild
+++ b/sci-electronics/pcb/pcb-20091103.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/pcb/pcb-20091103.ebuild,v 1.1 2010/02/19 23:37:58 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/pcb/pcb-20091103.ebuild,v 1.2 2010/07/19 14:00:19 tomjbe Exp $
 
 EAPI="2"
 
-inherit fdo-mime gnome2-utils
+inherit fdo-mime gnome2-utils eutils
 
 DESCRIPTION="GPL Electronic Design Automation: Printed Circuit Board editor"
 HOMEPAGE="http://www.gpleda.org/"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/pcb/files/pcb/${P}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="dbus doc gif gtk jpeg m4lib-png motif nelma nls png xrender tk toporouter"
+IUSE="dbus doc gif gtk jpeg m4lib-png motif nelma nls png xrender test tk toporouter"
 # toporouter-output USE flag removed for pcb-20091103 (output was disabled always)
 # debug USE flag removed for pcb-20091103 (many crashes, should be fixed for next release)
 
@@ -29,6 +29,10 @@ CDEPEND="gif? ( >=media-libs/gd-2.0.23 )
 	nls? ( virtual/libintl )
 	png? ( >=media-libs/gd-2.0.23[png] )
 	m4lib-png? ( >=media-libs/gd-2.0.23[png] )
+	test? (
+		|| ( media-gfx/graphicsmagick[imagemagick] media-gfx/imagemagick )
+		sci-electronics/gerbv
+	)
 	tk? ( >=dev-lang/tk-8 )"
 #toporouter-output? ( x11-libs/cairo )
 
@@ -60,12 +64,18 @@ src_prepare() {
 	if use m4lib-png; then
 		rm -f lib/pcblib-newlib.stamp
 	fi
+	if ! use png; then
+		sed -i '/^hid_png1/d' tests/tests.list || die
+	fi
 	sed -i -e 's/example//' -e 's/tutorial//' -e 's/ win32//' Makefile.in || die "sed failed"
 	sed -i -e 's/DOC=doc/DOC="doc example tutorial"/' configure || die "sed failed"
 	sed -i -e 's/$(pkgdatadir)/$(docdir)/' {example,tutorial}/Makefile.in || die "sed failed"
 
 	# fix bug in pcb-20091103, should be fixed in next release
 	sed -i -e 's/free (&pd);/free (pd);/' src/hid/lesstif/main.c || die "sed failed"
+
+	# fix segfault during 'pcb -h' if USE=-gif or -jpeg or -png
+	epatch "${FILESDIR}"/${P}-png.patch
 }
 
 src_configure() {