gcc4 patch thanks to nattfodd and Vasileios P. Lourdas <lourdas_v@yahoo.gr> in bug 135191

Package-Manager: portage-2.1.1_pre5-r2

5 files changed, 51 insertions, 5 deletions

diff --git a/net-print/xpp/ChangeLog b/net-print/xpp/ChangeLog
index e0b582556b69..022bbe8f8dbc 100644
--- a/net-print/xpp/ChangeLog
+++ b/net-print/xpp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/xpp
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/xpp/ChangeLog,v 1.16 2006/01/19 20:10:41 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/xpp/ChangeLog,v 1.17 2006/08/19 01:38:48 genstef Exp $
+
+  19 Aug 2006; Stefan Schweizer <genstef@gentoo.org> +files/xpp-gcc4.patch,
+  xpp-1.5.ebuild:
+  gcc4 patch thanks to nattfodd and Vasileios P. Lourdas <lourdas_v@yahoo.gr>
+  in bug 135191
 
   19 Jan 2006; Stefan Schweizer <genstef@gentoo.org> xpp-1.5.ebuild:
   modular deps
diff --git a/net-print/xpp/Manifest b/net-print/xpp/Manifest
index e71cd7c86465..751abbe877e4 100644
--- a/net-print/xpp/Manifest
+++ b/net-print/xpp/Manifest
@@ -1,6 +1,28 @@
-MD5 a7ed7dcc5d9c7e3b32e7175908401b47 ChangeLog 2354
+AUX cups.diff 1254 RMD160 9ea69ce980bc1734ecbfabb9ffb6561d742291f2 SHA1 f30caaf6bf822655070dbeed604ca5faae9aee11 SHA256 4f15d4d53af3b10f889a196503e6c013dc01f93662bd1958e46ef0d7b71a788f
 MD5 8d0b2e1426766ac3ae959549107569a6 files/cups.diff 1254
-MD5 51635db8c284ad110323e4243ee0bb81 files/digest-xpp-1.5 59
+RMD160 9ea69ce980bc1734ecbfabb9ffb6561d742291f2 files/cups.diff 1254
+SHA256 4f15d4d53af3b10f889a196503e6c013dc01f93662bd1958e46ef0d7b71a788f files/cups.diff 1254
+AUX inputslider.h.patch 622 RMD160 77f0ced592ddf6d77d806ffe1b8f87cd5339d47b SHA1 b823be889c91271012062e31cd1f55e895e407af SHA256 4a8babc92dc06d5aca33b4267c95b7e5cf5b83133a3d85744ce512836aa0dfd3
 MD5 0abfa945e442348aa10b77ee9ff60d48 files/inputslider.h.patch 622
