From: Tom Rini <tom_rini@mentor.com>
Date: Wed, 16 Mar 2011 18:32:41 +0000 (-0700)
Subject: poboxserver: Rework unicode.patch
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ca7390508c8e0b6a5ded344f05e19fce4486585;p=openembedded.git

poboxserver: Rework unicode.patch

Signed-off-by: Tom Rini <tom_rini@mentor.com>
---

diff --git a/recipes/poboxserver/poboxserver/unicode.patch b/recipes/poboxserver/poboxserver/unicode.patch
index 884070a3c8..df6b08f2eb 100644
--- a/recipes/poboxserver/poboxserver/unicode.patch
+++ b/recipes/poboxserver/poboxserver/unicode.patch
@@ -1,7 +1,7 @@
-diff --git a/../pbserver/Makefile b/../pbserver/Makefile
+diff --git pbserver/Makefile pbserver/Makefile
 index 27847c1..d6ffff3 100755
---- a/../pbserver/Makefile
-+++ b/../pbserver/Makefile
+--- pbserver/Makefile
++++ pbserver/Makefile
 @@ -15,7 +15,7 @@ configure:
  dic:	staticdic learndic
  
diff --git a/recipes/poboxserver/poboxserver_1.2.5.bb b/recipes/poboxserver/poboxserver_1.2.5.bb
index ab732e4544..4ff581d95a 100644
--- a/recipes/poboxserver/poboxserver_1.2.5.bb
+++ b/recipes/poboxserver/poboxserver_1.2.5.bb
@@ -2,13 +2,13 @@ DESCRIPTION = "OpenPOBox is an open source implementation of a 'Predictive Opera
 SECTION = "inputmethods"
 LICENSE = "GPL"
 DEPENDS = "perl-native ruby-native nkf-native"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gakusei/pobox-${PV}.tar.bz2;name=archive \
            http://www.vanille.de/mirror/pbserver-${PV}.tar.gz;name=pbserver \
            file://OpenPOBox-1.25.diff \
            file://remove-local-includes.patch \
-           file://unicode.patch \
+           file://unicode.patch;apply=false \
            file://pbserver.sh"
 
 S = "${WORKDIR}/OpenPOBox"
@@ -21,6 +21,10 @@ INITSCRIPT_PARAMS = "start 99 5 . stop 01 0 ."
 EXTRA_OECONF = "--enable-lookup"
 PARALLEL_MAKE = ""
 
+do_configure_prepend() {
+	(cd ${WORKDIR} ; patch -p0 -i unicode.patch)
+}
+
 do_compile() {
 	oe_runmake
 	cp ${S}/dict/data/fugodic ${WORKDIR}/pbserver/fugodic.txt