From 4d1890d58cf6a5bf7fabd8d70d35482645247793 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Tue, 16 Jan 2007 03:01:25 +0000
Subject: uim: update to 1.3.1

---
 packages/uim/uim-native_1.2.1.bb |   3 -
 packages/uim/uim-native_1.3.1.bb |   3 +
 packages/uim/uim_1.2.1.bb        | 142 ---------------------------------------
 packages/uim/uim_1.3.1.bb        | 142 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 145 insertions(+), 145 deletions(-)
 delete mode 100644 packages/uim/uim-native_1.2.1.bb
 create mode 100644 packages/uim/uim-native_1.3.1.bb
 delete mode 100644 packages/uim/uim_1.2.1.bb
 create mode 100644 packages/uim/uim_1.3.1.bb

(limited to 'packages')

diff --git a/packages/uim/uim-native_1.2.1.bb b/packages/uim/uim-native_1.2.1.bb
deleted file mode 100644
index 5249ac6394..0000000000
--- a/packages/uim/uim-native_1.2.1.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require uim.inc
-DEPENDS = "gtk+ anthy intltool-native"
-inherit native autotools pkgconfig
diff --git a/packages/uim/uim-native_1.3.1.bb b/packages/uim/uim-native_1.3.1.bb
new file mode 100644
index 0000000000..5249ac6394
--- /dev/null
+++ b/packages/uim/uim-native_1.3.1.bb
@@ -0,0 +1,3 @@
+require uim.inc
+DEPENDS = "gtk+ anthy intltool-native"
+inherit native autotools pkgconfig
diff --git a/packages/uim/uim_1.2.1.bb b/packages/uim/uim_1.2.1.bb
deleted file mode 100644
index 5d82945df7..0000000000
--- a/packages/uim/uim_1.2.1.bb
+++ /dev/null
@@ -1,142 +0,0 @@
-require uim.inc
-DEPENDS = "gtk+ uim-native anthy fontconfig libxft xt glib-2.0 ncurses"
-
-SRC_URI += "file://uim-module-manager.patch;patch=1"
-
-S = "${WORKDIR}/uim-${PV}"
-
-do_stage() {
-	autotools_stage_all
-}
-
-inherit autotools pkgconfig
-
-PACKAGES = "uim-xim uim-utils uim-skk uim-gtk2.0 uim-fep uim-common uim-anthy libuim0 libuim-dev"
-
-LEAD_SONAME = "libuim.so.1"
-RDEPENDS_uim = "libuim0"
-
-DESCRIPTION_libuim-dev = "Development files for uim"
-FILES_libuim-dev = "${libdir}/libuim*.a \
-                    ${libdir}/libuim*.la \
-                    ${libdir}/libuim*.so \
-                    ${includedir}/uim \
-                    ${libdir}/pkgconfig/uim.pc"
-
-DESCRIPTION_libuim0 = "Simple and flexible input method collection and library"
-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.*"
-
-DESCRIPTION_uim-anthy = "Anthy plugin for uim"
-FILES_uim-anthy = "${libdir}/uim/plugin/libuim-anthy.* \
-                   ${datadir}/uim/anthy*.scm"
-
-pkg_postinst_uim-anthy() {
-#! /bin/sh
-set -e
-if [ -f /usr/bin/uim-module-manager ]; then
-	/usr/bin/uim-module-manager --register anthy --path /etc/uim
-fi
-}
-
-pkg_postrm_uim-anthy() {
-#! /bin/sh
-set -e
-if [ -f /usr/bin/uim-module-manager ]; then
-	/usr/bin/uim-module-manager --path /etc/uim --unregister anthy
-fi
-}
-
-pkg_prerm_uim-anthy() {
-#! /bin/sh
-set -e
-if [ -f /usr/bin/uim-module-manager ]; then
-	/usr/bin/uim-module-manager --register anthy --path /etc/uim
-fi
-}
-
-DESCRIPTION_uim-fep = "uim Front End Processor"
-FILES_uim-fep = "${bindir}/uim-fep*"
-
-DESCRIPTION_uim-gtk2.0  = "GTK+2.x immodule for uim"
-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"
-
-pkg_postinst_uim-gtk2.0() {
-#! /bin/sh
-set -e
-gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
-}
-
-#pkg_postrm_uim-gtk2.0() {
-##! /bin/sh
-#set -e
-#/usr/sbin/update-gtk-immodules
-#}
-
-DESCRIPTION_uim-skk = "SKK plugin for uim"
-FILES_uim-skk = "${libdir}/uim/plugin/libuim-skk.* \
-                 ${datadir}/uim/skk*.scm"
-
-pkg_postinst_uim-skk() {
-#! /bin/sh
-set -e
-if [ -f /usr/bin/uim-module-manager ]; then
-	/usr/bin/uim-module-manager --register skk --path /etc/uim
-fi
-}
-
-pkg_postrm_uim-skk() {
-#! /bin/sh
-set -e
-if [ -f /usr/bin/uim-module-manager ]; then
-	/usr/bin/uim-module-manager --path /etc/uim --unregister skk
-fi
-}
-
-DESCRIPTION_uim-utils = "Utilities for uim"
-FILES_uim-utils = "${bindir}/uim-sh \
-                   ${bindir}/uim-module-manager \
-		   ${libexecdir}/uim-helper-server"
-
-DESCRIPTION_uim-xim = "A bridge between uim and XIM"
-FILES_uim-xim = "${bindir}/uim-xim \
-                 ${libexecdir}/uim-candwin-gtk \
-                 ${datadir}/man/man1/uim-xim.1 \
-                 ${sysconfdir}/X11/xinit/xinput.d/uim*"
-
-# to .xinitrc, or .xsession
-#pkg_postinst_uim-xim() {
-#GTK_IM_MODULE=uim ; export GTK_IM_MODULE
-#QT_IM_MODULE=uim ; export QT_IM_MODULE
-#uim-xim &
-#XMODIFIERS=@im=uim ; export XMODIFIERS
-#}
-
-DESCRIPTION_uim-common = "Common files for uim"
-FILES_uim-common = "${datadir}/uim/pixmaps/*.png \
-                    ${datadir}/uim"
-pkg_postinst_uim-common() {
-#! /bin/sh
-set -e
-if [ -f /usr/bin/uim-module-manager ]; then
-	/usr/bin/uim-module-manager --path /etc/uim --register \
-		tutcode tcode hangul viqr ipa-x-sampa latin byeoru
-fi
-}
-
-pkg_prerm_uim-common() {
-#! /bin/sh
-set -e
-if [ -f /usr/bin/uim-module-manager ]; then
-	/usr/bin/uim-module-manager --path /etc/uim --register \
-		tutcode tcode hangul viqr ipa-x-sampa latin byeoru
-fi
-}
diff --git a/packages/uim/uim_1.3.1.bb b/packages/uim/uim_1.3.1.bb
new file mode 100644
index 0000000000..5d82945df7
--- /dev/null
+++ b/packages/uim/uim_1.3.1.bb
@@ -0,0 +1,142 @@
+require uim.inc
+DEPENDS = "gtk+ uim-native anthy fontconfig libxft xt glib-2.0 ncurses"
+
+SRC_URI += "file://uim-module-manager.patch;patch=1"
+
+S = "${WORKDIR}/uim-${PV}"
+
+do_stage() {
+	autotools_stage_all
+}
+
+inherit autotools pkgconfig
+
+PACKAGES = "uim-xim uim-utils uim-skk uim-gtk2.0 uim-fep uim-common uim-anthy libuim0 libuim-dev"
+
+LEAD_SONAME = "libuim.so.1"
+RDEPENDS_uim = "libuim0"
+
+DESCRIPTION_libuim-dev = "Development files for uim"
+FILES_libuim-dev = "${libdir}/libuim*.a \
+                    ${libdir}/libuim*.la \
+                    ${libdir}/libuim*.so \
+                    ${includedir}/uim \
+                    ${libdir}/pkgconfig/uim.pc"
+
+DESCRIPTION_libuim0 = "Simple and flexible input method collection and library"
+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.*"
+
+DESCRIPTION_uim-anthy = "Anthy plugin for uim"
+FILES_uim-anthy = "${libdir}/uim/plugin/libuim-anthy.* \
+                   ${datadir}/uim/anthy*.scm"
+
+pkg_postinst_uim-anthy() {
+#! /bin/sh
+set -e
+if [ -f /usr/bin/uim-module-manager ]; then
+	/usr/bin/uim-module-manager --register anthy --path /etc/uim
+fi
+}
+
+pkg_postrm_uim-anthy() {
+#! /bin/sh
+set -e
+if [ -f /usr/bin/uim-module-manager ]; then
+	/usr/bin/uim-module-manager --path /etc/uim --unregister anthy
+fi
+}
+
+pkg_prerm_uim-anthy() {
+#! /bin/sh
+set -e
+if [ -f /usr/bin/uim-module-manager ]; then
+	/usr/bin/uim-module-manager --register anthy --path /etc/uim
+fi
+}
+
+DESCRIPTION_uim-fep = "uim Front End Processor"
+FILES_uim-fep = "${bindir}/uim-fep*"
+
+DESCRIPTION_uim-gtk2.0  = "GTK+2.x immodule for uim"
+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"
+
+pkg_postinst_uim-gtk2.0() {
+#! /bin/sh
+set -e
+gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+}
+
+#pkg_postrm_uim-gtk2.0() {
+##! /bin/sh
+#set -e
+#/usr/sbin/update-gtk-immodules
+#}
+
+DESCRIPTION_uim-skk = "SKK plugin for uim"
+FILES_uim-skk = "${libdir}/uim/plugin/libuim-skk.* \
+                 ${datadir}/uim/skk*.scm"
+
+pkg_postinst_uim-skk() {
+#! /bin/sh
+set -e
+if [ -f /usr/bin/uim-module-manager ]; then
+	/usr/bin/uim-module-manager --register skk --path /etc/uim
+fi
+}
+
+pkg_postrm_uim-skk() {
+#! /bin/sh
+set -e
+if [ -f /usr/bin/uim-module-manager ]; then
+	/usr/bin/uim-module-manager --path /etc/uim --unregister skk
+fi
+}
+
+DESCRIPTION_uim-utils = "Utilities for uim"
+FILES_uim-utils = "${bindir}/uim-sh \
+                   ${bindir}/uim-module-manager \
+		   ${libexecdir}/uim-helper-server"
+
+DESCRIPTION_uim-xim = "A bridge between uim and XIM"
+FILES_uim-xim = "${bindir}/uim-xim \
+                 ${libexecdir}/uim-candwin-gtk \
+                 ${datadir}/man/man1/uim-xim.1 \
+                 ${sysconfdir}/X11/xinit/xinput.d/uim*"
+
+# to .xinitrc, or .xsession
+#pkg_postinst_uim-xim() {
+#GTK_IM_MODULE=uim ; export GTK_IM_MODULE
+#QT_IM_MODULE=uim ; export QT_IM_MODULE
+#uim-xim &
+#XMODIFIERS=@im=uim ; export XMODIFIERS
+#}
+
+DESCRIPTION_uim-common = "Common files for uim"
+FILES_uim-common = "${datadir}/uim/pixmaps/*.png \
+                    ${datadir}/uim"
+pkg_postinst_uim-common() {
+#! /bin/sh
+set -e
+if [ -f /usr/bin/uim-module-manager ]; then
+	/usr/bin/uim-module-manager --path /etc/uim --register \
+		tutcode tcode hangul viqr ipa-x-sampa latin byeoru
+fi
+}
+
+pkg_prerm_uim-common() {
+#! /bin/sh
+set -e
+if [ -f /usr/bin/uim-module-manager ]; then
+	/usr/bin/uim-module-manager --path /etc/uim --register \
+		tutcode tcode hangul viqr ipa-x-sampa latin byeoru
+fi
+}
-- 
cgit v1.2.3


