[arch-commits] Commit in scim-hangul/trunk (2012.patch PKGBUILD gcc43.patch)

[Gaetan Bisson]

    Date: Wednesday, August 15, 2012 @ 11:46:31
  Author: bisson
Revision: 165325

upstream update

Added:
  scim-hangul/trunk/2012.patch
Modified:
  scim-hangul/trunk/PKGBUILD
Deleted:
  scim-hangul/trunk/gcc43.patch

-------------+
 2012.patch  |   23 +++++++++++++++++++++++
 PKGBUILD    |   17 ++++++++---------
 gcc43.patch |   22 ----------------------
 3 files changed, 31 insertions(+), 31 deletions(-)

Added: 2012.patch
===================================================================
--- 2012.patch	                        (rev 0)
+++ 2012.patch	2012-08-15 15:46:31 UTC (rev 165325)
@@ -0,0 +1,23 @@
+diff -aur old/src/scim_hangul_imengine.cpp new/src/scim_hangul_imengine.cpp
+--- old/src/scim_hangul_imengine.cpp	2012-08-16 01:33:25.996258740 +1000
++++ new/src/scim_hangul_imengine.cpp	2012-08-16 01:33:41.932950046 +1000
+@@ -33,6 +33,7 @@
+   #include <config.h>
+ #endif
+ 
++#include <unistd.h>
+ #include <cstring>
+ #include <scim.h>
+ #include "scim_hangul_imengine.h"
+diff -aur old/src/scim_hangul_imengine_setup.cpp new/src/scim_hangul_imengine_setup.cpp
+--- old/src/scim_hangul_imengine_setup.cpp	2012-08-16 01:33:25.996258740 +1000
++++ new/src/scim_hangul_imengine_setup.cpp	2012-08-16 01:43:39.823860324 +1000
+@@ -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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-08-15 15:29:35 UTC (rev 165324)
+++ PKGBUILD	2012-08-15 15:46:31 UTC (rev 165325)
@@ -3,23 +3,22 @@
 # Maintainer: Gaetan Bisson <bisson at archlinux.org>
 
 pkgname=scim-hangul
-pkgver=0.3.2
-pkgrel=4
+pkgver=0.4.0
+pkgrel=1
 pkgdesc='Korean input method module for SCIM'
-arch=('i686' 'x86_64')
 url='http://www.scim-im.org/'
 license=('GPL')
+arch=('i686' 'x86_64')
 depends=('libhangul' 'scim')
 options=('!libtool')
-source=("http://downloads.sourceforge.net/sourceforge/scim/$pkgname-$pkgver.tar.gz"
-        'gcc43.patch')
-sha1sums=('d1f4a2114d284c926d64fbfe8ea83307b8d8e2ec'
-          '956bb2b6bd75b3d2756895f8ade429f95bacc0ff')
+source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.gz"
+        '2012.patch')
+sha1sums=('2ba06a6d851a1d86c5a9b659c573bfd87e6a7555'
+          'a046c40b78521f85418b8ad2138b51815d47abec')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i ../gcc43.patch
-	./bootstrap # skim complains; it's alright
+	patch -p1 -i ../2012.patch
 	./configure --prefix=/usr --enable-skim-support
 	make
 }

Deleted: gcc43.patch
===================================================================
--- gcc43.patch	2012-08-15 15:29:35 UTC (rev 165324)
+++ gcc43.patch	2012-08-15 15:46:31 UTC (rev 165325)
@@ -1,22 +0,0 @@
-diff -Naur scim-hangul-0.3.2-orig/src/scim_hangul_imengine.cpp scim-hangul-0.3.2/src/scim_hangul_imengine.cpp
---- scim-hangul-0.3.2-orig/src/scim_hangul_imengine.cpp	2008-03-26 09:33:43.000000000 +0100
-+++ scim-hangul-0.3.2/src/scim_hangul_imengine.cpp	2008-03-26 09:34:41.000000000 +0100
-@@ -33,6 +33,7 @@
-   #include <config.h>
- #endif
- 
-+#include <cstring>
- #include <scim.h>
- #include "scim_hangul_imengine.h"
- 
-diff -Naur scim-hangul-0.3.2-orig/src/scim_hangul_imengine_setup.cpp scim-hangul-0.3.2/src/scim_hangul_imengine_setup.cpp
---- scim-hangul-0.3.2-orig/src/scim_hangul_imengine_setup.cpp	2008-03-26 09:33:43.000000000 +0100
-+++ scim-hangul-0.3.2/src/scim_hangul_imengine_setup.cpp	2008-03-26 09:34:53.000000000 +0100
-@@ -34,6 +34,7 @@
-   #include <config.h>
- #endif
- 
-+#include <cstring>
- #include <scim.h>
- #include <gtk/scimkeyselection.h>
-