| 1 |
keytoaster 08/09/09 17:39:28 |
| 2 |
|
| 3 |
Added: krecipes-1.0_beta1-gcc431.patch |
| 4 |
krecipes-0.9.1-gcc431.patch |
| 5 |
Log: |
| 6 |
Added patches to fix compilation errors with GCC 4.3.1. |
| 7 |
(Portage version: 2.2_rc8/cvs/Linux 2.6.25-gentoo-r7 x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 kde-misc/krecipes/files/krecipes-1.0_beta1-gcc431.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-misc/krecipes/files/krecipes-1.0_beta1-gcc431.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-misc/krecipes/files/krecipes-1.0_beta1-gcc431.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: krecipes-1.0_beta1-gcc431.patch |
| 16 |
=================================================================== |
| 17 |
diff -ur krecipes-1.0-beta1.orig/krecipes/src/importers/kreimporter.h krecipes-1.0-beta1/krecipes/src/importers/kreimporter.h |
| 18 |
--- krecipes-1.0-beta1.orig/krecipes/src/importers/kreimporter.h 2006-09-02 03:52:17.000000000 +0200 |
| 19 |
+++ krecipes-1.0-beta1/krecipes/src/importers/kreimporter.h 2008-09-09 18:58:33.000000000 +0200 |
| 20 |
@@ -46,7 +46,7 @@ |
| 21 |
void readCategoryStructure( const QDomNodeList& l, CategoryTree *tree ); |
| 22 |
void readDescription( const QDomNodeList& l, Recipe* ); |
| 23 |
void readIngredients( const QDomNodeList& l, Recipe*, const QString &header = QString::null, Ingredient *ing = 0 ); |
| 24 |
- void readAmount( const QDomElement& amount, double &amount, double &amount_offset ); |
| 25 |
+ void readAmount( const QDomElement& amountEl, double &amount, double &amount_offset ); |
| 26 |
void readRatings( const QDomNodeList&, Recipe * ); |
| 27 |
void readCriterion( const QDomNodeList&, RatingCriteriaList &r ); |
| 28 |
}; |
| 29 |
diff -ur krecipes-1.0-beta1.orig/krecipes/src/importers/recipemlimporter.h krecipes-1.0-beta1/krecipes/src/importers/recipemlimporter.h |
| 30 |
--- krecipes-1.0-beta1.orig/krecipes/src/importers/recipemlimporter.h 2006-09-02 03:52:17.000000000 +0200 |
| 31 |
+++ krecipes-1.0-beta1/krecipes/src/importers/recipemlimporter.h 2008-09-09 19:01:45.000000000 +0200 |
| 32 |
@@ -38,14 +38,14 @@ |
| 33 |
private: |
| 34 |
void readRecipemlDirections( const QDomElement& dirs ); |
| 35 |
void readRecipemlHead( const QDomElement& head ); |
| 36 |
- void readRecipemlIng( const QDomElement& ing, Ingredient *ing = 0, const QString &header = QString::null ); |
| 37 |
+ void readRecipemlIng( const QDomElement& ing, Ingredient *ing_parent = 0, const QString &header = QString::null ); |
| 38 |
void readRecipemlIngs( const QDomElement& ings ); |
| 39 |
void readRecipemlMenu( const QDomElement& menu ); |
| 40 |
void readRecipemlSrcItems( const QDomElement& sources ); |
| 41 |
void readRecipemlRecipe( const QDomElement& recipe ); |
| 42 |
void readRecipemlPreptime( const QDomElement &preptime ); |
| 43 |
void readRecipemlQty( const QDomElement &qty, Ingredient &ing ); |
| 44 |
- void readRecipemlRange( const QDomElement& range, double &range, double &range_offset ); |
| 45 |
+ void readRecipemlRange( const QDomElement& range, double &amount, double &range_offset ); |
| 46 |
|
| 47 |
Recipe recipe; |
| 48 |
}; |
| 49 |
|
| 50 |
|
| 51 |
|
| 52 |
1.1 kde-misc/krecipes/files/krecipes-0.9.1-gcc431.patch |
| 53 |
|
| 54 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-misc/krecipes/files/krecipes-0.9.1-gcc431.patch?rev=1.1&view=markup |
| 55 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-misc/krecipes/files/krecipes-0.9.1-gcc431.patch?rev=1.1&content-type=text/plain |
| 56 |
|
| 57 |
Index: krecipes-0.9.1-gcc431.patch |
| 58 |
=================================================================== |
| 59 |
diff -ur krecipes-0.9.1.orig/krecipes/src/importers/kreimporter.h krecipes-0.9.1/krecipes/src/importers/kreimporter.h |
| 60 |
--- krecipes-0.9.1.orig/krecipes/src/importers/kreimporter.h 2005-12-03 22:33:56.000000000 +0100 |
| 61 |
+++ krecipes-0.9.1/krecipes/src/importers/kreimporter.h 2008-09-09 19:18:49.000000000 +0200 |
| 62 |
@@ -46,7 +46,7 @@ |
| 63 |
void readCategoryStructure( const QDomNodeList& l, CategoryTree *tree ); |
| 64 |
void readDescription( const QDomNodeList& l, Recipe* ); |
| 65 |
void readIngredients( const QDomNodeList& l, Recipe*, const QString &header = QString::null ); |
| 66 |
- void readAmount( const QDomElement& amount, double &amount, double &amount_offset ); |
| 67 |
+ void readAmount( const QDomElement& amountEl, double &amount, double &amount_offset ); |
| 68 |
void readRatings( const QDomNodeList&, Recipe * ); |
| 69 |
void readCriterion( const QDomNodeList&, RatingCriteriaList &r ); |
| 70 |
}; |
| 71 |
diff -ur krecipes-0.9.1.orig/krecipes/src/importers/recipemlimporter.h krecipes-0.9.1/krecipes/src/importers/recipemlimporter.h |
| 72 |
--- krecipes-0.9.1.orig/krecipes/src/importers/recipemlimporter.h 2005-12-03 22:33:56.000000000 +0100 |
| 73 |
+++ krecipes-0.9.1/krecipes/src/importers/recipemlimporter.h 2008-09-09 19:21:49.000000000 +0200 |
| 74 |
@@ -45,7 +45,7 @@ |
| 75 |
void readRecipemlRecipe( const QDomElement& recipe ); |
| 76 |
void readRecipemlPreptime( const QDomElement &preptime ); |
| 77 |
void readRecipemlQty( const QDomElement &qty, Ingredient &ing ); |
| 78 |
- void readRecipemlRange( const QDomElement& range, double &range, double &range_offset ); |
| 79 |
+ void readRecipemlRange( const QDomElement& range, double &amount, double &range_offset ); |
| 80 |
|
| 81 |
Recipe recipe; |
| 82 |
}; |
Archives