From 709c4d66e0b107ca606941b988bad717c0b45d9b Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Tue, 17 Mar 2009 14:32:59 -0400 Subject: rename packages/ to recipes/ per earlier agreement See links below for more details: http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326 http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816 Signed-off-by: Denys Dmytriyenko Acked-by: Mike Westerhof Acked-by: Philip Balister Acked-by: Khem Raj Acked-by: Marcin Juszkiewicz Acked-by: Koen Kooi Acked-by: Frans Meulenbroeks --- .../poboxserver/poboxserver/OpenPOBox-1.25.diff | 173 +++++++++++++++++++++ recipes/poboxserver/poboxserver/pbserver.sh | 38 +++++ .../poboxserver/remove-local-includes.patch | 16 ++ recipes/poboxserver/poboxserver/unicode.patch | 13 ++ 4 files changed, 240 insertions(+) create mode 100644 recipes/poboxserver/poboxserver/OpenPOBox-1.25.diff create mode 100644 recipes/poboxserver/poboxserver/pbserver.sh create mode 100644 recipes/poboxserver/poboxserver/remove-local-includes.patch create mode 100644 recipes/poboxserver/poboxserver/unicode.patch (limited to 'recipes/poboxserver/poboxserver') diff --git a/recipes/poboxserver/poboxserver/OpenPOBox-1.25.diff b/recipes/poboxserver/poboxserver/OpenPOBox-1.25.diff new file mode 100644 index 0000000000..d3add6d79c --- /dev/null +++ b/recipes/poboxserver/poboxserver/OpenPOBox-1.25.diff @@ -0,0 +1,173 @@ +diff -ur OpenPOBox.orig/asearch/Makefile OpenPOBox/asearch/Makefile +--- OpenPOBox.orig/asearch/Makefile 2001-07-23 16:18:15.000000000 +0900 ++++ OpenPOBox/asearch/Makefile 2003-06-14 17:52:12.668859200 +0900 +@@ -2,7 +2,6 @@ + # $Date: 2004/09/28 03:42:40 $ + # $Revision: 1.6 $ + # +-CC = gcc + CFLAGS = -Xcpluscomm + WTANGLE = perl ../wtangle/wtangle + +diff -ur OpenPOBox.orig/romakana/rklist OpenPOBox/romakana/rklist +--- OpenPOBox.orig/romakana/rklist 2001-07-23 23:29:06.000000000 +0900 ++++ OpenPOBox/romakana/rklist 2003-06-18 10:05:47.358003200 +0900 +@@ -127,7 +127,7 @@ + na ナ + ne ネ + ni ニ +-#nn ン ++nn ン + no ノ + nu ヌ + nya ニャ +diff -ur OpenPOBox.orig/server/Makefile.in OpenPOBox/server/Makefile.in +--- OpenPOBox.orig/server/Makefile.in 2002-02-19 09:37:10.000000000 +0900 ++++ OpenPOBox/server/Makefile.in 2003-06-14 17:52:12.678873600 +0900 +@@ -10,7 +10,6 @@ + # CFLAGS = -DUNIX @CFLAGS@ -Xcpluscomm \ + # -I../asearch -I../romakana -I../include -g + +-CC = gcc + CFLAGS = -DUNIX @CFLAGS@ \ + -I/usr/local/include -I/usr/local/lib/glib/include \ + -I@prefix@/include \ +diff -ur OpenPOBox.orig/server/pbserver.html OpenPOBox/server/pbserver.html +--- OpenPOBox.orig/server/pbserver.html 2002-02-19 09:37:10.000000000 +0900 ++++ OpenPOBox/server/pbserver.html 2003-06-18 10:20:24.779673600 +0900 +@@ -60,8 +60,8 @@ + + #define POBOXSERVERPORT 1178 + +-#define MAXCANDS 100 +-#define MAXWORDLEN 100 ++#define MAXCANDS 300 ++#define MAXWORDLEN 50 + unsigned char *cands[MAXCANDS],*candspat[MAXCANDS]; + + int process(int); +@@ -115,7 +115,7 @@ + + process(int sock) + { +- unsigned char buf[1000],combuf[BUFSIZE]; ++ unsigned char buf[8000],combuf[BUFSIZE]; + + unsigned char w[100],p[100]; + int i,n; +@@ -135,9 +135,11 @@ + pobox_usedict(NULL); // save all existing changes + return -1; // this makes the server's main routine disconnect + case '1': ++#if 0 // delete tolower + for(pat=combuf+1;*pat;pat++){ + if(isupper(*pat)) *pat = tolower(*pat); + } ++#endif + pat = combuf+1; + patlen = strlen(pat); + pobox_context(context[sock],strlen(context[sock])); +diff -ur OpenPOBox.orig/server/poboxlib.html OpenPOBox/server/poboxlib.html +--- OpenPOBox.orig/server/poboxlib.html 2002-02-19 09:37:10.000000000 +0900 ++++ OpenPOBox/server/poboxlib.html 2004-09-28 10:37:22.818192000 +0900 +@@ -557,7 +557,7 @@ + // + ///////////////////////////////////////////////////////////////// + +-#define MAXCANDS 40 ++#define MAXCANDS 300 + static UCHAR *cands[MAXCANDS]; + static UCHAR *candspat[MAXCANDS]; + static int ncands = 0; +@@ -603,7 +603,7 @@ + // + // $BC18l8!:w(B + // +-POBOX_INT pobox_search(UCHAR *pat) ++POBOX_INT pobox_search(UCHAR *orig_pat) + { + int i,j; + int m; +@@ -615,12 +615,18 @@ + UCHAR searchpat[1000]; + UCHAR kana[MAXWORDLEN]; + ++ UCHAR pat[100]; ++ + Dict *dict; + DicEntry de; + + if(pat == NULL || strlen(pat) > 100) + return 0; + ++ for (p = orig_pat, s = pat; *p; p++, s++) { ++ *s = tolower(*p); ++ } ++ *s = '\0'; + #ifndef USEGC + for(i=0;ipoboxdict->type == POBOXDICT_LOOKUP){ ++ // $B$"$$$^$$8!:w$O$H$j$"$($:J]N1(B ++ // $BAw$j2>L>8!:w(B ++printf("okurigana == pat=[%s]\n",pat); ++ strcpy(searchpat, pat); ++ while (ncands == 0 && !exact && *searchpat != '\0') { ++ int i, l; ++ ++printf("okurigana searchpat=[%s]\n",searchpat); ++ if(lookup_search(dict->lookup,searchpat)){ ++ char *line, *s; ++ UCHAR wordbuf[100]; ++ for(;(line = lookup_get_next_line(dict->lookup)) && ncands < MAXCANDS;){ ++ de.pat = line; ++ for(s = line;*s && *s != '\t';s++); ++ *s++ = '\0'; ++ if (strncmp(de.pat, searchpat, strlen(de.pat)) != 0) { ++ /* $BF~NO$,FI$_$G;O$^$C$F$$$J$$>l9g$O8uJd$+$i30$9(B */ ++ free(line); ++ continue; ++ } ++ ++ de.word = s; ++ for(;*s && *s != '\t' && *s != '\n' && *s != '\r';s++); ++ *s = '\0'; ++ strcpy(wordbuf, de.word); ++ Roma2Kana(pat+strlen(de.pat)-1,kana,rktable); ++ strcat(wordbuf,kana); ++ de.word = wordbuf; ++ ++ de.context = NULL; ++ addcand(&de); ++ free(line); ++printf("okurigana cand=[%s]\n",s); ++ } ++ } ++ // delete vowels ++ l = strlen(searchpat); ++ searchpat[l - 1] = '\0'; ++ for (i = l - 2; i >= 0 && !consonant(searchpat[i]); i--) { ++ searchpat[i] = '\0'; ++ } ++ } + } ++#endif ++ + } + + if(ncands+3 < MAXCANDS){ diff --git a/recipes/poboxserver/poboxserver/pbserver.sh b/recipes/poboxserver/poboxserver/pbserver.sh new file mode 100644 index 0000000000..e6067ed6ff --- /dev/null +++ b/recipes/poboxserver/poboxserver/pbserver.sh @@ -0,0 +1,38 @@ +#!/bin/sh + +killproc() +{ + pid=`/bin/ps -e x | + /bin/grep $1 | + /bin/grep -v grep | + /bin/sed -e 's/^ *//' -e 's/ .*//'` + [ "$pid" != "" ] && kill $pid +} + +usage() +{ + echo "Usage: $0 {start|stop}" +} + +if [ $# -lt 1 ] ; then usage ; exit ; fi + +case "$1" in +start) + echo -n "Start pbserver" + # make sure lo interface is configured (otherwise qpobox will not bind to pbserver) + ifconfig lo|grep 127.0.0.1 >/dev/null || ifconfig lo 127.0.0.1 + cd @palmtopdir@/pobox; ./pbserver > /dev/null & + echo + sleep 1 + ;; + +stop) + echo -n "Stop pbserver" + killproc pbserver + echo + ;; + +esac + +exit 0 + diff --git a/recipes/poboxserver/poboxserver/remove-local-includes.patch b/recipes/poboxserver/poboxserver/remove-local-includes.patch new file mode 100644 index 0000000000..10f9d312d6 --- /dev/null +++ b/recipes/poboxserver/poboxserver/remove-local-includes.patch @@ -0,0 +1,16 @@ + +# +# Signed off by Michael 'Mickey' Lauer +# + +--- OpenPOBox/server/Makefile.in~remove-local-includes ++++ OpenPOBox/server/Makefile.in +@@ -11,8 +11,6 @@ + # -I../asearch -I../romakana -I../include -g + + CFLAGS = -DUNIX @CFLAGS@ \ +- -I/usr/local/include -I/usr/local/lib/glib/include \ +- -I@prefix@/include \ + -I../asearch -I../romakana -I../include -g + + pbserver: pbserver.o server.o poboxlib.o romakana_he.o lookup.o diff --git a/recipes/poboxserver/poboxserver/unicode.patch b/recipes/poboxserver/poboxserver/unicode.patch new file mode 100644 index 0000000000..884070a3c8 --- /dev/null +++ b/recipes/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 $@ -- cgit 1.2.3-korg