diff options
| author | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2009-05-17 13:39:59 +0200 |
|---|---|---|
| committer | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2010-01-17 14:22:16 +0100 |
| commit | cf19ee7045b64e6a0fab29a8eff732f2a6c062a9 (patch) | |
| tree | f4f10c405782a4327b866e3f4f154efa7c52e1e3 /recipes/scim/files | |
| parent | 9c27d6065a7d80b4d5649686c783a47d3f8f51ce (diff) | |
scim: initial commit for version 1.4.9
Diffstat (limited to 'recipes/scim/files')
| -rw-r--r-- | recipes/scim/files/configure.patch | 45 | ||||
| -rw-r--r-- | recipes/scim/files/gcc-4.4-const-char.dpatch | 17 |
2 files changed, 62 insertions, 0 deletions
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; + |