Added a patch for qt4, hopefully fixing bug #236435

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.23-gentoo-r9 x86_64

4 files changed, 54 insertions, 4 deletions

diff --git a/sci-visualization/hippodraw/ChangeLog b/sci-visualization/hippodraw/ChangeLog
index e1d0248cec35..5a8ebe95d89d 100644
--- a/sci-visualization/hippodraw/ChangeLog
+++ b/sci-visualization/hippodraw/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-visualization/hippodraw
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/ChangeLog,v 1.9 2008/08/29 09:44:30 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/ChangeLog,v 1.10 2008/09/03 15:57:08 bicatali Exp $
+
+  03 Sep 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/hippodraw-1.21.3-qt4.patch, hippodraw-1.21.3-r1.ebuild:
+  Added a patch for qt4, hopefully fixing bug #236435
 
   29 Aug 2008; Sébastien Fabbro <bicatali@gentoo.org>
   -hippodraw-1.19.1.ebuild, -hippodraw-1.21.3.ebuild:
diff --git a/sci-visualization/hippodraw/Manifest b/sci-visualization/hippodraw/Manifest
index e25ac3d4fd13..356321a675e0 100644
--- a/sci-visualization/hippodraw/Manifest
+++ b/sci-visualization/hippodraw/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX hippodraw-1.21.3-gcc4.3.patch 7310 RMD160 7fd794311627f762e476ba0e3cb0190600038e87 SHA1 35abf03f3d704891fa6d4bbf8bd9725045396eb3 SHA256 4945521437e9e8c211b743bcc4f5078629d35c1b56989734ecfbcd21c142d225
 AUX hippodraw-1.21.3-minuit2.patch 1922 RMD160 32c91e6648ba12292fa6e1d621e99a6e00d0b614 SHA1 dae13bc08a2990d27bcd1e8e0918c1de898e86ac SHA256 cf2d9d064e67a861b59c0f67fe2cfd57d660d481b9e5279eaad6624cc0f89366
 AUX hippodraw-1.21.3-numarray.patch 1162 RMD160 ab5e5a417ba5b0b7c214f7bea1c2641c91385531 SHA1 cf3d6edefe27934ffe11f52058a98885f1b81fb5 SHA256 b06eb6f33b7e080760d7e030942bd347bfd0ef8f78dbdb04e17ee21272b7d60f
+AUX hippodraw-1.21.3-qt4.patch 922 RMD160 e209a6f84b7f4f6801e84ff7fd2be9280e5d38fa SHA1 dceba968d390404d530182585b2ebd9f43707149 SHA256 9ced6a3607501d3ea93bd4e6e10ea66ef8c7092ff62638341ed1e7231f5c9184
 AUX hippodraw-1.21.3-test-fix.patch 539 RMD160 3658745e4f8e449e845031ff561c5753a9fc9cda SHA1 774a47f7a1085940c63de8e652eefdd06652ae22 SHA256 f523f9298ec5887973831d42fa1881d9f6ac3bbd7656ffdb448eb197bc093bc9
 AUX hippodraw-1.21.3-wcslib.patch 879 RMD160 d339517136249a0a5c56edeb69abe652c82a9b06 SHA1 b7dde32740a1395ea2400be999e3b03edfb628c6 SHA256 49444a17b22b4448944c9b3e419c1fecb5ab551790705a1ac75bf5cd2957b670
 DIST HippoDraw-1.21.3.tar.gz 9087353 RMD160 33ab867739feda0caef29da9160c3e410de5fc35 SHA1 6959c564c0c366260b5b7ad81cce6efd2d30846b SHA256 a649dd51b4316ba54fad03cb7b39035ecd2d0efeea0cbff1a17d4790f7df0e28
