merge of '6532e26aa38ae6a2b6f815a67a5c317d6fe32c3f'

     and 'ceb628b9d1e93ba31a266b15bf06b5527054eaf3'

12 files changed, 108 insertions, 3 deletions

diff --git a/packages/e2fsprogs-libs/e2fsprogs-libs-1.39/.mtn2git_empty b/packages/e2fsprogs-libs/e2fsprogs-libs-1.39/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/e2fsprogs-libs/e2fsprogs-libs-1.39/.mtn2git_empty
diff --git a/packages/e2fsprogs-libs/e2fsprogs-libs-1.39/configure.patch b/packages/e2fsprogs-libs/e2fsprogs-libs-1.39/configure.patch
new file mode 100644
index 0000000000..1b31c0b305
--- /dev/null
+++ b/packages/e2fsprogs-libs/e2fsprogs-libs-1.39/configure.patch
@@ -0,0 +1,22 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- e2fsprogs-libs-1.33/./lib/uuid/configure.in~configure
++++ e2fsprogs-libs-1.33/./lib/uuid/configure.in
+@@ -2,9 +2,11 @@
+ dnl  Not used now, for the future when uuid is separated out into its 
+ dnl own package.
+ dnl
+-AC_INIT(gen_uuid.c)
+-AC_PREREQ(2.12)
++AC_INIT
++AC_CONFIG_SRCDIR([gen_uuid.c])
++AC_PREREQ(2.57)
+ 
+ AC_CHECK_HEADERS(stdlib.h unistd.h sys/sockio.h net/if.h netinet/in.h)
+ AC_CHECK_FUNCS(srandom)
+-AC_OUTPUT(Makefile)
++AC_CONFIG_FILES([Makefile])
++AC_OUTPUT
diff --git a/packages/e2fsprogs-libs/e2fsprogs-libs.inc b/packages/e2fsprogs-libs/e2fsprogs-libs.inc
index 03f9c8dc22..9efa6d1d70 100644
--- a/packages/e2fsprogs-libs/e2fsprogs-libs.inc
+++ b/packages/e2fsprogs-libs/e2fsprogs-libs.inc
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "optional"
 
-inherit autotools
+inherit autotools pkgconfig
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \
            file://configure.patch;patch=1 \
diff --git a/packages/e2fsprogs-libs/e2fsprogs-libs_1.39.bb b/packages/e2fsprogs-libs/e2fsprogs-libs_1.39.bb
new file mode 100644
index 0000000000..dfd83e3c1f
--- /dev/null
+++ b/packages/e2fsprogs-libs/e2fsprogs-libs_1.39.bb
@@ -0,0 +1,13 @@
+require e2fsprogs-libs.inc
+
+PR = "r1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \
+           file://configure.patch;patch=1"
+
+EXTRA_OECONF=" --enable-elf-shlibs "
+
+do_compile_prepend () {
+	find ./ -print|xargs chmod u=rwX
+	( cd util; ${BUILD_CC} subst.c -o subst )
+}
diff --git a/packages/gpephone/phoneserver/.mtn2git_empty b/packages/gpephone/phoneserver/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gpephone/phoneserver/.mtn2git_empty
diff --git a/packages/gpephone/phoneserver/changeport.patch b/packages/gpephone/phoneserver/changeport.patch
new file mode 100644
index 0000000000..fac4546d96
--- /dev/null
+++ b/packages/gpephone/phoneserver/changeport.patch
@@ -0,0 +1,11 @@
+--- config.h~	2007-02-07 10:43:57.000000000 +0100
++++ config.h	2007-02-07 10:43:57.000000000 +0100
+@@ -22,7 +22,7 @@
+ /* serial port name */
+ #ifndef SERIAL_PORT
+ //#define SERIAL_PORT "/dev/pts/0"        //ttyS1"
+-#define SERIAL_PORT "/dev/ttyS1"        //ttyS1"
++#define SERIAL_PORT "/dev/ttyS0"        //ttyS1"
+ #endif                          /*  */
+ 
+ /* serial port baudrate */
diff --git a/packages/gpephone/phoneserver_1.0.bb b/packages/gpephone/phoneserver_1.0.bb
index fdde9d73f9..d9ee660cdb 100644
--- a/packages/gpephone/phoneserver_1.0.bb
+++ b/packages/gpephone/phoneserver_1.0.bb
@@ -2,10 +2,12 @@ LICENSE     = "LiPS"
 DESCRIPTION = "Phone services server"
 SECTION     = "gpe"
 PRIORITY    = "optional"
