From e57d048f0895b369144de0b2f626964fb1e8e998 Mon Sep 17 00:00:00 2001
From: Michal Hrusecky <Michal@Hrusecky.net>
Date: Sat, 30 May 2009 14:08:14 +0100
Subject: opie-sheet: fix compilation failure due to two function arguments
 with the same name.

Signed-off-by: Michal Hrusecky <Michal@Hrusecky.net>
---
 recipes/opie-sheet/opie-sheet/different-arg-names.patch | 11 +++++++++++
 recipes/opie-sheet/opie-sheet_1.2.4.bb                  |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 recipes/opie-sheet/opie-sheet/different-arg-names.patch

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 0000000000..a86aa9edd3
--- /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 &section);
diff --git a/recipes/opie-sheet/opie-sheet_1.2.4.bb b/recipes/opie-sheet/opie-sheet_1.2.4.bb
index ca0cdaff5a..b2cd1d213d 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 "
-- 
cgit v1.2.3


From 02b2c0ff18a1135e82200f5d6834a6b04606e82e Mon Sep 17 00:00:00 2001
From: Michal Hrusecky <Michal@Hrusecky.net>
Date: Sat, 30 May 2009 14:14:54 +0100
Subject: zuc: corrected iostream include to fix compilation

Signed-off-by: Michal Hrusecky <Michal@Hrusecky.net>
---
 recipes/zuc/zuc/fixed-include.patch | 11 +++++++++++
 recipes/zuc/zuc_1.1.2ern.bb         |  6 ++++--
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 recipes/zuc/zuc/fixed-include.patch

diff --git a/recipes/zuc/zuc/fixed-include.patch b/recipes/zuc/zuc/fixed-include.patch
new file mode 100644
index 0000000000..fc4b80967a
--- /dev/null
+++ b/recipes/zuc/zuc/fixed-include.patch
@@ -0,0 +1,11 @@
+--- a/conv_matrix.cpp  2003-01-27 21:18:45.000000000 +0100
++++ b/conv_matrix.cpp  2009-05-30 00:57:23.311764092 +0200
+@@ -27,7 +27,7 @@
+ #include <qmap.h>
+ #include <qcombobox.h>
+ #include <qpopupmenu.h>
+-#include <iostream.h>
++#include <iostream>
+ #include <stdlib.h>
+ 
+ 
diff --git a/recipes/zuc/zuc_1.1.2ern.bb b/recipes/zuc/zuc_1.1.2ern.bb
index 32c8f9848d..67a1aca4c5 100644
--- a/recipes/zuc/zuc_1.1.2ern.bb
+++ b/recipes/zuc/zuc_1.1.2ern.bb
@@ -5,10 +5,12 @@ LICENSE = "GPL"
 APPTYPE = "binary"
 APPNAME = "zuc"
 APPDESKTOP = "${S}"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://www.linux-solutions.at/projects/zaurus/source/zuc_V${PV}.tar.gz \
-           http://nick.kreucher.net/zuc/zuc_units"
+           http://nick.kreucher.net/zuc/zuc_units \
+           file://fixed-include.patch;patch=1"
+
 S = "${WORKDIR}/zuc_V${PV}"
 
 inherit opie
-- 
cgit v1.2.3


From 7804ab589a8fc9e4085012caf854f3398dc85608 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Sat, 30 May 2009 23:07:01 +0900
Subject: justreader: document that correct-settings-path.patch has been sent
 upstream

---
 recipes/justreader/files/correct-settings-path.patch | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes/justreader/files/correct-settings-path.patch b/recipes/justreader/files/correct-settings-path.patch
index e33bf37620..695edc1828 100644
--- a/recipes/justreader/files/correct-settings-path.patch
+++ b/recipes/justreader/files/correct-settings-path.patch
@@ -1,3 +1,4 @@
+upstream: http://sf.net/tracker/?func=detail&aid=1115394&group_id=61928&atid=498857
 
 #
 # Patch managed by http://www.holgerschurig.de/patcher.html
-- 
cgit v1.2.3