Fix building on amd64 with gcc4.

Package-Manager: portage-2.0.51.22-r1

4 files changed, 47 insertions, 19 deletions

diff --git a/app-text/gpdf/ChangeLog b/app-text/gpdf/ChangeLog
index 4ff725e40eb5..b4684a2a4ae6 100644
--- a/app-text/gpdf/ChangeLog
+++ b/app-text/gpdf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/gpdf
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gpdf/ChangeLog,v 1.84 2005/05/18 02:04:15 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gpdf/ChangeLog,v 1.85 2005/05/20 16:03:44 azarah Exp $
+
+  20 May 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/gpdf-2.10.0-amd64-gcc4.patch, gpdf-2.10.0.ebuild:
+  Fix building on amd64 with gcc4.
 
   18 May 2005; Jason Wever <weeve@gentoo.org> gpdf-2.8.3.ebuild:
   Stable on SPARC.
diff --git a/app-text/gpdf/Manifest b/app-text/gpdf/Manifest
index 580725d56d50..55f176068cd7 100644
--- a/app-text/gpdf/Manifest
+++ b/app-text/gpdf/Manifest
@@ -1,25 +1,36 @@
-MD5 89842379ec6c0ee3c70fb747ae9c0410 ChangeLog 9061
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6eeb7ca08d8276606fb57add4b568c57 gpdf-2.8.1.ebuild 1054
+MD5 3ec94b0d7a37f7330404f3197c6bfbcd gpdf-2.8.2.ebuild 1130
+MD5 c26a102be26ff0116f7aa2f247d7c0e2 gpdf-2.8.0-r2.ebuild 1085
+MD5 858eb01a646cabb4978e2bc6ef593fb7 gpdf-2.10.0.ebuild 1152
+MD5 57a2054fe2cdb4bb38d11b8125a8937a ChangeLog 9209
 MD5 a805385ef63f46517fcdf018fb0e08d9 gpdf-0.132-r2.ebuild 1169
 MD5 d094dcab1afd170dae62b054d98e3acb gpdf-0.132-r1.ebuild 1025
-MD5 c26a102be26ff0116f7aa2f247d7c0e2 gpdf-2.8.0-r2.ebuild 1085
-MD5 6eeb7ca08d8276606fb57add4b568c57 gpdf-2.8.1.ebuild 1054
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 a63c2c17150f9fc8b811c171d13eeaf7 gpdf-2.8.1-r1.ebuild 1129
-MD5 3ec94b0d7a37f7330404f3197c6bfbcd gpdf-2.8.2.ebuild 1130
 MD5 e4196a9bbba33aa5200da91195b238dd gpdf-2.8.3.ebuild 1056
-MD5 6c59e42fe35fc4bf6167862cba61eafd gpdf-2.10.0.ebuild 1076
-MD5 e65fd891d8fadaf18dcaf232d18abdd6 files/digest-gpdf-2.8.1 64
-MD5 167bcfd9a6e435acc241c07dc522b562 files/digest-gpdf-0.132-r2 64
-MD5 f61386d00d5674f3bbb80b181e8cea3a files/digest-gpdf-2.8.0-r2 64
-MD5 167bcfd9a6e435acc241c07dc522b562 files/digest-gpdf-0.132-r1 64
 MD5 e65fd891d8fadaf18dcaf232d18abdd6 files/digest-gpdf-2.8.1-r1 64
-MD5 9336bbbfbb54ba88fb5e4aba2da1833f files/gpdf-0.112-remove_gtk24_call.patch 607
-MD5 b32f90fc9249d1f7434659642b36f9d9 files/gpdf-xpdf_2_CAN-2004-0888.patch 2716
-MD5 5e63c86e19a1c1387cab38b7e2902c9e files/gpdf-xpdf_3_CAN-2004-0889.patch 8115
-MD5 362296e34a1a04a6e5e2a7d9e97547c6 files/gpdf-xpdf2_underflow.patch 2363
 MD5 2fce5bedd61300fad1566a41f991a782 files/gpdf-xpdf_goo_sizet.patch 1424
+MD5 c32a612ce419b9930ff273cf382558bf files/gpdf-xpdf-3.00pl3.patch 346
 MD5 651529b6e386b3a73ffd9cc0c19e9661 files/gpdf-xpdf-CAN-2004-1125.patch 1666