-PR          = "r0"
+PR          = "r1"
 
 DEPENDS = "dbus-glib glib-2.0  libmsgenabler libabenabler"
 
 GPE_TARBALL_SUFFIX= "bz2"
 inherit gpephone autotools
- 
+
+SRC_URI += "file://changeport.patch;patch=1;pnum=0"
+
diff --git a/packages/kanjipad/.mtn2git_empty b/packages/kanjipad/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/kanjipad/.mtn2git_empty
diff --git a/packages/kanjipad/files/.mtn2git_empty b/packages/kanjipad/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/kanjipad/files/.mtn2git_empty
diff --git a/packages/kanjipad/files/Makefile-kpengine-only.patch b/packages/kanjipad/files/Makefile-kpengine-only.patch
new file mode 100644
index 0000000000..5ea650e4e7
--- /dev/null
+++ b/packages/kanjipad/files/Makefile-kpengine-only.patch
@@ -0,0 +1,38 @@
+--- kanjipad-2.0.0.orig/Makefile	2002-08-25 21:00:54 +0200
++++ kanjipad-2.0.0/Makefile	2005-08-07 23:04:03 +0200
+@@ -5,7 +5,7 @@
+ GTKLIBS=$(shell pkg-config --libs gtk+-2.0)
+ GLIBLIBS=$(shell pkg-config --libs glib-2.0)
+ 
+-PREFIX=/usr/local
++PREFIX=/usr
+ DATADIR=$(PREFIX)/share
+ 
+ # location in which binaries are installed
+@@ -28,7 +28,7 @@
+ OBJS = kpengine.o scoring.o util.o
+ CFLAGS = $(OPTIMIZE) $(GTKINC) -DFOR_PILOT_COMPAT -DKP_LIBDIR=\"$(LIBDIR)\" -DBINDIR=\"$(BINDIR)\"
+ 
+-all: kpengine kanjipad jdata.dat
++all: kpengine jdata.dat
+ 
+ scoring.o: jstroke/scoring.c
+ 	$(CC) -c -o scoring.o $(CFLAGS) -Ijstroke jstroke/scoring.c
+@@ -45,9 +45,8 @@
+ jdata.dat: jstroke/strokedata.h conv_jdata.pl
+ 	perl conv_jdata.pl < jstroke/strokedata.h > jdata.dat
+ 
+-install: kanjipad kpengine jdata.dat
++install: kpengine jdata.dat
+ 	install -d $(DESTDIR)$(BINDIR)
+-	install -m 0755 kanjipad $(DESTDIR)$(BINDIR)/kanjipad
+ 	install -m 0755 kpengine $(DESTDIR)$(BINDIR)/kpengine
+ 	install -d $(DESTDIR)$(LIBDIR)
+ 	install -m 0644 jdata.dat $(DESTDIR)$(LIBDIR)/jdata.dat
+@@ -75,4 +74,4 @@
+ 	cd .. &&				\
+ 	rm -rf $$distdir
+ 
+-.PHONY: dist distcheck
+\ No newline at end of file
++.PHONY: dist distcheck
diff --git a/packages/kanjipad/kanjipad.inc b/packages/kanjipad/kanjipad.inc
new file mode 100644
index 0000000000..aecd130b82
--- /dev/null
+++ b/packages/kanjipad/kanjipad.inc
@@ -0,0 +1,9 @@
+DESCRIPTION = "Hand-writing recognition for Japanese Kanji characters (no kana)"
+AUTHOR = "Owen Taylor <otaylor@fishsoup.net>"
+HOMEPAGE = "http://fishsoup.net/software/kanjipad/"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+SRC_URI="http://fishsoup.net/software/kanjipad/kanjipad-2.0.0.tar.gz"
+
+inherit autotools pkgconfig
diff --git a/packages/kanjipad/kpengine_0.1.bb b/packages/kanjipad/kpengine_0.1.bb
new file mode 100644
index 0000000000..0fa32faf13
--- /dev/null
+++ b/packages/kanjipad/kpengine_0.1.bb
@@ -0,0 +1,10 @@
+require kanjipad.inc
+
+SECTION = "libs"
+
+SRC_URI += "file://Makefile-kpengine-only.patch;patch=1"
+
+FILES = "${bindir}/kpengine ${datadir}"
+
+# would it be better to make this a part of kanjipad bb?
+S = ${WORKDIR}/kanjipad-2.0.0/