[arch-commits] Commit in scim-hangul/trunk (3 files)

[Gaetan Bisson]

    Date: Tuesday, February 22, 2011 @ 15:14:33
  Author: bisson
Revision: 110885

various cleanup

Added:
  scim-hangul/trunk/gcc43.patch
    (from rev 110597, scim-hangul/trunk/scim-hangul-0.3.2-fix-gcc43-build.patch)
Modified:
  scim-hangul/trunk/PKGBUILD
Deleted:
  scim-hangul/trunk/scim-hangul-0.3.2-fix-gcc43-build.patch

-----------------------------------------+
 PKGBUILD                                |   40 ++++++++++++++++--------------
 gcc43.patch                             |   22 ++++++++++++++++
 scim-hangul-0.3.2-fix-gcc43-build.patch |   22 ----------------
 3 files changed, 44 insertions(+), 40 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-02-22 20:14:29 UTC (rev 110884)
+++ PKGBUILD	2011-02-22 20:14:33 UTC (rev 110885)
@@ -1,26 +1,30 @@
 # $Id$
-# Maintainer: damir <damir at archlinux.org>
+# Contributor: damir <damir at archlinux.org>
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
 
 pkgname=scim-hangul
 pkgver=0.3.2
-pkgrel=2
-pkgdesc="SCIM 한글 (hangul) input method engine for Korean language"
-arch=("i686" "x86_64")
-url="http://www.scim-im.org/"
-license=("GPL")
-depends=('libhangul>=0.0.7' 'scim>=1.4.7')
-source=("http://downloads.sourceforge.net/sourceforge/scim/$pkgname-$pkgver.tar.gz" "$pkgname-$pkgver-fix-gcc43-build.patch")
-options=("!libtool")
+pkgrel=3
+pkgdesc='Korean input method module for SCIM'
+arch=('i686' 'x86_64')
+url='http://www.scim-im.org/'
+license=('GPL')
+depends=('libhangul' 'scim')
+options=('!libtool')
+source=("http://downloads.sourceforge.net/sourceforge/scim/$pkgname-$pkgver.tar.gz"
+        'gcc43.patch')
+sha1sums=('a88b5d70890060367e259c56c6a2029a6e020683'
+          '956bb2b6bd75b3d2756895f8ade429f95bacc0ff')
 
 build() {
-  cd $startdir/src
-  patch -Np0 -i $pkgname-$pkgver-fix-gcc43-build.patch  || return 1
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr --enable-skim-support  
-  make || return 1
-  make DESTDIR=$startdir/pkg install
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	patch -p1 -i ../gcc43.patch
+	./bootstrap # skim complains; it's alright
+	./configure --prefix=/usr --enable-skim-support
+	make
 }
 
-
-md5sums=('882460f47dd3211f94c80ed894ad05cb'
-         '0a9784bba2bca5f74a9897ef2a286543')
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+}

Copied: scim-hangul/trunk/gcc43.patch (from rev 110597, scim-hangul/trunk/scim-hangul-0.3.2-fix-gcc43-build.patch)
===================================================================
--- gcc43.patch	                        (rev 0)
+++ gcc43.patch	2011-02-22 20:14:33 UTC (rev 110885)
@@ -0,0 +1,22 @@
+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>
+ 

Deleted: scim-hangul-0.3.2-fix-gcc43-build.patch
===================================================================
--- scim-hangul-0.3.2-fix-gcc43-build.patch	2011-02-22 20:14:29 UTC (rev 110884)
+++ scim-hangul-0.3.2-fix-gcc43-build.patch	2011-02-22 20:14:33 UTC (rev 110885)
@@ -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>
-