merge of 236d70d96b3f9300bb6e751a5d3f3ea13f9a04db

     and f4984d1bec6ce4b4b676ecf827227e24bfb4eab1

9 files changed, 351 insertions, 0 deletions

diff --git a/packages/nunome/.mtn2git_empty b/packages/nunome/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/nunome/.mtn2git_empty
diff --git a/packages/nunome/files/.mtn2git_empty b/packages/nunome/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/nunome/files/.mtn2git_empty
diff --git a/packages/nunome/files/nunome.patch b/packages/nunome/files/nunome.patch
new file mode 100644
index 0000000000..450e16041c
--- /dev/null
+++ b/packages/nunome/files/nunome.patch
@@ -0,0 +1,197 @@
+# Signed off by Michael 'Mickey' Lauer <mickey@Vanille.de>
+--- nunome/dicman/nnmDicman.cpp~nunome.patch
++++ nunome/dicman/nnmDicman.cpp
+@@ -1,75 +1,4 @@
+-/* 
+-   $Id: nnmDicman.cpp,v 1.1.1.1 2005/06/29 22:24:22 leggewie Exp $
+-
+-   Copyright (C) 2001-2002 AXE,Inc. <sg@axe-inc.co.jp>
+-
+-   This file is part of Nunome-Qtopia.
+-
+-   Nunome-Qtopia is free software; you can redistribute it and/or modify it
+-   under the terms of the GNU General Public License as published by
+-   the Free Software Foundation; either version 2, or (at your option)
+-   any later version.
+-
+-   Nunome-Qtopia is distributed in the hope that it will be useful, but
+-   WITHOUT ANY WARRANTY; without even the implied warranty of
+-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-   GNU General Public License for more details.
+-
+-   You should have received a copy of the GNU General Public License
+-   along with Nunome; see the file COPYING.   If not, write to
+-   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+-
+-/* Dictinary maintenance tool */
+-
+-#include	<qpeapplication.h>
+-#include	<qlabel.h>
+-#include	<qpainter.h>
+-#include	<qpixmap.h>
+-#include	<qwidget.h>
+-#include	<qlayout.h>
+-#include	<qpushbutton.h>
+-#include	<qlineedit.h>
+-
+-#include	<stdio.h>
+-#include	<stdlib.h>
+-#include	<unistd.h>
+-#include	<sys/types.h>
+-#include	<signal.h>
+-
+-extern "C" {
+-#include	"Nnm.h"
+-#include	"NnmFeature.h"
+-#include	"nnmStub.h"
+-#include	"NnmProto.h"
+-}
+-#include	"nnmCanvas.h"
+-
+-class uiWidget : public QWidget
+-{
+-Q_OBJECT
+-
+-public:
+-	uiWidget( QWidget *parent = 0, const char *name = 0, WFlags f=0 );
+-
+-	int		serverPID;
+-	char		*dictionaryPath;
+-
+-private slots:
+-	void	regist( void );
+-	void	clear( void );
+-	void	quit( void );
+-
+-	void	format( const QString & );
+-
+-private:
+-	nnmCanvas	*canvas;
+-	QLineEdit	*input;
+-	ulong		code;
+-
+-	void		updateDictionary( void );
+-};
+-
+-#include	"moc_nnmDicman.cpp"
++#include "nnmDicman.h"
+ 
+ uiWidget::uiWidget( QWidget *parent, const char *name, WFlags f )
+ 			: QWidget( parent, name, f )
+--- nunome/ui/nunome.cpp~nunome.patch
++++ nunome/ui/nunome.cpp
+@@ -22,7 +22,7 @@
+ 
+ /* Nunome input-method */
+ 
+-#include	<qpeapplication.h>
++#include	<qpe/qpeapplication.h>
+ #include	<qpainter.h>
+ #include	<qpixmap.h>
+ #include	<qwidget.h>
+--- nunome/ui/nunome.h~nunome.patch
++++ nunome/ui/nunome.h
+@@ -32,14 +32,14 @@
+ #include	"nnmSelect.h"
+ #include	"nnmSymbol.h"
+ 
+-#define	PARAMETER_FILE_PATH		"/usr/local/share/nunome/.nunome"
++#define	PARAMETER_FILE_PATH		"/opt/QtPalmtop/share/nunome/.nunome"
+ 
+-#define	DEFAULT_SYSTEM_DICTIONARY	"/usr/local/share/nunome/nunome_uni.dic"
+-#define	DEFAULT_USER_DICTIONARY		"/usr/local/share/nunome/user.dic"
++#define	DEFAULT_SYSTEM_DICTIONARY	"/opt/QtPalmtop/share/nunome/nunome_uni.dic"
++#define	DEFAULT_USER_DICTIONARY		"/opt/QtPalmtop/share/nunome/user.dic"
+ #define	DEFAULT_TIMEOUT_MSEC		500
+ #define	DEFAULT_LEARN_FLAG		true
+-#define	DEFAULT_SERVER_PROGRAM_PATH	"/usr/local/share/nunome/nnmsrv"
+-#define	DEFAULT_LEARN_PROGRAM_PATH	"/usr/local/share/nunome/nnmDicman"
++#define	DEFAULT_SERVER_PROGRAM_PATH	"/opt/QtPalmtop/bin/nnmsrv"
++#define	DEFAULT_LEARN_PROGRAM_PATH	"/opt/QtPalmtop/bin/nnmDicman"
+ 
+ class	nnmParameter
+ {
+--- nunome/ui/nunomeImpl.h~nunome.patch
++++ nunome/ui/nunomeImpl.h
+@@ -23,7 +23,7 @@
+ #ifndef	NUNOMEIMPL_H
+ #define	NUNOMEIMPL_H
+ 
+-#include	<inputmethodinterface.h>
++#include	<qpe/inputmethodinterface.h>
+ 
+ class	Nunome;
+ class	QPixmap;
+--- /dev/null
++++ nunome/dicman/nnmDicman.h
+@@ -0,0 +1,70 @@
++/* 
++   $Id: nnmDicman.cpp,v 1.1.1.1 2005/06/29 22:24:22 leggewie Exp $
++
++   Copyright (C) 2001-2002 AXE,Inc. <sg@axe-inc.co.jp>
++
++   This file is part of Nunome-Qtopia.
++
++   Nunome-Qtopia is free software; you can redistribute it and/or modify it
++   under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 2, or (at your option)
++   any later version.
++
++   Nunome-Qtopia is distributed in the hope that it will be useful, but
++   WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with Nunome; see the file COPYING.   If not, write to
++   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
++
++/* Dictinary maintenance tool */
++
++#include	<qpe/qpeapplication.h>
++#include	<qlabel.h>
++#include	<qpainter.h>
++#include	<qpixmap.h>
++#include	<qwidget.h>
++#include	<qlayout.h>
++#include	<qpushbutton.h>
++#include	<qlineedit.h>
++
++#include	<stdio.h>
++#include	<stdlib.h>
++#include	<unistd.h>
++#include	<sys/types.h>
++#include	<signal.h>
++
++extern "C" {
++#include	"Nnm.h"
++#include	"NnmFeature.h"
++#include	"nnmStub.h"
++#include	"NnmProto.h"
++}
++#include	"nnmCanvas.h"
++
++class uiWidget : public QWidget
++{
++Q_OBJECT
++
++public:
++	uiWidget( QWidget *parent = 0, const char *name = 0, WFlags f=0 );
++
++	int		serverPID;
++	char		*dictionaryPath;
++
++private slots:
++	void	regist( void );
++	void	clear( void );
++	void	quit( void );
++
++	void	format( const QString & );
++
++private:
++	nnmCanvas	*canvas;
++	QLineEdit	*input;
++	ulong		code;
++
++	void		updateDictionary( void );
++};
diff --git a/packages/nunome/nunome_1.0.1.bb b/packages/nunome/nunome_1.0.1.bb
new file mode 100644
index 0000000000..51ab8cee83
--- /dev/null
+++ b/packages/nunome/nunome_1.0.1.bb
@@ -0,0 +1,40 @@
+DESCRIPTION = "Japanese input method plugin"
+SECTION = "opie/inputmethods"
+PRIORITY = "optional"
+LICENSE = "GPL"
+HOMEPAGE = "http://www.sikigami.com/nunome-Qtopia-1.0/"
+RDEPENDS = "font-ttf-japanese"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gakusei/nunome-Qtopia-src-cleaned.tar.bz2 \
+	file://nunome.patch;patch=1"
+S = "${WORKDIR}/nunome"
+
+inherit opie
+
+EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${S}/Nnmlib INCLUDEPATH+=${S}/ui LIBS+=-L${S}"
+PARALLEL_MAKE = ""
+
+do_configure_prepend() {
+	echo -e "TEMPLATE=subdirs\nSUBDIRS=Nnmlib server ui dicman ui" >nunome.pro
+	pushd Nnmlib && qmake -project -t lib && popd
+	pushd server && qmake -project && echo -e "LIBS+=-lNnmlib\nTARGET=server.bin" >> server.pro && popd
+	pushd dicman && qmake -project && echo -e "LIBS+=-lnunome -lNnmlib\nTARGET=dicman.bin" >> dicman.pro && popd
+	pushd ui && qmake -project -t lib && echo -e "LIBS+=-lNnmlib\nTARGET=nunome" >> ui.pro && popd
+	find . -name "moc*"|xargs rm -f
+	find . -name "Makefile"|xargs rm -f
+}
+
+do_install() {
+	install -d ${D}${palmtopdir}/lib
+	install -d ${D}${palmtopdir}/bin
+	install -d ${D}${palmtopdir}/i18n/ja
+	install -d ${D}${palmtopdir}/share/nunome
+
+	oe_libinstall -so libNnmlib ${D}${palmtopdir}/lib
+        install -m 644 nunome_uni.dic  		${D}${palmtopdir}/share/nunome
+        install -m 755 server/nnmsrv        	${D}${palmtopdir}/bin
+        install -m 755 dicman/nnmDicman		${D}${palmtopdir}/bin
+        install -m 644 ui/nunome.qm		${D}${palmtopdir}/i18n/ja
+        install -m 644 dicman/nnmDicman.qm  	${D}${palmtopdir}/i18n/ja
+}
diff --git a/packages/uim/.mtn2git_empty b/packages/uim/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/uim/.mtn2git_empty
diff --git a/packages/uim/files/.mtn2git_empty b/packages/uim/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/uim/files/.mtn2git_empty
diff --git a/packages/uim/files/uim-module-manager.patch b/packages/uim/files/uim-module-manager.patch
new file mode 100644
index 0000000000..8569bf39ef
--- /dev/null
+++ b/packages/uim/files/uim-module-manager.patch
@@ -0,0 +1,11 @@
+--- uim-1.1.0/scm/Makefile.am~	2006-06-09 10:46:12.000000000 +0900
++++ uim-1.1.0/scm/Makefile.am	2006-06-19 23:00:15.620000000 +0900
+@@ -58,7 +58,7 @@
+   module_names += "scim"
+ endif
+ 
+-UIM_MODULE_MANAGER = $(top_builddir)/uim/uim-module-manager
++UIM_MODULE_MANAGER = uim-module-manager
+ UIM_MODULE_MANAGER_ENV = \
+         LIBUIM_SCM_FILES=$(abs_srcdir) \
+         LIBUIM_PLUGIN_LIB_DIR=$(abs_top_builddir)/uim/.libs
diff --git a/packages/uim/uim-native_1.1.0.bb b/packages/uim/uim-native_1.1.0.bb
new file mode 100644
index 0000000000..04c6868bed
--- /dev/null
+++ b/packages/uim/uim-native_1.1.0.bb
@@ -0,0 +1,5 @@
+require uim_${PV}.bb
+DEPENDS = "anthy-native"
+inherit native
+
+SRC_URI = "http://uim.freedesktop.org/releases/uim-${PV}.tar.gz"
diff --git a/packages/uim/uim_1.1.0.bb b/packages/uim/uim_1.1.0.bb
new file mode 100644
index 0000000000..4877e2d86d
--- /dev/null
+++ b/packages/uim/uim_1.1.0.bb
@@ -0,0 +1,98 @@
+DESCRIPTION = "A multilingual user input method library"
+HOMEPAGE = "http://uim.freedesktop.org/"
+LICENSE = "GPL"
+DEPENDS = "uim-native"
+SECTION = "libs/inputmethod"
+PR = "r0"
+
+SRC_URI = "http://uim.freedesktop.org/releases/uim-${PV}.tar.gz \
+	   file://uim-module-manager.patch;patch=1"
+
+S = "${WORKDIR}/uim-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+	autotools_stage_all
+}
+
+#pkg_postinst_${PN} () {
+#	ldconfig
+#	gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+#}
+
+PACKAGES = "uim-xim uim-utils uim-skk uim-qt uim-prime uim-m17nlib uim-gtk2.0 uim-fep uim-el uim-common \
+            uim-canna uim-applet-gnome uim-anthy libuim0 libuim-dbg libuim-dev"
+
+DESCRIPTION_uim = "A Japanese input method (backend, dictionary and utility)"
+DESCRIPTION_libuim0 = "uim runtime library"
+DESCRIPTION_libuim-dev = "uim static library, headers and documents for developers"
+
+LEAD_SONAME = "libuim.so.1"
+RDEPENDS_uim = "libuim0"
+
+FILES_libuim-dev = "${libdir}/libuim*.a \
+                    ${libdir}/libuim*.la \
+                    ${libdir}/libuim*.so \
+                    ${includedir}/uim \
+                    ${libdir}/pkgconfig/uim.pc"
+
+FILES_libuim0-dbg = "${libdir}/debug"
+
+
+FILES_libuim0 = "${libdir}/uim/plugin/libuim-custom-enabler.* \
+                 ${libdir}/libuim-custom.so.* \
+#                 ${datadir}/locale/ja/LC_MESSAGES/uim.mo \
+#                 ${datadir}/locale/fr/LC_MESSAGES/uim.mo \
+#                 ${datadir}/locale/ko/LC_MESSAGES/uim.mo \
+                 ${libdir}/libuim.so.*"
+
+
+FILES_uim-anthy = "${libdir}/uim/plugin/libuim-anthy.* \
+                   ${datadir}/uim/anthy*.scm"
+
+FILES_uim-applet-gnome = "${libdir}/bonobo \
+                          ${libdir}/uim/uim-toolbar-applet \
+                          ${datadir}/applications/uim.desktop"
+
+FILES_uim-canna = "${libdir}/uim/plugin/libuim-canna.* \
+                   ${datadir}/uim/canna*.scm"
+
+FILES_uim-el = "${datadir}/emacs \
+                ${bindir}/uim-el-*"
+
+FILES_uim-fep = "${bindir}/uim-fep*"
+
+FILES_uim-gtk2.0 = "${libdir}/gtk-2.0 \
+                    ${bindir}/uim-toolbar-gtk* \
+                    ${bindir}/uim-*-gtk \
+                    ${bindir}/uim-input-pad-ja \
+                    ${datadir}/uim/helperdata/uim-dict-ui.xml"
+
+FILES_uim-m17nlib = "${libdir}/uim/plugin/libuim-m17nlib.* \
+                     ${datadir}/uim/m17nlib.scm"
+
+FILES_uim-prime = "${libdir}/uim/plugin/libuim-prime.* \
+                   ${datadir}/uim/prime*.scm"
+
+
+FILES_uim-qt = "${bindir}/uim-*-qt \
+                ${libdir}/uim/uim-candwin-qt \
+                ${libdir}/qt3/plugins/inputmethods \
+                ${datadir}/locale/ja/LC_MESSAGES/uim-chardict-qt.mo"
+
+FILES_uim-skk = "${libdir}/uim/plugin/libuim-skk.* \
+                 ${datadir}/uim/skk*.scm"
+
+
+FILES_uim-utils = "${bindir}/uim-sh \
+                   ${bindir}/uim-module-manager \
+		   ${libexecdir}/uim-helper-server"
+
+FILES_uim-xim = "${bindir}/uim-xim \
+                 ${libexecdir}/uim-candwin-gtk \
+                 ${datadir}/man/man1/uim-xim.1 \
+                 ${sysconfdir}/X11/xinit/xinput.d/uim*"
+
+FILES_uim-common = "${datadir}/uim/pixmaps/*.png \
+                    ${datadir}/uim"