Added patches to fix compilation errors with GCC 4.3.1.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.25-gentoo-r7 x86_64

6 files changed, 84 insertions, 6 deletions

diff --git a/kde-misc/krecipes/ChangeLog b/kde-misc/krecipes/ChangeLog
index a7cfece8ef66..11ed34340dfa 100644
--- a/kde-misc/krecipes/ChangeLog
+++ b/kde-misc/krecipes/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-misc/krecipes
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/krecipes/ChangeLog,v 1.30 2008/05/21 16:02:28 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/krecipes/ChangeLog,v 1.31 2008/09/09 17:39:27 keytoaster Exp $
+
+  09 Sep 2008; Tobias Heinlein <keytoaster@gentoo.org>
+  +files/krecipes-0.9.1-gcc431.patch,
+  +files/krecipes-1.0_beta1-gcc431.patch, krecipes-0.9.1.ebuild,
+  krecipes-1.0_beta1.ebuild:
+  Added patches to fix compilation errors with GCC 4.3.1.
 
   21 May 2008; Tiziano Müller <dev-zero@gentoo.org> krecipes-0.9.1.ebuild,
   krecipes-1.0_beta1.ebuild:
diff --git a/kde-misc/krecipes/Manifest b/kde-misc/krecipes/Manifest
index de8fdc6c818f..8367e35d0592 100644
--- a/kde-misc/krecipes/Manifest
+++ b/kde-misc/krecipes/Manifest
@@ -1,6 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX krecipes-0.9.1-gcc431.patch 1590 RMD160 c8c771a2cabbfdfb03e6af2bfdd0f49f51ce7fbd SHA1 d5fc71afde251957075fbecaa5dce80f44daaa47 SHA256 bafd352d99d97f5e69d969c8c4e22203c485c6fc7d66babfa6cf6372148c1015
+AUX krecipes-1.0_beta1-gcc431.patch 2155 RMD160 68b251e6f38770dc6d776d3eec537c64da64dd0d SHA1 9f754d59498cdffa3982e08709a76ba773174745 SHA256 6dc1babf0a79b8771565163ea866fef1808d42e9ca2beea3d33c2465c4505705
 DIST krecipes-0.9.1.tar.gz 7791658 RMD160 9235c5cfa812bdc60c6b8c74256474bc1b7b164a SHA1 f657d5ffabb33da26082ca3d41be188fa9ae0fda SHA256 6efdb751f26ab2460d84c39be25042d0bea013becf8c6b1a5ae2a5c46998a0f3
 DIST krecipes-1.0-beta1.tar.gz 8682447 RMD160 c32732255bbf530932fa3183581be72e12e7a2d2 SHA1 c1274f035476778d9b3f85bc007752ba0af841e3 SHA256 ce18e6e309547a1d845706da5beb426bae4b22b683ebd12d5eba2b40a50b423d
