summaryrefslogtreecommitdiffstats
path: root/i18n
diff options
context:
space:
mode:
authorRemko van der Vossen2010-08-11 08:49:23 +0200
committerRemko van der Vossen2010-08-11 08:49:23 +0200
commitdcac7b73091ab5e88736f00a6843e55756bf3033 (patch)
treea5df93319850fb1656e0646f3a5232a8de9a76ee /i18n
parentea84be06dcad7cef8d0b69d7c91b6b6268a12033 (diff)
scim: glibc 2.10 patch
Diffstat (limited to 'i18n')
-rw-r--r--i18n/scim/HISTORY3
-rwxr-xr-xi18n/scim/PRE_BUILD3
-rw-r--r--i18n/scim/scim_glibc-2.10.patch12
3 files changed, 18 insertions, 0 deletions
diff --git a/i18n/scim/HISTORY b/i18n/scim/HISTORY
index ab2a112e7f..cd6904e6ac 100644
--- a/i18n/scim/HISTORY
+++ b/i18n/scim/HISTORY
@@ -1,3 +1,6 @@
+2010-08-11 Remko van der Vossen <wich@sourcemage.org>
+ * PRE_BUILD, scim_glibc-2.10.patch: patch for glibc 2.10
+
2009-05-02 Andra┼ż "ruskie" Levstik <ruskie+f03a580f@codemages.net>
* init.d/scim: made it non-sh, bug #13702
diff --git a/i18n/scim/PRE_BUILD b/i18n/scim/PRE_BUILD
new file mode 100755
index 0000000000..d6f80ac0f5
--- /dev/null
+++ b/i18n/scim/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/scim_glibc-2.10.patch
diff --git a/i18n/scim/scim_glibc-2.10.patch b/i18n/scim/scim_glibc-2.10.patch
new file mode 100644
index 0000000000..52213aacdb
--- /dev/null
+++ b/i18n/scim/scim_glibc-2.10.patch
@@ -0,0 +1,12 @@
+diff -Naur scim-1.4.9.orig/src/ltdl.cpp scim-1.4.9/src/ltdl.cpp
+--- scim-1.4.9.orig/src/ltdl.cpp 2008-11-02 07:42:40.000000000 +0100
++++ scim-1.4.9/src/ltdl.cpp 2010-08-11 08:46:27.000000000 +0200
+@@ -3361,7 +3361,7 @@
+ {
+ lt_dlhandle handle = 0;
+ char * tmp = 0;
+- char * ext = 0;
++ const char * ext = 0;
+ size_t len;
+ int errors = 0;
+