-EBUILD hippodraw-1.21.3-r1.ebuild 4228 RMD160 3b7074e68a55529af5f9ed1a7b68f5e19620ef60 SHA1 55011dd92d5d36abd262a969a16b5891192ce415 SHA256 70dea5306079b8aa0e2b50707858a0976dba8cdd25e567d6bc4a4b98146c389c
-MISC ChangeLog 2164 RMD160 9174400c257ed8142908401c912f96b504300947 SHA1 57908e7aac07c748a0d600e5a8a03ca8428cc205 SHA256 8dfb8bdb9afbb004e2048ee704efc8a53c32593a441458e1dbf807ccf9dbf4ea
+EBUILD hippodraw-1.21.3-r1.ebuild 4268 RMD160 2d7d0833a771baa5627abd14ba5c2290e07e9cd4 SHA1 a9ab53f61bf00230f8b7d7ee45e927fed38fb236 SHA256 794a378e660a559a2dd687d8c6fdfd786ecb6fee25df77baf520fb504f466209
+MISC ChangeLog 2340 RMD160 6aa929a0c03ab32433cfaeb44ac58d08a9acdc6e SHA1 6a72757aaa127c6d96c7ba4bbf2765fccc805215 SHA256 394530583cc1b9547b44622a2d8549566c333c153eaefe39e20c1f5adf07a381
 MISC metadata.xml 1670 RMD160 8dcfaa588e742cd7c806b2d89f5cdbb229ae785d SHA1 4b7c09771725382bb56d37f8833b49e9ee85ca4f SHA256 612109583191964b5558caaa1748e12761fc4d51c491f9f1bb79e27394bac67d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAki+tD0ACgkQ1ycZbhPLE2C4TwCgq6bys2dpQ6QOr0TeUxbhh23R
+nPwAoKhYz/b6EKU4mvcDHDck6JGG8uId
+=0i3t
+-----END PGP SIGNATURE-----
diff --git a/sci-visualization/hippodraw/files/hippodraw-1.21.3-qt4.patch b/sci-visualization/hippodraw/files/hippodraw-1.21.3-qt4.patch
new file mode 100644
index 000000000000..0225968b1bf0
--- /dev/null
+++ b/sci-visualization/hippodraw/files/hippodraw-1.21.3-qt4.patch
@@ -0,0 +1,34 @@
+--- qt/QtApp.cxx.orig	2008-09-03 16:49:04.000000000 +0100
++++ qt/QtApp.cxx	2008-09-03 16:50:32.000000000 +0100
+@@ -34,13 +34,13 @@
+ 
+ QtApp * QtApp::s_instance = 0;
+ 
+-QtApp::QtApp ( int argc, char** argv)
++QtApp::QtApp ( int & argc, char** argv)
+   : QApplication ( argc, argv )
+ {
+   init ();
+ }
+ 
+-QtApp::QtApp ( int argc, char** argv, bool gui )
++QtApp::QtApp ( int & argc, char** argv, bool gui )
+   : QApplication ( argc, argv, gui )
+ {
+   init ();
+--- qt/QtApp.h.orig	2008-09-03 16:49:50.000000000 +0100
++++ qt/QtApp.h	2008-09-03 16:50:17.000000000 +0100
+@@ -79,11 +79,11 @@
+ 
+   /** A Constructor that always enables the GUI.
+    */
+-  QtApp ( int argc,  char ** argv );
++  QtApp ( int & argc,  char ** argv );
+ 
+   /** A Constructor that enables the GUI optionally.
+    */
+-  QtApp ( int argc,  char ** argv, bool gui );
++  QtApp ( int & argc,  char ** argv, bool gui );
+ 
+   /** The destructor.  */
+   ~QtApp();
diff --git a/sci-visualization/hippodraw/hippodraw-1.21.3-r1.ebuild b/sci-visualization/hippodraw/hippodraw-1.21.3-r1.ebuild
index afbab5de6f87..b8fbc81f8d7c 100644
--- a/sci-visualization/hippodraw/hippodraw-1.21.3-r1.ebuild
+++ b/sci-visualization/hippodraw/hippodraw-1.21.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r1.ebuild,v 1.4 2008/07/27 22:25:40 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r1.ebuild,v 1.5 2008/09/03 15:57:08 bicatali Exp $
 
 EAPI=1
 
@@ -55,6 +55,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-test-fix.patch
 	epatch "${FILESDIR}"/${P}-minuit2.patch
 	epatch "${FILESDIR}"/${P}-wcslib.patch
+	epatch "${FILESDIR}"/${P}-qt4.patch
 
 	# fix the install doc directory to gentoo's one
 	local docdir=/usr/share/doc/${PF}