diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2006-07-14 14:00:00 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-07-14 14:00:00 +0000 |
| commit | 90ec691068e8b36791f1590f4fa0da382f81094e (patch) | |
| tree | 0eed1aa8f1cfaf37c4fd5867d35585f498b64b65 | |
| parent | 4f7547e340e6157ebc8ac457ab275e03aed1460b (diff) | |
poboxserver 1.2.5 update and make it compile. patch based on Tota's and Laibsch's work as detailed in #1114
| -rw-r--r-- | packages/poboxserver/files/pbserver.sh | 38 | ||||
| -rw-r--r-- | packages/poboxserver/files/remove-local-includes.patch | 16 | ||||
| -rw-r--r-- | packages/poboxserver/poboxserver_1.2.5.bb | 9 |
3 files changed, 59 insertions, 4 deletions
diff --git a/packages/poboxserver/files/pbserver.sh b/packages/poboxserver/files/pbserver.sh new file mode 100644 index 0000000000..8e5a1bda26 --- /dev/null +++ b/packages/poboxserver/files/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 /opt/QtPalmtop/pobox; ./pbserver > /dev/null & + echo + sleep 1 + ;; + +stop) + echo -n "Stop pbserver" + killproc pbserver + echo + ;; + +esac + +exit 0 + diff --git a/packages/poboxserver/files/remove-local-includes.patch b/packages/poboxserver/files/remove-local-includes.patch new file mode 100644 index 0000000000..10f9d312d6 --- /dev/null +++ b/packages/poboxserver/files/remove-local-includes.patch @@ -0,0 +1,16 @@ + +# +# Signed off by Michael 'Mickey' Lauer <mickey@Vanille.de> +# + +--- 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/packages/poboxserver/poboxserver_1.2.5.bb b/packages/poboxserver/poboxserver_1.2.5.bb index 885f525929..7a8bd6f8b5 100644 --- a/packages/poboxserver/poboxserver_1.2.5.bb +++ b/packages/poboxserver/poboxserver_1.2.5.bb @@ -4,11 +4,11 @@ LICENSE = "GPL" DEPENDS = "perl-native ruby-native nkf-native" PR = "r2" -BROKEN = "1" - SRC_URI = "http://pitecan.com/OpenPOBox/dist/pobox-${PV}.tgz \ http://www.vanille.de/mirror/pbserver-${PV}.tar.gz \ - file://OpenPOBox-1.25.diff;patch=1" + file://OpenPOBox-1.25.diff;patch=1 \ + file://remove-local-includes.patch;patch=1 \ + file://pbserver.sh" S = "${WORKDIR}/OpenPOBox" inherit autotools update-rc.d @@ -25,6 +25,7 @@ do_compile() { oe_runmake cp ${S}/dict/data/fugodic ${WORKDIR}/pbserver/fugodic.txt oe_runmake -C ${WORKDIR}/pbserver dic + #patch -p1 } do_install() { @@ -33,5 +34,5 @@ do_install() { install -m 0644 ${WORKDIR}/pbserver/staticdic ${D}${palmtopdir}/pobox/ install -m 0644 ${WORKDIR}/pbserver/learndic ${D}${palmtopdir}/pobox/ install -d ${D}${sysconfdir}/init.d/ - install -m 0755 ${WORKDIR}/pbserver/pbserver.sh ${D}${sysconfdir}/init.d/pbserver + install -m 0755 ${WORKDIR}/pbserver.sh ${D}${sysconfdir}/init.d/pbserver } |