scim: add 1.4.9

3 files changed, 182 insertions, 0 deletions

diff --git a/recipes/scim/files/composemacron.patch b/recipes/scim/files/composemacron.patch
new file mode 100644
index 0000000000..6641733972
--- /dev/null
+++ b/recipes/scim/files/composemacron.patch
@@ -0,0 +1,66 @@
+--- scim-1.4.6/src/scim_compose_key_data.h.old	2007-05-27 14:17:40.000000000 +0200
++++ scim-1.4.6/src/scim_compose_key_data.h	2007-05-27 14:22:31.000000000 +0200
+@@ -3187,23 +3187,23 @@
+   {{SCIM_KEY_Multi_key,             SCIM_KEY_minus,                 SCIM_KEY_minus,                 SCIM_KEY_minus,         0                    }, 0x2014},
+   {{SCIM_KEY_Multi_key,             SCIM_KEY_minus,                 SCIM_KEY_minus,                 SCIM_KEY_period,        0                    }, 0x2013},
+   {{SCIM_KEY_Multi_key,             SCIM_KEY_minus,                 SCIM_KEY_colon,                 0,                      0                    }, 0x00F7},
+-  {{SCIM_KEY_Multi_key,             SCIM_KEY_minus,                 SCIM_KEY_A,                     0,                      0                    }, 0x00C3},
++  {{SCIM_KEY_Multi_key,             SCIM_KEY_minus,                 SCIM_KEY_A,                     0,                      0                    }, 0x0100},
+   {{SCIM_KEY_Multi_key,             SCIM_KEY_minus,                 SCIM_KEY_D,                     0,                      0                    }, 0x0110},
+   {{SCIM_KEY_Multi_key,             SCIM_KEY_minus,                 SCIM_KEY_E,                     0,                      0                    }, 0x0112},
+   {{SCIM_KEY_Multi_key,             SCIM_KEY_minus,                 SCIM_KEY_I,                     0,                      0                    }, 0x012A},
+   {{SCIM_KEY_Multi_key,             SCIM_KEY_minus,                 SCIM_KEY_L,                     0,                      0                    }, 0x00A3},
+   {{SCIM_KEY_Multi_key,             SCIM_KEY_minus,                 SCIM_KEY_N,                     0,                      0                    }, 0x00D1},
+-  {{SCIM_KEY_Multi_key,             SCIM_KEY_minus,                 SCIM_KEY_O,                     0,                      0                    }, 0x00D5},
++  {{SCIM_KEY_Multi_key,             SCIM_KEY_minus,                 SCIM_KEY_O,                     0,                      0                    }, 0x014C},
+   {{SCIM_KEY_Multi_key,             SCIM_KEY_minus,                 SCIM_KEY_U,                     0,                      0                    }, 0x016A},
+   {{SCIM_KEY_Multi_key,             SCIM_KEY_minus,                 SCIM_KEY_Y,                     0,                      0                    }, 0x00A5},
+   {{SCIM_KEY_Multi_key,             SCIM_KEY_minus,                 SCIM_KEY_asciicircum,           0,                      0                    }, 0x00AF},
+-  {{SCIM_KEY_Multi_key,             SCIM_KEY_minus,                 SCIM_KEY_a,                     0,                      0                    }, 0x00E3},
++  {{SCIM_KEY_Multi_key,             SCIM_KEY_minus,                 SCIM_KEY_a,                     0,                      0                    }, 0x0101},
+   {{SCIM_KEY_Multi_key,             SCIM_KEY_minus,                 SCIM_KEY_d,                     0,                      0                    }, 0x0111},
+   {{SCIM_KEY_Multi_key,             SCIM_KEY_minus,                 SCIM_KEY_e,                     0,                      0                    }, 0x0113},
+   {{SCIM_KEY_Multi_key,             SCIM_KEY_minus,                 SCIM_KEY_i,                     0,                      0                    }, 0x012B},
+   {{SCIM_KEY_Multi_key,             SCIM_KEY_minus,                 SCIM_KEY_l,                     0,                      0                    }, 0x00A3},
+   {{SCIM_KEY_Multi_key,             SCIM_KEY_minus,                 SCIM_KEY_n,                     0,                      0                    }, 0x00F1},
+-  {{SCIM_KEY_Multi_key,             SCIM_KEY_minus,                 SCIM_KEY_o,                     0,                      0                    }, 0x00F5},
++  {{SCIM_KEY_Multi_key,             SCIM_KEY_minus,                 SCIM_KEY_o,                     0,                      0                    }, 0x014D},
+   {{SCIM_KEY_Multi_key,             SCIM_KEY_minus,                 SCIM_KEY_u,                     0,                      0                    }, 0x016B},
+   {{SCIM_KEY_Multi_key,             SCIM_KEY_minus,                 SCIM_KEY_y,                     0,                      0                    }, 0x00A5},
+   {{SCIM_KEY_Multi_key,             SCIM_KEY_period,                SCIM_KEY_exclam,                SCIM_KEY_S,             0                    }, 0x1E68},
+@@ -3453,7 +3453,7 @@
+   {{SCIM_KEY_Multi_key,             SCIM_KEY_A,                     SCIM_KEY_parenleft,             0,                      0                    }, 0x0102},
+   {{SCIM_KEY_Multi_key,             SCIM_KEY_A,                     SCIM_KEY_asterisk,              0,                      0                    }, 0x00C5},
+   {{SCIM_KEY_Multi_key,             SCIM_KEY_A,                     SCIM_KEY_comma,                 0,                      0                    }, 0x0104},
+-  {{SCIM_KEY_Multi_key,             SCIM_KEY_A,                     SCIM_KEY_minus,                 0,                      0                    }, 0x00C3},
++  {{SCIM_KEY_Multi_key,             SCIM_KEY_A,                     SCIM_KEY_minus,                 0,                      0                    }, 0x0100},
+   {{SCIM_KEY_Multi_key,             SCIM_KEY_A,                     SCIM_KEY_greater,               0,                      0                    }, 0x00C2},
+   {{SCIM_KEY_Multi_key,             SCIM_KEY_A,                     SCIM_KEY_A,                     0,                      0                    }, 0x00C5},
+   {{SCIM_KEY_Multi_key,             SCIM_KEY_A,                     SCIM_KEY_E,                     0,                      0                    }, 0x00C6},
+@@ -3530,7 +3530,7 @@
+   {{SCIM_KEY_Multi_key,             SCIM_KEY_N,                     SCIM_KEY_asciitilde,            0,                      0                    }, 0x00D1},
+   {{SCIM_KEY_Multi_key,             SCIM_KEY_O,                     SCIM_KEY_quotedbl,              0,                      0                    }, 0x00D6},
+   {{SCIM_KEY_Multi_key,             SCIM_KEY_O,                     SCIM_KEY_apostrophe,            0,                      0                    }, 0x00D3},
+-  {{SCIM_KEY_Multi_key,             SCIM_KEY_O,                     SCIM_KEY_minus,                 0,                      0                    }, 0x00D5},
++  {{SCIM_KEY_Multi_key,             SCIM_KEY_O,                     SCIM_KEY_minus,                 0,                      0                    }, 0x014C},
+   {{SCIM_KEY_Multi_key,             SCIM_KEY_O,                     SCIM_KEY_slash,                 0,                      0                    }, 0x00D8},
+   {{SCIM_KEY_Multi_key,             SCIM_KEY_O,                     SCIM_KEY_greater,               0,                      0                    }, 0x00D4},
+   {{SCIM_KEY_Multi_key,             SCIM_KEY_O,                     SCIM_KEY_C,                     0,                      0                    }, 0x00A9},
+@@ -4081,7 +4081,7 @@
+   {{SCIM_KEY_Multi_key,             SCIM_KEY_a,                     SCIM_KEY_parenleft,             0,                      0                    }, 0x0103},
+   {{SCIM_KEY_Multi_key,             SCIM_KEY_a,                     SCIM_KEY_asterisk,              0,                      0                    }, 0x00E5},
+   {{SCIM_KEY_Multi_key,             SCIM_KEY_a,                     SCIM_KEY_comma,                 0,                      0                    }, 0x0105},
+-  {{SCIM_KEY_Multi_key,             SCIM_KEY_a,                     SCIM_KEY_minus,                 0,                      0                    }, 0x00E3},
++  {{SCIM_KEY_Multi_key,             SCIM_KEY_a,                     SCIM_KEY_minus,                 0,                      0                    }, 0x0101},
+   {{SCIM_KEY_Multi_key,             SCIM_KEY_a,                     SCIM_KEY_greater,               0,                      0                    }, 0x00E2},
+   {{SCIM_KEY_Multi_key,             SCIM_KEY_a,                     SCIM_KEY_asciicircum,           0,                      0                    }, 0x00E2},
+   {{SCIM_KEY_Multi_key,             SCIM_KEY_a,                     SCIM_KEY_underscore,            0,                      0                    }, 0x00AA},
+@@ -4242,7 +4242,7 @@
+   {{SCIM_KEY_Multi_key,             SCIM_KEY_o,                     SCIM_KEY_apostrophe,            0,                      0                    }, 0x00F3},
+   {{SCIM_KEY_Multi_key,             SCIM_KEY_o,                     SCIM_KEY_apostrophe,            SCIM_KEY_A,             0                    }, 0x01FA},
+   {{SCIM_KEY_Multi_key,             SCIM_KEY_o,                     SCIM_KEY_apostrophe,            SCIM_KEY_a,             0                    }, 0x01FB},
+-  {{SCIM_KEY_Multi_key,             SCIM_KEY_o,                     SCIM_KEY_minus,                 0,                      0                    }, 0x00F5},
++  {{SCIM_KEY_Multi_key,             SCIM_KEY_o,                     SCIM_KEY_minus,                 0,                      0                    }, 0x014D},
+   {{SCIM_KEY_Multi_key,             SCIM_KEY_o,                     SCIM_KEY_slash,                 0,                      0                    }, 0x00F8},
+   {{SCIM_KEY_Multi_key,             SCIM_KEY_o,                     SCIM_KEY_greater,               0,                      0                    }, 0x00F4},
+   {{SCIM_KEY_Multi_key,             SCIM_KEY_o,                     SCIM_KEY_A,                     0,                      0                    }, 0x00C5},
diff --git a/recipes/scim/files/configure.patch b/recipes/scim/files/configure.patch
new file mode 100644
index 0000000000..95ef50ef82
--- /dev/null
+++ b/recipes/scim/files/configure.patch
@@ -0,0 +1,42 @@
+--- scim-1.4.6/configure.ac.old	2007-05-26 19:08:41.000000000 +0200
++++ scim-1.4.6/configure.ac	2007-05-26 21:15:00.000000000 +0200
+@@ -112,20 +112,8 @@
+ AM_CONDITIONAL(HAVE_XSLTPROC, test x$XSLTPROC != xno)
+ AC_SUBST(XSLTPROC)
+ 
+-# Checks if docbook-style-xsl is available
+-AC_CHECK_FILE(
+- [/usr/share/sgml/docbook/xsl-stylesheets/html/tldp-html.xsl],
+- [DOCBOOK_XSL=/usr/share/sgml/docbook/xsl-stylesheets/html/tldp-html.xsl],
+- [AC_CHECK_FILE(
+-  [/usr/share/sgml/docbook/xsl-stylesheets/html/docbook.xsl],
+-  [DOCBOOK_XSL=/usr/share/sgml/docbook/xsl-stylesheets/html/docbook.xsl],
+-   [AC_CHECK_FILE(
+-    [/usr/share/xml/docbook/stylesheet/nwalsh/current/html/docbook.xsl],
+-    [DOCBOOK_XSL=/usr/share/xml/docbook/stylesheet/nwalsh/current/html/docbook.xsl],
+-    [DOCBOOK_XSL=no]
+-    )]
+-  )]
+-)
++# Not needed
++DOCBOOK_XSL=no
+ 
+ AC_SUBST(DOCBOOK_XSL)
+ 
+@@ -156,16 +144,6 @@
+ AC_CHECK_SIZEOF(unsigned long long int)
+ AC_CHECK_HEADERS([stdint.h],[has_stdint=yes],[has_stdint=no])
+ 
+-if test x$ac_cv_sizeof_unsigned_short_int = x2 && test x$ac_cv_sizeof_char = x1 ; then
+-  :
+-else
+-  AC_MSG_ERROR([
+-*** SCIM requires
+-***      sizeof (unsigned short int)  == 2
+-***      sizeof (char)                == 1
+-*** You might want to consider using the GNU C compiler.
+-])
+-fi
+ 
+ if test x$ac_cv_sizeof_wchar_t = x0 ; then
+   AC_MSG_ERROR([
diff --git a/recipes/scim/scim_1.4.9.bb b/recipes/scim/scim_1.4.9.bb
new file mode 100644
index 0000000000..5b1690a54a
--- /dev/null
+++ b/recipes/scim/scim_1.4.9.bb
@@ -0,0 +1,74 @@
+DESCRIPTION = "Smart Common Input Method (SCIM) platform"
+HOMEPAGE = "http://www.scim-im.org"
+SECTION = "libs/inputmethod"
+LICENSE = "LGPL"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz \
+           file://configure.patch;patch=1 \
+#           file://composemacron.patch;patch=1 \
+	"
+DEPENDS = "gtk+"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = " --without-doxygen "
+LEAD_SONAME = "libscim-1.0.so"
+
+PDIR = "${PN}-1.0"
+
+do_configure_append () {
+	# Fix unset @ALL_LINGUAS@
+	#   Replace with a list of available translations in ${S}/po
+
+	cd ${S}/po
+	SEDR=`ls *.gmo -1 --color=none | sed 's/.gmo//' | tr '\n' ' '`
+	SEDL='@ALL_LINGUAS@'
+	sed "s/${SEDL}.*/${SEDR}/" Makefile.in.in > Mii.tmp
+	sed "s/${SEDL}.*/${SEDR}/" Makefile.in > Mi.tmp
+	sed "s/${SEDL}.*/${SEDR}/" Makefile > M.tmp
+	mv Mii.tmp Makefile.in.in
+	mv Mi.tmp Makefile.in
+	mv M.tmp Makefile
+
+	# Fix unset @INTLTOOL_LIBDIR@
+	#   Only needed for a check to see if charmap.alias is present,
+	#   not really needed, so we fail that test by having it look
+	#   in ${S}
+
+	cd ${S}
+	sed 's/@INTLTOOL_LIBDIR@/./' intltool-merge.in > Ii.tmp
+	sed 's/@INTLTOOL_LIBDIR@/./' intltool-merge > I.tmp
+	mv Ii.tmp intltool-merge.in
+	mv I.tmp intltool-merge
+
+	# Fix unset @GTK_LIBDIR@
+	#   This is the same as ${libdir} so we use that
+
+	cd ${S}/extras/gtk2_immodule
+	sed 's/@GTK_LIBDIR@/$(libdir)/g' Makefile.in > Mi.tmp
+	sed 's/@GTK_LIBDIR@/$(libdir)/g' Makefile.am > Ma.tmp
+	mv Mi.tmp Makefile.in
+	mv Ma.tmp Makefile.am
+}
+
+pkg_postinst_${PN} () {
+	# Update gtk2 immodules
+	#   Adds SCIM to the list
+	/usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+}
+
+pkg_postrm_${PN} () {
+	# Update gtk2 immodules
+	#   Removes SCIM from the list
+	/usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+}
+
+FILES_${PN}-dbg +=   "${libdir}/${PDIR}/.debug \
+                      ${libdir}/${PDIR}/1.4.0/*/.debug \
+		      ${libdir}/gtk-2.0/immodules/.debug"
+FILES_${PN} +=       "${libdir}/${PDIR}/scim-panel-gtk \
+                      ${libdir}/${PDIR}/scim-helper* \
+                      ${libdir}/${PDIR}/scim-launcher \
+		      ${libdir}/${PDIR}/1.4.0 \
+                      ${libdir}/gtk-2.0/immodules"