merge of '538b8a92adf30fc2607a93bc9b05dd896bd35712'

     and '60b106c65d3e98f8aebfb8cdbf6947d4519b9798'

5 files changed, 66 insertions, 4 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index e84215286e..d376153cc3 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -2387,8 +2387,8 @@ md5=1977214a15a341a4fd8bad14eda76866
 sha256=a227f2d8a3b79462a895435be26c1622f03c5978d2e3e5456d6284592e88a6c2
 
 [http://downloads.sourceforge.net/ffmpeg/ffmpeg-0.4.9-pre1.tar.gz]
-md5=700b66230a8322493c032c04372b8d74
-sha256=4b60386e4b44f5dfa6fe490e804f89f3110609a48c7df721b8a419935d13346b
+md5=ea5587e3c66d50b1503b82ac4179c303
+sha256=0e9e771114a75c461e813538f129eb05a251b8fc6591a5563420700b8e312da0
 
 [http://downloads.sourceforge.net/flac/flac-1.1.0.tar.gz]
 md5=19b456a27b5fcf502c76cc33f33e1490
@@ -6683,8 +6683,8 @@ md5=2171f02d58a575e148436c7102686afb
 sha256=87ad1345e1d6df6ffdb1b43af92cfd87a16eade7de4060c5ce2fabd4d37bf99a
 
 [http://osdn.dl.sourceforge.jp/zaurus-ja/773/unismall-1.0.0.tar.gz]
-md5=479afb66be55db729b60eb6b78874e1d
-sha256=e4add51ac1f53fc36e550cd9b85ca6a93f40b642dce0d12a9aa00f43befc97d2
+md5=fb608934ab87ad5203aebb85c2d130c7
+sha256=9f60583875713e7d45797f25c321c1bb36f43afbbe3c4ab4fd1f58c157022eb6
 
 [http://oss.oracle.com/projects/libaio-oracle/dist/files/libaio-oracle-0.3.0.tar.gz]
 md5=165bbd6c75b8c1916e4b03988bafb372
diff --git a/packages/zten/.mtn2git_empty b/packages/zten/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/zten/.mtn2git_empty
diff --git a/packages/zten/files/.mtn2git_empty b/packages/zten/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/zten/files/.mtn2git_empty
diff --git a/packages/zten/files/zten.patch b/packages/zten/files/zten.patch
new file mode 100644
index 0000000000..22ba56951a
--- /dev/null
+++ b/packages/zten/files/zten.patch
@@ -0,0 +1,35 @@
+--- zten/zten.pro.orig	2003-02-16 16:45:44.000000000 +0100
++++ zten/zten.pro	2006-04-23 18:50:19.000000000 +0200
+@@ -1,11 +1,9 @@
+ TEMPLATE	= app
+ CONFIG		= qt warn_on release
+-HEADERS		= pixmap.h \
+-		  qbookbrowser.h \
++HEADERS		= qbookbrowser.h \
+ 		  qbookentry.h \
+ 		  qbookitem.h \
+ 		  qhistorylineedit.h \
+-		  qlabeledit.h \
+ 		  qlistboxrichtext.h \
+ 		  zpixmap.h \
+ 		  zten.h \
+@@ -29,5 +27,5 @@
+ 		  ztenbookbase.ui \
+ 		  ztencandidatebase.ui \
+ 		  ztenextbase.ui
+-LIBS += -lqpe /opt/Embedix/lib/libeb.a /opt/Embedix/lib/libz.a -L/opt/QtPalmtop/lib -lkakasi
++LIBS += -lqpe -leb -lz -lkakasi
+ TRANSLATIONS = zten.ts
+
+--- zten/qbookentry.cpp.orig 2006-04-23 23:38:00.000000000 +0200
++++ zten/qbookentry.cpp      2006-04-23 23:38:10.000000000 +0200
+@@ -14,7 +14,8 @@
+ }
+
+ static const char* INSERT_MARK = "\a";
+-QTextCodec* g_codec;
++//QTextCodec* g_codec = NULL;
++QTextCodec* g_codec = QTextCodec::codecForName("eucJP");
+ unsigned int last_wide_font = 0;
+ unsigned int last_narrow_font = 0;
+
diff --git a/packages/zten/zten_1.6.2.bb b/packages/zten/zten_1.6.2.bb
new file mode 100644
index 0000000000..1511341f0a
--- /dev/null
+++ b/packages/zten/zten_1.6.2.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "EB*/EPWING dictionary browser for Linux Zaurus"
+HOMEPAGE = "http://www.gohome.org/zten"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "eb kakasi"
+RDEPENDS = "virtual/japanese-font"
+RCONFLICTS = "ztenv"
+
+SRC_URI = "http://www.gohome.org/cgi-bin/viewcvs.cgi/zten.tar.gz;md5sum=d24f03c8df5c98d510590bd9a63dc9321 \
+           file://zten.patch;patch=1"
+
+S = "${WORKDIR}/zten"
+
+inherit palmtop
+
+CXXFLAGS += " -DQWS"
+
+do_install() {
+        install -d ${D}${palmtopdir}/bin
+        install -d ${D}${palmtopdir}/apps/Applications
+        install -d ${D}${palmtopdir}/pics
+        install -m 0755 zten ${D}${palmtopdir}/bin/zten
+	install -m 0644 zten.desktop ${D}${palmtopdir}/apps/Applications/
+	install -m 0644 Zten.png ${D}${palmtopdir}/pics
+}
+