diff options
| author | Koen Kooi <koen@openembedded.org> | 2009-05-30 16:44:00 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-05-30 16:44:00 +0200 |
| commit | 83b88a7f144cceb0eb49710206d7172c586efe3c (patch) | |
| tree | d558b37691697eb019e3d03b5829f68b1b425b32 | |
| parent | 160eecd3e4e6bf0f18a4798f33a48f3d9d632cf1 (diff) | |
| parent | 7804ab589a8fc9e4085012caf854f3398dc85608 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev
| -rw-r--r-- | recipes/justreader/files/correct-settings-path.patch | 1 | ||||
| -rw-r--r-- | recipes/opie-sheet/opie-sheet/different-arg-names.patch | 11 | ||||
| -rw-r--r-- | recipes/opie-sheet/opie-sheet_1.2.4.bb | 4 | ||||
| -rw-r--r-- | recipes/zuc/zuc/fixed-include.patch | 11 | ||||
| -rw-r--r-- | recipes/zuc/zuc_1.1.2ern.bb | 6 |
5 files changed, 30 insertions, 3 deletions
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 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 §ion); 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 " 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 |