+RMD160 77f0ced592ddf6d77d806ffe1b8f87cd5339d47b files/inputslider.h.patch 622
+SHA256 4a8babc92dc06d5aca33b4267c95b7e5cf5b83133a3d85744ce512836aa0dfd3 files/inputslider.h.patch 622
+AUX xpp-gcc4.patch 495 RMD160 8ec96cb332954380a3040915a6748311ad6c0d7c SHA1 ecf24161a4b276f7fc36e88610be5351bf06360d SHA256 0a3af70845f496e929537d2ebe011291e98d34b15bc90d6b09d9920e6ec06267
+MD5 1a3d665bf0595eb57719b3b481588723 files/xpp-gcc4.patch 495
+RMD160 8ec96cb332954380a3040915a6748311ad6c0d7c files/xpp-gcc4.patch 495
+SHA256 0a3af70845f496e929537d2ebe011291e98d34b15bc90d6b09d9920e6ec06267 files/xpp-gcc4.patch 495
+DIST xpp-1.5.tar.gz 107755 RMD160 a64ec4c93013d1db08a6c9b6705b43850c36c337 SHA1 7f3c1427979516e47402a0acb708eb83b68daa61 SHA256 4d5b0c5467b10ababa4304c2fabf3f8cc7b715cc6a6a4844dc735bd7678a845d
+EBUILD xpp-1.5.ebuild 963 RMD160 48e8c8dd53712c503393f344b307f248913301a0 SHA1 fde95ae32750a66217cb8f1d87b4d59d6c5ef859 SHA256 2328321c474db3ff1863682b99e63edad9982544d84c20ef8ef8cab7fc2de042
+MD5 1f629fa0c087f34448d4a7eff7148c17 xpp-1.5.ebuild 963
+RMD160 48e8c8dd53712c503393f344b307f248913301a0 xpp-1.5.ebuild 963
+SHA256 2328321c474db3ff1863682b99e63edad9982544d84c20ef8ef8cab7fc2de042 xpp-1.5.ebuild 963
+MISC ChangeLog 2543 RMD160 12a3308dc5e59717c93284b2f243264cd23f491c SHA1 f8b160ebbacc4078cdeb444c66b50871bd20e885 SHA256 19c371224b594c3abe3095aa9bd210842d26a303fb543848600f42ad7ef90125
+MD5 c9ead7dd946b67f1feab7ac628a3c28d ChangeLog 2543
+RMD160 12a3308dc5e59717c93284b2f243264cd23f491c ChangeLog 2543
+SHA256 19c371224b594c3abe3095aa9bd210842d26a303fb543848600f42ad7ef90125 ChangeLog 2543
+MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
-MD5 0b070aa4b68af6c68893c606fd3697d8 xpp-1.5.ebuild 888
+RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
+SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 metadata.xml 161
+MD5 75b7a84f102e8ee4de44ff3eb815cafa files/digest-xpp-1.5 223
+RMD160 9080ff70014d874895c505d02833732d643205fe files/digest-xpp-1.5 223
+SHA256 5c17adcf2be3708c1f28270b2f8204ebdf30ec360c1b118d9ab9118e8d47bec3 files/digest-xpp-1.5 223
diff --git a/net-print/xpp/files/digest-xpp-1.5 b/net-print/xpp/files/digest-xpp-1.5
index a93c1a1f3281..5ec2e3d5f682 100644
--- a/net-print/xpp/files/digest-xpp-1.5
+++ b/net-print/xpp/files/digest-xpp-1.5
@@ -1 +1,3 @@
 MD5 775fd69c464515da0c3295d04d0c747f xpp-1.5.tar.gz 107755
+RMD160 a64ec4c93013d1db08a6c9b6705b43850c36c337 xpp-1.5.tar.gz 107755
+SHA256 4d5b0c5467b10ababa4304c2fabf3f8cc7b715cc6a6a4844dc735bd7678a845d xpp-1.5.tar.gz 107755
diff --git a/net-print/xpp/files/xpp-gcc4.patch b/net-print/xpp/files/xpp-gcc4.patch
new file mode 100644
index 000000000000..619b2404c8b6
--- /dev/null
+++ b/net-print/xpp/files/xpp-gcc4.patch
@@ -0,0 +1,11 @@
+--- xpp-1.5/xpp.h.old	2006-06-12 22:11:28.000000000 +0200
++++ xpp-1.5/xpp.h	2006-06-12 22:11:36.000000000 +0200
+@@ -177,7 +177,7 @@
+    */
+ 
+   int /* O - index of the record of the given option in the array */
+-  printFiles::getSpecialOptionIndex(int *num_special_opts_in_arr,
++  getSpecialOptionIndex(int *num_special_opts_in_arr,
+ 				      /* number of options in the array */
+ 				      special_opt_t **special_opts_arr,
+                                       /* array of numerical/string 
diff --git a/net-print/xpp/xpp-1.5.ebuild b/net-print/xpp/xpp-1.5.ebuild
index ad9b8d5071f5..0e951309403a 100644
--- a/net-print/xpp/xpp-1.5.ebuild
+++ b/net-print/xpp/xpp-1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/xpp/xpp-1.5.ebuild,v 1.4 2006/01/19 20:10:41 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/xpp/xpp-1.5.ebuild,v 1.5 2006/08/19 01:38:48 genstef Exp $
 
 inherit eutils
 
@@ -26,6 +26,12 @@ DEPEND="virtual/libc
 		virtual/x11
 	)"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/xpp-gcc4.patch
+}
+
 src_compile() {
 	export CXX=g++
 	export LDFLAGS="-L/usr/lib/fltk-1.1 -lfltk"