-EBUILD krecipes-0.9.1.ebuild 849 RMD160 8aab9a4e7128108fba3afee2f7c936e38d5efca2 SHA1 4a7a2f26fd264b11c7660e68d6f4dbfff166e042 SHA256 13d8dd2c14d6b3372d94aa73f6e14fe5af3840daddf355c18a4b7703e0539274
-EBUILD krecipes-1.0_beta1.ebuild 916 RMD160 7d095c3c54a2da2cee066466f298459bae319ed6 SHA1 8931bb2da25ad954d68b59fd0ef047aacdbc8a4a SHA256 2f25984529e41df3cd605fecc7a57c0ab556d51f5ad4881036fbbd9a1167640e
-MISC ChangeLog 4352 RMD160 bda10e0d377e41f03acb3d0461574e745cdc50f6 SHA1 e3fe8659a0303fc2de02910357eeda7b75384ea1 SHA256 3261d4166d18bf05538e5b4e092b8206bed853bf7651a802e08748a0e83135b4
+EBUILD krecipes-0.9.1.ebuild 896 RMD160 b19c2563032fdf6b9b36ebfe131adc73d4a7c4f7 SHA1 451065bc057574fc05299289402bf5c6502b7f54 SHA256 19b11b3d5a4c22bbbe68580adbdd796d1a7d4567980dfaecbb2868bf9fe532a2
+EBUILD krecipes-1.0_beta1.ebuild 963 RMD160 122ce6ee85eb1249eaf374c72e4b7b8189a68645 SHA1 bae5faeea5188055c65352deb72793bf974e1f90 SHA256 4a9e0062c72726e0026af2cc5d5e4557aec4bbdf6b2453cef6d1fa0f703e090d
+MISC ChangeLog 4600 RMD160 988bbbd35abad22a70ea1cce9556db4a40d3edae SHA1 3a6a92c697bf909fc6e2ec669987148c4fde035e SHA256 fdb705bdf9172f457c0e85c10c3473d58012803167b267d5384075722686b586
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjGtNkACgkQt3UOBHx+2m+Y7wCeK31hvnTe5lxL6yIscS02Vg0g
+XYYAniVCDcMy9ktJpnzv84G66oDnuWAj
+=eRlC
+-----END PGP SIGNATURE-----
diff --git a/kde-misc/krecipes/files/krecipes-0.9.1-gcc431.patch b/kde-misc/krecipes/files/krecipes-0.9.1-gcc431.patch
new file mode 100755
index 000000000000..36f8f0297f85
--- /dev/null
+++ b/kde-misc/krecipes/files/krecipes-0.9.1-gcc431.patch
@@ -0,0 +1,24 @@
+diff -ur krecipes-0.9.1.orig/krecipes/src/importers/kreimporter.h krecipes-0.9.1/krecipes/src/importers/kreimporter.h
+--- krecipes-0.9.1.orig/krecipes/src/importers/kreimporter.h	2005-12-03 22:33:56.000000000 +0100
++++ krecipes-0.9.1/krecipes/src/importers/kreimporter.h	2008-09-09 19:18:49.000000000 +0200
+@@ -46,7 +46,7 @@
+ 	void readCategoryStructure( const QDomNodeList& l, CategoryTree *tree );
+ 	void readDescription( const QDomNodeList& l, Recipe* );
+ 	void readIngredients( const QDomNodeList& l, Recipe*, const QString &header = QString::null );
+-	void readAmount( const QDomElement& amount, double &amount, double &amount_offset );
++	void readAmount( const QDomElement& amountEl, double &amount, double &amount_offset );
+ 	void readRatings( const QDomNodeList&, Recipe * );
+ 	void readCriterion( const QDomNodeList&, RatingCriteriaList &r );
+ };
+diff -ur krecipes-0.9.1.orig/krecipes/src/importers/recipemlimporter.h krecipes-0.9.1/krecipes/src/importers/recipemlimporter.h
+--- krecipes-0.9.1.orig/krecipes/src/importers/recipemlimporter.h	2005-12-03 22:33:56.000000000 +0100
++++ krecipes-0.9.1/krecipes/src/importers/recipemlimporter.h	2008-09-09 19:21:49.000000000 +0200
+@@ -45,7 +45,7 @@
+ 	void readRecipemlRecipe( const QDomElement& recipe );
+ 	void readRecipemlPreptime( const QDomElement &preptime );
+ 	void readRecipemlQty( const QDomElement &qty, Ingredient &ing );
+-	void readRecipemlRange( const QDomElement& range, double &range, double &range_offset );
++	void readRecipemlRange( const QDomElement& range, double &amount, double &range_offset );
+ 
+ 	Recipe recipe;
+ };
diff --git a/kde-misc/krecipes/files/krecipes-1.0_beta1-gcc431.patch b/kde-misc/krecipes/files/krecipes-1.0_beta1-gcc431.patch
new file mode 100644
index 000000000000..ad10b5ce8e0c
--- /dev/null
+++ b/kde-misc/krecipes/files/krecipes-1.0_beta1-gcc431.patch
@@ -0,0 +1,32 @@
+diff -ur krecipes-1.0-beta1.orig/krecipes/src/importers/kreimporter.h krecipes-1.0-beta1/krecipes/src/importers/kreimporter.h
+--- krecipes-1.0-beta1.orig/krecipes/src/importers/kreimporter.h	2006-09-02 03:52:17.000000000 +0200
++++ krecipes-1.0-beta1/krecipes/src/importers/kreimporter.h	2008-09-09 18:58:33.000000000 +0200
+@@ -46,7 +46,7 @@
+ 	void readCategoryStructure( const QDomNodeList& l, CategoryTree *tree );
+ 	void readDescription( const QDomNodeList& l, Recipe* );
+ 	void readIngredients( const QDomNodeList& l, Recipe*, const QString &header = QString::null, Ingredient *ing = 0 );
+-	void readAmount( const QDomElement& amount, double &amount, double &amount_offset );
++	void readAmount( const QDomElement& amountEl, double &amount, double &amount_offset );
+ 	void readRatings( const QDomNodeList&, Recipe * );
+ 	void readCriterion( const QDomNodeList&, RatingCriteriaList &r );
+ };
+diff -ur krecipes-1.0-beta1.orig/krecipes/src/importers/recipemlimporter.h krecipes-1.0-beta1/krecipes/src/importers/recipemlimporter.h
+--- krecipes-1.0-beta1.orig/krecipes/src/importers/recipemlimporter.h	2006-09-02 03:52:17.000000000 +0200
++++ krecipes-1.0-beta1/krecipes/src/importers/recipemlimporter.h	2008-09-09 19:01:45.000000000 +0200
+@@ -38,14 +38,14 @@
+ private:
+ 	void readRecipemlDirections( const QDomElement& dirs );
+ 	void readRecipemlHead( const QDomElement& head );
+-	void readRecipemlIng( const QDomElement& ing, Ingredient *ing = 0, const QString &header = QString::null );
++	void readRecipemlIng( const QDomElement& ing, Ingredient *ing_parent = 0, const QString &header = QString::null );
+ 	void readRecipemlIngs( const QDomElement& ings );
+ 	void readRecipemlMenu( const QDomElement& menu );
+ 	void readRecipemlSrcItems( const QDomElement& sources );
+ 	void readRecipemlRecipe( const QDomElement& recipe );
+ 	void readRecipemlPreptime( const QDomElement &preptime );
+ 	void readRecipemlQty( const QDomElement &qty, Ingredient &ing );
+-	void readRecipemlRange( const QDomElement& range, double &range, double &range_offset );
++	void readRecipemlRange( const QDomElement& range, double &amount, double &range_offset );
+ 
+ 	Recipe recipe;
+ };
diff --git a/kde-misc/krecipes/krecipes-0.9.1.ebuild b/kde-misc/krecipes/krecipes-0.9.1.ebuild
index 3df8a80e2326..2f0c25cef1bc 100644
--- a/kde-misc/krecipes/krecipes-0.9.1.ebuild
+++ b/kde-misc/krecipes/krecipes-0.9.1.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/kde-misc/krecipes/krecipes-0.9.1.ebuild,v 1.8 2008/05/21 16:02:28 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/krecipes/krecipes-0.9.1.ebuild,v 1.9 2008/09/09 17:39:27 keytoaster Exp $
 
 inherit kde
 
