Fix build with modern GCC

3 files changed, 37 insertions, 1 deletions

diff --git a/databases/krecipes/distinfo b/databases/krecipes/distinfo
index 852f2c59ac1..d6db246cf4f 100644
--- a/databases/krecipes/distinfo
+++ b/databases/krecipes/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.5 2007/07/31 12:02:45 joerg Exp $
+$NetBSD: distinfo,v 1.6 2011/11/24 14:15:41 joerg Exp $
 
 SHA1 (krecipes-1.0-beta1.tar.gz) = c1274f035476778d9b3f85bc007752ba0af841e3
 RMD160 (krecipes-1.0-beta1.tar.gz) = c32732255bbf530932fa3183581be72e12e7a2d2
 Size (krecipes-1.0-beta1.tar.gz) = 8682447 bytes
 SHA1 (patch-aa) = 073893dcf03798122eaa0161100d7b56e35e4715
+SHA1 (patch-krecipes_src_importers_kreimporter.h) = e875275b530ec7246d1276d67854506780586a80
+SHA1 (patch-krecipes_src_importers_recipemlimporter.h) = 004385da2f3104f5ea72a02fa866577a2e4d82ca
diff --git a/databases/krecipes/patches/patch-krecipes_src_importers_kreimporter.h b/databases/krecipes/patches/patch-krecipes_src_importers_kreimporter.h
new file mode 100644
index 00000000000..3f310e707c7
--- /dev/null
+++ b/databases/krecipes/patches/patch-krecipes_src_importers_kreimporter.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-krecipes_src_importers_kreimporter.h,v 1.1 2011/11/24 14:15:41 joerg Exp $
+
+--- krecipes/src/importers/kreimporter.h.orig	2011-11-24 00:04:33.000000000 +0000
++++ krecipes/src/importers/kreimporter.h
+@@ -46,7 +46,7 @@ private:
+ 	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& amount, double &amount2, double &amount_offset );
+ 	void readRatings( const QDomNodeList&, Recipe * );
+ 	void readCriterion( const QDomNodeList&, RatingCriteriaList &r );
+ };
diff --git a/databases/krecipes/patches/patch-krecipes_src_importers_recipemlimporter.h b/databases/krecipes/patches/patch-krecipes_src_importers_recipemlimporter.h
new file mode 100644
index 00000000000..f485b22f782
--- /dev/null
+++ b/databases/krecipes/patches/patch-krecipes_src_importers_recipemlimporter.h
@@ -0,0 +1,21 @@
+$NetBSD: patch-krecipes_src_importers_recipemlimporter.h,v 1.1 2011/11/24 14:15:41 joerg Exp $
+
+--- krecipes/src/importers/recipemlimporter.h.orig	2011-11-24 00:06:44.000000000 +0000
++++ krecipes/src/importers/recipemlimporter.h
+@@ -38,14 +38,14 @@ protected:
+ 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 *ing2 = 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 &range2, double &range_offset );
+ 
+ 	Recipe recipe;
+ };