From: Michael Krelin <hacker@klever.net>
Date: Sat, 28 Jul 2007 10:42:11 +0000 (+0000)
Subject: opie-reader: unicode patch went upstream. Close #2694
X-Git-Tag: Release-2010-05/1~8868^2~66^2~34
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da2c653f899b4fcc10e2aeda1f7cb7a231f808ab;p=openembedded.git

opie-reader: unicode patch went upstream. Close #2694
---

diff --git a/packages/opie-reader/files/opie-reader-unicode-copy.patch b/packages/opie-reader/files/opie-reader-unicode-copy.patch
deleted file mode 100644
index d7d1ae24bd..0000000000
--- a/packages/opie-reader/files/opie-reader-unicode-copy.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- opie-reader/QTReaderApp.cpp.orig	2005-05-18 00:48:25.000000000 +0200
-+++ opie-reader/QTReaderApp.cpp	2006-04-08 15:55:43.000000000 +0200
-@@ -2558,7 +2558,7 @@
- 	reader->jumpto(m_savedpos);
- 	while (reader->explocate() < endpos && (ch = reader->getch()) != UEOF)
- 	{
--	    text += ch;
-+	    text += QChar(ch);
- 	}
- 	cb->setText(text);
- 	reader->locate(currentpos);
diff --git a/packages/opie-reader/opie-reader_1.2.3.bb b/packages/opie-reader/opie-reader_1.2.3.bb
index e1ec40d831..43632416c5 100644
--- a/packages/opie-reader/opie-reader_1.2.3.bb
+++ b/packages/opie-reader/opie-reader_1.2.3.bb
@@ -1,9 +1,8 @@
 require ${PN}.inc
 
-PR = r1
+PR = r2
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/opie-reader \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
-	   file://opie-reader-unicode-copy.patch;patch=1"
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
 
diff --git a/packages/opie-reader/opie-reader_cvs.bb b/packages/opie-reader/opie-reader_cvs.bb
index 82b3547ae1..36c8c06157 100644
--- a/packages/opie-reader/opie-reader_cvs.bb
+++ b/packages/opie-reader/opie-reader_cvs.bb
@@ -1,10 +1,9 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-PR = r1
+PR = r2
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/opie-reader \
            ${HANDHELDS_CVS};module=opie/pics \
-           ${HANDHELDS_CVS};module=opie/apps \
-	   file://opie-reader-unicode-copy.patch;patch=1"
+           ${HANDHELDS_CVS};module=opie/apps"