6 files changed, 56 insertions, 42 deletions
diff --git a/source/x/scim-hangul/scim-hangul-0.3.2+gcc-4.3.patch b/source/x/scim-hangul/scim-hangul-0.3.2+gcc-4.3.patch
new file mode 100644
index 00000000..b7698793
--- /dev/null
+++ b/source/x/scim-hangul/scim-hangul-0.3.2+gcc-4.3.patch
@@ -0,0 +1,23 @@
+diff -up scim-hangul-0.3.2/src/scim_hangul_imengine.cpp.gcc43~ scim-hangul-0.3.2/src/scim_hangul_imengine.cpp
+--- scim-hangul-0.3.2/src/scim_hangul_imengine.cpp.gcc43~	2008-01-13 08:01:34.000000000 +0000
++++ scim-hangul-0.3.2/src/scim_hangul_imengine.cpp	2008-01-13 08:01:34.000000000 +0000
+@@ -29,6 +29,7 @@
+ #define Uses_SCIM_LOOKUP_TABLE
+ #define Uses_SCIM_CONFIG_BASE
+ 
++#include <cstring>
+ #ifdef HAVE_CONFIG_H
+   #include <config.h>
+ #endif
+diff -up scim-hangul-0.3.2/src/scim_hangul_imengine_setup.cpp.gcc43~ scim-hangul-0.3.2/src/scim_hangul_imengine_setup.cpp
+--- scim-hangul-0.3.2/src/scim_hangul_imengine_setup.cpp.gcc43~	2008-01-13 08:01:37.000000000 +0000
++++ scim-hangul-0.3.2/src/scim_hangul_imengine_setup.cpp	2008-01-13 08:01:37.000000000 +0000
+@@ -28,7 +28,8 @@
+ 
+ #define Uses_SCIM_CONFIG_BASE
+ 
++#include <cstring>
+ #include <gtk/gtk.h>
+ 
+ #ifdef HAVE_CONFIG_H
+ 
diff --git a/source/x/scim-hangul/scim-hangul-0.3.2+gcc-4.7.patch b/source/x/scim-hangul/scim-hangul-0.3.2+gcc-4.7.patch
new file mode 100644
index 00000000..918de9e1
--- /dev/null
+++ b/source/x/scim-hangul/scim-hangul-0.3.2+gcc-4.7.patch
@@ -0,0 +1,12 @@
+diff --git a/src/scim_hangul_imengine.cpp b/src/scim_hangul_imengine.cpp
+index 7d70654..d678902 100644
+--- a/src/scim_hangul_imengine.cpp
++++ b/src/scim_hangul_imengine.cpp
+@@ -30,6 +30,7 @@
+ #define Uses_SCIM_CONFIG_BASE
+ 
+ #include <cstring>
++#include <unistd.h>
+ #ifdef HAVE_CONFIG_H
+   #include <config.h>
+ #endif
diff --git a/source/x/scim-hangul/scim-hangul-0.4.0+gtk.patch b/source/x/scim-hangul/scim-hangul-0.4.0+gtk.patch
new file mode 100644
index 00000000..bc1fd4b6
--- /dev/null
+++ b/source/x/scim-hangul/scim-hangul-0.4.0+gtk.patch
@@ -0,0 +1,11 @@
+--- src/scim_hangul_imengine_setup.cpp.orig	2012-07-08 07:52:07.000000000 -0400
++++ src/scim_hangul_imengine_setup.cpp	2012-11-02 14:13:14.000000000 -0400
+@@ -346,7 +346,7 @@
+     for (i = 0; i < n; i++) {
+ 	const char* name = hangul_ic_get_keyboard_name(i);
+ #if GTK_CHECK_VERSION(2, 24, 0)
+-	gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(combo_box), NULL, name);
++	gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo_box), name);
+ #else
+ 	gtk_combo_box_append_text(GTK_COMBO_BOX(combo_box), name);
+ #endif
diff --git a/source/x/scim-hangul/scim-hangul.SlackBuild b/source/x/scim-hangul/scim-hangul.SlackBuild
index 58f17654..06da9e2c 100755
--- a/source/x/scim-hangul/scim-hangul.SlackBuild
+++ b/source/x/scim-hangul/scim-hangul.SlackBuild
@@ -23,7 +23,7 @@
 #   SUCH DAMAGE.
 # -----------------------------------------------------------------------------
 #
-# Slackware SlackBuild script 
+# Slackware SlackBuild script
 # ===========================
 # By:         Eric Hameleers <alien@slackware.com>
 # For:        scim-hangul
@@ -36,21 +36,21 @@
 PKGNAM=scim-hangul
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 NUMJOBS=${NUMJOBS:-" -j7 "}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$(uname -m)" in
-    i?86) ARCH=i486 ;;
-    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;;
+    i?86) ARCH=i586 ;;
+    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
     *) ARCH=$(uname -m) ;;
   esac
   export ARCH
 fi
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
@@ -69,11 +69,12 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
-tar -xvf $CWD/${PKGNAM}-${VERSION}.tar.gz || exit 1
+tar -xvf $CWD/${PKGNAM}-${VERSION}.tar.?z* || exit 1
 cd ${PKGNAM}-${VERSION} || exit 1
 
-zcat $CWD/scim-hangul.gcc43.diff.gz | patch -p1 --verbose || exit 1
-zcat $CWD/scim-hangul.gcc47.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/scim-hangul-0.3.2+gcc-4.3.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/scim-hangul-0.3.2+gcc-4.7.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/scim-hangul-0.4.0+gtk.patch.gz | patch -p0 --verbose || exit 1
 
 chown -R root:root .
 find . \
diff --git a/source/x/scim-hangul/scim-hangul.gcc43.diff b/source/x/scim-hangul/scim-hangul.gcc43.diff
deleted file mode 100644
index db63e940..00000000
--- a/source/x/scim-hangul/scim-hangul.gcc43.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- ./src/scim_hangul_imengine.cpp.orig	2006-10-23 07:42:47.000000000 -0500
-+++ ./src/scim_hangul_imengine.cpp	2009-06-09 20:50:06.000000000 -0500
-@@ -36,6 +36,8 @@
- #include <scim.h>
- #include "scim_hangul_imengine.h"
- 
-+#include <cstring>
-+
- #ifdef HAVE_GETTEXT
-   #include <libintl.h>
-   #define _(String) dgettext(GETTEXT_PACKAGE,String)
---- ./src/scim_hangul_imengine_setup.cpp.orig	2006-10-23 07:42:47.000000000 -0500
-+++ ./src/scim_hangul_imengine_setup.cpp	2009-06-09 20:50:27.000000000 -0500
-@@ -37,6 +37,8 @@
- #include <scim.h>
- #include <gtk/scimkeyselection.h>
- 
-+#include <cstring>
-+
- #ifdef HAVE_GETTEXT
-   #include <libintl.h>
-   #define _(String) dgettext(GETTEXT_PACKAGE,String)
diff --git a/source/x/scim-hangul/scim-hangul.gcc47.diff b/source/x/scim-hangul/scim-hangul.gcc47.diff
deleted file mode 100644
index 7e0c52c6..00000000
--- a/source/x/scim-hangul/scim-hangul.gcc47.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/scim_hangul_imengine.cpp.orig	2012-05-11 22:51:39.653751057 -0500
-+++ ./src/scim_hangul_imengine.cpp	2012-05-11 22:53:45.793739278 -0500
-@@ -33,6 +33,8 @@
-   #include <config.h>
- #endif
- 
-+#include <unistd.h>
-+
- #include <scim.h>
- #include "scim_hangul_imengine.h"
-