[oe-commits] org.oe.dev qpobox/poboxserver: some unfinished changes

[Laibsch commit]

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

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: 5076ed26abde44cf0e9a27bb249bb0829b19ea16
ViewMTN: http://monotone.openembedded.org/revision.psp?id=5076ed26abde44cf0e9a27bb249bb0829b19ea16
Files:
1
packages/poboxserver/files
packages/poboxserver/poboxserver
packages/qpobox/files
packages/poboxserver/qpobox
packages/qpobox/qpobox_0.5.4.bb
packages/poboxserver/qpobox_0.5.4.bb
packages/poboxserver/poboxserver/unicode.patch
packages/poboxserver/poboxserver_1.2.5.bb
packages/poboxserver/qpobox/qpobox.patch
Diffs:

#
# mt diff -rf60008d7bc62036b2f56fac511571e1bd12c4215 -r5076ed26abde44cf0e9a27bb249bb0829b19ea16
#
# 
# 
# rename "packages/poboxserver/files"
#     to "packages/poboxserver/poboxserver"
# 
# rename "packages/qpobox/files"
#     to "packages/poboxserver/qpobox"
# 
# rename "packages/qpobox/qpobox_0.5.4.bb"
#     to "packages/poboxserver/qpobox_0.5.4.bb"
# 
# add_file "packages/poboxserver/poboxserver/unicode.patch"
#  content [7f323ac2677c568f6358758159c5af87cc7b164a]
# 
# patch "packages/poboxserver/poboxserver_1.2.5.bb"
#  from [fa0a00a9963ed7e31d8b07503167d1f346232916]
#    to [d925483441f68c4853def54a3bc59a6bf06a469d]
# 
# patch "packages/poboxserver/qpobox/qpobox.patch"
#  from [6fbc09707c184157faebe70323315908e4f24198]
#    to [24f1adb38c092d18533ce4c4ee7150431d4d0cf5]
# 
# patch "packages/poboxserver/qpobox_0.5.4.bb"
#  from [2f7e995ab1c917f0a3f56b07200841944d298189]
#    to [fb5453143a6fd43792021ce0a7d09a14184f8c38]
# 
============================================================
--- packages/poboxserver/poboxserver/unicode.patch	7f323ac2677c568f6358758159c5af87cc7b164a
+++ packages/poboxserver/poboxserver/unicode.patch	7f323ac2677c568f6358758159c5af87cc7b164a
@@ -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 $@
============================================================
--- packages/poboxserver/poboxserver_1.2.5.bb	fa0a00a9963ed7e31d8b07503167d1f346232916
+++ packages/poboxserver/poboxserver_1.2.5.bb	d925483441f68c4853def54a3bc59a6bf06a469d
@@ -1,13 +1,14 @@ DEPENDS = "perl-native ruby-native nkf-n
 DESCRIPTION = "OpenPOBox is an open source implementation of a 'Predictive Operation Based On eXample'"
 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"
 
============================================================
--- packages/poboxserver/qpobox/qpobox.patch	6fbc09707c184157faebe70323315908e4f24198
+++ packages/poboxserver/qpobox/qpobox.patch	24f1adb38c092d18533ce4c4ee7150431d4d0cf5
@@ -7,7 +7,7 @@ diff -Naur qpobox.orig/pbclient.cpp qpob
    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)));
============================================================
--- packages/qpobox/qpobox_0.5.4.bb	2f7e995ab1c917f0a3f56b07200841944d298189
+++ packages/poboxserver/qpobox_0.5.4.bb	fb5453143a6fd43792021ce0a7d09a14184f8c38
@@ -1,9 +1,9 @@ HOMEPAGE = "http://takahr.dhis.portside.
 DESCRIPTION = "A japanese inputmethod for Qt/Embedded based palmtop environments."
 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 \