diff options
| -rw-r--r-- | conf/checksums.ini | 4 | ||||
| -rw-r--r-- | recipes/scim/files/configure.patch | 45 | ||||
| -rw-r--r-- | recipes/scim/files/gcc-4.4-const-char.dpatch | 17 | ||||
| -rw-r--r-- | recipes/scim/scim_1.4.9.bb | 65 |
4 files changed, 131 insertions, 0 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index d5fdfb8112..5761d3709e 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -24474,6 +24474,10 @@ sha256=0b01f9fb9c869ecb6e066993d59e34789f82d445438480ac0e2dc30f29d047a0 md5=55596c41572c5efcf4b2cae9c68c2152 sha256=bbb73ebc3a22f53e75dfbaa1718eebcc5a3619bb200b50df42d5377b99ebf4d4 +[http://downloads.sourceforge.net/scim/scim-1.4.9.tar.gz] +md5=975ba34b01304ea8166ac8ea27aa9e88 +sha256=f72e9779e220565f6002923bf7d6aa9891be2bbddcd91a4e2a2d5e20aefba8d0 + [http://downloads.sourceforge.net/scons/scons-0.96.1.tar.gz] md5=45b1c346edd8a0970210aeb1e82557c9 sha256=67ea186c1c6270178da0c3411f8c94fcb6a070eb68c3d43f08f282b0728d0c7d diff --git a/recipes/scim/files/configure.patch b/recipes/scim/files/configure.patch new file mode 100644 index 0000000000..ca4a19ff54 --- /dev/null +++ b/recipes/scim/files/configure.patch @@ -0,0 +1,45 @@ +upstream: not applicable upstream +origin: unknown contributor, sorry I forgot your name, your work is highly appreciated + +--- 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/files/gcc-4.4-const-char.dpatch b/recipes/scim/files/gcc-4.4-const-char.dpatch new file mode 100644 index 0000000000..b53a7b4d9c --- /dev/null +++ b/recipes/scim/files/gcc-4.4-const-char.dpatch @@ -0,0 +1,17 @@ +upstream: Laibsch will push upstream soon +origin: the original patch was prepared by Jari Aalto <jari.aalto@cante.net> for the Debian distribution + http://bugs.debian.org/560486 + +Index: scim-1.4.9/src/ltdl.cpp +=================================================================== +--- scim-1.4.9.orig/src/ltdl.cpp 2010-01-17 02:39:44.000000000 +0100 ++++ scim-1.4.9/src/ltdl.cpp 2010-01-17 02:39:54.000000000 +0100 +@@ -3361,7 +3361,7 @@ + { + lt_dlhandle handle = 0; + char * tmp = 0; +- char * ext = 0; ++ const char * ext = 0; + size_t len; + int errors = 0; + diff --git a/recipes/scim/scim_1.4.9.bb b/recipes/scim/scim_1.4.9.bb new file mode 100644 index 0000000000..61802f1173 --- /dev/null +++ b/recipes/scim/scim_1.4.9.bb @@ -0,0 +1,65 @@ +DESCRIPTION = "Smart Common Input Method (SCIM) platform" +HOMEPAGE = "http://www.scim-im.org" +SECTION = "libs/inputmethod" +LICENSE = "LGPL" +DEPENDS = "gtk+" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz \ + file://gcc-4.4-const-char.dpatch;patch=1 \ + file://configure.patch;patch=1" + +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 -i "s/${SEDL}.*/${SEDR}/" Makefile.in.in + sed -i "s/${SEDL}.*/${SEDR}/" Makefile.in + sed -i "s/${SEDL}.*/${SEDR}/" 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 -i 's/@INTLTOOL_LIBDIR@/./' intltool-merge.in + sed -i 's/@INTLTOOL_LIBDIR@/./' intltool-merge + + # Fix unset @GTK_LIBDIR@ + # This is the same as ${libdir} so we use that + + cd ${S}/extras/gtk2_immodule + sed -i 's/@GTK_LIBDIR@/$(libdir)/g' Makefile.in + sed -i 's/@GTK_LIBDIR@/$(libdir)/g' 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" |