diff options
| author |   Tobias Heinlein <keytoaster@gentoo.org> | 2008-09-09 17:39:27 +0000 |
|---|---|---|
| committer | Tobias Heinlein <keytoaster@gentoo.org> | 2008-09-09 17:39:27 +0000 |
| commit | 560ed9a3dec5349004834e978d0fcf23c8a3b901 (patch) | |
| tree | 83c6756c759ef15a802d378150398a2bc0a5ed57 /kde-misc/krecipes/files | |
| parent | Add ~sparc keyword in preparation for Bug #237202. (diff) | |
| download | gentoo-2-560ed9a3dec5349004834e978d0fcf23c8a3b901.tar.gz gentoo-2-560ed9a3dec5349004834e978d0fcf23c8a3b901.tar.bz2 gentoo-2-560ed9a3dec5349004834e978d0fcf23c8a3b901.zip | |
Added patches to fix compilation errors with GCC 4.3.1.
(Portage version: 2.2_rc8/cvs/Linux 2.6.25-gentoo-r7 x86_64)
Diffstat (limited to 'kde-misc/krecipes/files')
| -rwxr-xr-x | kde-misc/krecipes/files/krecipes-0.9.1-gcc431.patch | 24 | ||||
| -rw-r--r-- | kde-misc/krecipes/files/krecipes-1.0_beta1-gcc431.patch | 32 |
2 files changed, 56 insertions, 0 deletions
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; + }; |