+MD5 065449d153d6c17c41baeb9ad438feb2 files/gpdf-2.10.0-amd64-gcc4.patch 436
 MD5 2a2fc64147e806f72bdda9e2e66731a0 files/digest-gpdf-2.8.2 64
-MD5 5bc556bc031d2f6ed2e0b609253e8b93 files/digest-gpdf-2.8.3 64
-MD5 c32a612ce419b9930ff273cf382558bf files/gpdf-xpdf-3.00pl3.patch 346
+MD5 e65fd891d8fadaf18dcaf232d18abdd6 files/digest-gpdf-2.8.1 64
+MD5 362296e34a1a04a6e5e2a7d9e97547c6 files/gpdf-xpdf2_underflow.patch 2363
+MD5 b32f90fc9249d1f7434659642b36f9d9 files/gpdf-xpdf_2_CAN-2004-0888.patch 2716
 MD5 388d05f1aabd1c48c3536ac69d0d8505 files/digest-gpdf-2.10.0 65
+MD5 167bcfd9a6e435acc241c07dc522b562 files/digest-gpdf-0.132-r2 64
+MD5 5bc556bc031d2f6ed2e0b609253e8b93 files/digest-gpdf-2.8.3 64
+MD5 167bcfd9a6e435acc241c07dc522b562 files/digest-gpdf-0.132-r1 64
+MD5 9336bbbfbb54ba88fb5e4aba2da1833f files/gpdf-0.112-remove_gtk24_call.patch 607
+MD5 5e63c86e19a1c1387cab38b7e2902c9e files/gpdf-xpdf_3_CAN-2004-0889.patch 8115
+MD5 f61386d00d5674f3bbb80b181e8cea3a files/digest-gpdf-2.8.0-r2 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD4DBQFCjgpd1ZcsMnZjRyIRAmNxAKCwNECqZG6lGRl2P/eRuM1QqM5tHgCYkELe
+SZ33uT/eRXw7yABfMC9ntQ==
+=T/wA
+-----END PGP SIGNATURE-----
diff --git a/app-text/gpdf/files/gpdf-2.10.0-amd64-gcc4.patch b/app-text/gpdf/files/gpdf-2.10.0-amd64-gcc4.patch
new file mode 100644
index 000000000000..31482548c414
--- /dev/null
+++ b/app-text/gpdf/files/gpdf-2.10.0-amd64-gcc4.patch
@@ -0,0 +1,11 @@
+--- gpdf-2.10.0/xpdf/gpdf-control.cc	2005-05-20 15:03:29.000000000 +0200
++++ gpdf-2.10.0.az/xpdf/gpdf-control.cc	2005-05-20 15:06:39.000000000 +0200
+@@ -213,7 +213,7 @@
+ 	g_return_if_fail (GPDF_IS_NON_NULL_CONTROL (control));
+ 	priv = control->priv;
+ 
+-	if ((to_id = (unsigned int)
++	if ((to_id = (unsigned long)
+ 	     g_object_get_data (G_OBJECT (control),
+ 				"status-timeout-id")) != 0) {
+ 		g_object_set_data (G_OBJECT (control),
diff --git a/app-text/gpdf/gpdf-2.10.0.ebuild b/app-text/gpdf/gpdf-2.10.0.ebuild
index cbbbd4a04b93..95ca9a1be841 100644
--- a/app-text/gpdf/gpdf-2.10.0.ebuild
+++ b/app-text/gpdf/gpdf-2.10.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gpdf/gpdf-2.10.0.ebuild,v 1.2 2005/05/06 10:21:23 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gpdf/gpdf-2.10.0.ebuild,v 1.3 2005/05/20 16:03:44 azarah Exp $
 
 inherit gnome2 eutils
 
@@ -38,9 +38,11 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
-	# fix sec vuln (#69662)
+	# Fix sec vuln (#69662)
 	epatch ${FILESDIR}/${PN}-xpdf_goo_sizet.patch
-	# disable the tests, see bug #73882
+	# Fix building on amd64 with gcc4
+	epatch ${FILESDIR}/${P}-amd64-gcc4.patch
+	# Disable the tests, see bug #73882
 	sed -i -e "s:test-files::" Makefile.in
 }