qpobox/poboxserver: some unfinished changes

* moved qpobox stuff into poboxserver directory, they belong together
* tried to move the combo to unicode with polyonymous' help
  -> unfinished

10 files changed, 17 insertions, 3 deletions

diff --git a/packages/poboxserver/files/.mtn2git_empty b/packages/poboxserver/poboxserver/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/poboxserver/files/.mtn2git_empty
+++ b/packages/poboxserver/poboxserver/.mtn2git_empty
diff --git a/packages/poboxserver/files/OpenPOBox-1.25.diff b/packages/poboxserver/poboxserver/OpenPOBox-1.25.diff
index d3add6d79c..d3add6d79c 100644
--- a/packages/poboxserver/files/OpenPOBox-1.25.diff
+++ b/packages/poboxserver/poboxserver/OpenPOBox-1.25.diff
diff --git a/packages/poboxserver/files/pbserver.sh b/packages/poboxserver/poboxserver/pbserver.sh
index 8e5a1bda26..8e5a1bda26 100644
--- a/packages/poboxserver/files/pbserver.sh
+++ b/packages/poboxserver/poboxserver/pbserver.sh
diff --git a/packages/poboxserver/files/remove-local-includes.patch b/packages/poboxserver/poboxserver/remove-local-includes.patch
index 10f9d312d6..10f9d312d6 100644
--- a/packages/poboxserver/files/remove-local-includes.patch
+++ b/packages/poboxserver/poboxserver/remove-local-includes.patch
diff --git a/packages/poboxserver/poboxserver/unicode.patch b/packages/poboxserver/poboxserver/unicode.patch
new file mode 100644
index 0000000000..884070a3c8
--- /dev/null
+++ b/packages/poboxserver/poboxserver/unicode.patch
@@ -0,0 +1,13 @@
+diff --git a/../pbserver/Makefile b/../pbserver/Makefile
+index 27847c1..d6ffff3 100755
+--- a/../pbserver/Makefile
++++ b/../pbserver/Makefile
+@@ -15,7 +15,7 @@ configure:
+ dic:	staticdic learndic
+ 
+ staticdic:	fugodic.txt
+-	nkf -e $< | ruby dicfilter.rb | sort |uniq > $@
++	nkf -w $< | ruby dicfilter.rb | sort |uniq > $@
+ 
+ learndic:
+ 	touch $@
diff --git a/packages/poboxserver/poboxserver_1.2.5.bb b/packages/poboxserver/poboxserver_1.2.5.bb
index e582ce0ccf..b7e2ed7179 100644
--- a/packages/poboxserver/poboxserver_1.2.5.bb
+++ b/packages/poboxserver/poboxserver_1.2.5.bb
@@ -2,12 +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 = "r3"
+PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gakusei/pobox-${PV}.tar.bz2 \
            http://www.vanille.de/mirror/pbserver-${PV}.tar.gz \
            file://OpenPOBox-1.25.diff;patch=1 \
            file://remove-local-includes.patch;patch=1 \
+           file://unicode.patch;patch=1 \
            file://pbserver.sh"
 S = "${WORKDIR}/OpenPOBox"
 
diff --git a/packages/qpobox/files/.mtn2git_empty b/packages/poboxserver/qpobox/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/qpobox/files/.mtn2git_empty
+++ b/packages/poboxserver/qpobox/.mtn2git_empty
diff --git a/packages/qpobox/files/qpobox-0.5.4-opie.patch b/packages/poboxserver/qpobox/qpobox-0.5.4-opie.patch
index 91b9db712a..91b9db712a 100644
--- a/packages/qpobox/files/qpobox-0.5.4-opie.patch
+++ b/packages/poboxserver/qpobox/qpobox-0.5.4-opie.patch
diff --git a/packages/qpobox/files/qpobox.patch b/packages/poboxserver/qpobox/qpobox.patch
index eb2549ecb6..9ed8f6c6b0 100644
--- a/packages/qpobox/files/qpobox.patch
+++ b/packages/poboxserver/qpobox/qpobox.patch
@@ -7,7 +7,7 @@ diff -Naur qpobox.orig/pbclient.cpp qpobox/pbclient.cpp
    m_sock = new QSocket(this);
 -  m_conv = QTextCodec::codecForName("EUC-JP");
 +  //m_conv = QTextCodec::codecForName("EUC-JP");
-+  m_conv = QTextCodec::codecForName("eucJP");
++  m_conv = QTextCodec::codecForName("utf8");
  
    connect(m_sock, SIGNAL(readyRead()), this, SLOT(socketReadyRead()));
    connect(m_sock, SIGNAL(error(int)), this, SLOT(socketError(int)));
diff --git a/packages/qpobox/qpobox_0.5.4.bb b/packages/poboxserver/qpobox_0.5.4.bb
index 002522afa3..9bb8c34523 100644
--- a/packages/qpobox/qpobox_0.5.4.bb
+++ b/packages/poboxserver/qpobox_0.5.4.bb
@@ -3,7 +3,7 @@ SECTION = "opie/inputmethods"
 RDEPENDS = "poboxserver virtual/japanese-font"
 LICENSE = "GPL"
 HOMEPAGE = "http://takahr.dhis.portside.net/cgi-bin/rwiki.cgi?cmd=view;name=QPOBox"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://www.vanille.de/mirror/qpobox-${PV}.tar.gz \
            file://qpobox-0.5.4-opie.patch;patch=1 \