From 1774f75a2a4e80dbcb4995bf88bea9d2bd6b469b Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Tue, 16 Jan 2007 19:32:08 +0000
Subject: zudoku: add LDFLAGS += "-lstdc++". Fixes build failure reported in
 bug 1279.  Kudos to gfeller for the patch.

---
 packages/zudoku/zudoku_1.1.bb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'packages')

diff --git a/packages/zudoku/zudoku_1.1.bb b/packages/zudoku/zudoku_1.1.bb
index 46c64ebb6e..e9eb09741a 100644
--- a/packages/zudoku/zudoku_1.1.bb
+++ b/packages/zudoku/zudoku_1.1.bb
@@ -5,6 +5,7 @@ LICENSE = "GPL"
 SECTION = "opie/games"
 APPTYPE = "binary"
 APPDESKTOP = "${WORKDIR}"
+PR = "r1"
 
 SRC_URI = "http://www.vanille.de/mirror/zudoku-${PV}.tar.gz \
            file://zudoku.html \
@@ -13,6 +14,7 @@ SRC_URI = "http://www.vanille.de/mirror/zudoku-${PV}.tar.gz \
 inherit opie
 
 EXTRA_QMAKEVARS_POST += "TARGET=zudoku"
+LDFLAGS += "-lstdc++"
 
 do_install() {
 	install -d ${D}${palmtopdir}/help/en/html
-- 
cgit v1.2.3