@@ -21,6 +21,8 @@ RDEPEND="${DEPEND}
 
 need-kde 3
 
+PATCHES=( "${FILESDIR}/${P}-gcc431.patch" )
+
 src_compile() {
 	if ! use sqlite && ! use mysql && ! use postgres; then
 		myconf="--with-sqlite"
diff --git a/kde-misc/krecipes/krecipes-1.0_beta1.ebuild b/kde-misc/krecipes/krecipes-1.0_beta1.ebuild
index 8591f964454d..c501cee8cdb5 100644
--- a/kde-misc/krecipes/krecipes-1.0_beta1.ebuild
+++ b/kde-misc/krecipes/krecipes-1.0_beta1.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/kde-misc/krecipes/krecipes-1.0_beta1.ebuild,v 1.5 2008/05/21 16:02:28 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/krecipes/krecipes-1.0_beta1.ebuild,v 1.6 2008/09/09 17:39:27 keytoaster Exp $
 
 inherit kde
 
@@ -25,6 +25,8 @@ RESTRICT="test"
 
 need-kde 3
 
+PATCHES=( "${FILESDIR}/${P}-gcc431.patch" )
+
 src_compile() {
 	if ! use sqlite && ! use mysql && ! use postgres; then
 		myconf="--with-sqlite"