[oe-commits] Michal Hrusecky : opie-sheet: fix compilation failure due to two function arguments with
git version control
git at git.openembedded.org
Sat May 30 13:16:04 UTC 2009
Module: openembedded.git
Branch: org.openembedded.dev
Commit: e57d048f0895b369144de0b2f626964fb1e8e998
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=e57d048f0895b369144de0b2f626964fb1e8e998
Author: Michal Hrusecky <Michal at Hrusecky.net>
Date: Sat May 30 14:08:14 2009 +0100
opie-sheet: fix compilation failure due to two function arguments with
the same name.
Signed-off-by: Michal Hrusecky <Michal at Hrusecky.net>
---
.../opie-sheet/different-arg-names.patch | 11 +++++++++++
recipes/opie-sheet/opie-sheet_1.2.4.bb | 4 +++-
2 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/recipes/opie-sheet/opie-sheet/different-arg-names.patch b/recipes/opie-sheet/opie-sheet/different-arg-names.patch
new file mode 100644
index 0000000..a86aa9e
--- /dev/null
+++ b/recipes/opie-sheet/opie-sheet/different-arg-names.patch
@@ -0,0 +1,11 @@
+--- opie-sheet/sheet.h 2009-05-25 07:47:12.042719009 +0200
++++ opie-sheet/sheet.h 2009-05-25 08:07:19.291516199 +0200
+@@ -209,7 +207,7 @@
+ void insertRows(int no=1, bool allColumns=TRUE);
+ void insertColumns(int no=1, bool allRows=TRUE);
+
+- void dataFindReplace(const QString &find, const QString &replace, bool matchCase=TRUE, bool allCells=TRUE, bool entireCell=FALSE, bool replace=FALSE, bool replaceAll=FALSE);
++ void dataFindReplace(const QString &find, const QString &replacestr, bool matchCase=TRUE, bool allCells=TRUE, bool entireCell=FALSE, bool replace=FALSE, bool replaceAll=FALSE);
+
+ // Static functions
+ static int getHeaderColumn(const QString §ion);
diff --git a/recipes/opie-sheet/opie-sheet_1.2.4.bb b/recipes/opie-sheet/opie-sheet_1.2.4.bb
index ca0cdaf..b2cd1d2 100644
--- a/recipes/opie-sheet/opie-sheet_1.2.4.bb
+++ b/recipes/opie-sheet/opie-sheet_1.2.4.bb
@@ -1,6 +1,8 @@
require ${PN}.inc
+PR = "r1"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/opie-sheet \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
- ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+ file://different-arg-names.patch;patch=1 "
More information about the Openembedded-commits
mailing list