[arch-commits] Commit in scim/trunk (PKGBUILD gcc45.patch install scim.install)

[Gaetan Bisson]

    Date: Thursday, May 26, 2011 @ 05:22:50
  Author: bisson
Revision: 125359

upstream update, various cleanup

Added:
  scim/trunk/install
    (from rev 125358, scim/trunk/scim.install)
Modified:
  scim/trunk/PKGBUILD
Deleted:
  scim/trunk/gcc45.patch
  scim/trunk/scim.install

--------------+
 PKGBUILD     |   45 ++++++++++++++++++++++++++++-----------------
 gcc45.patch  |   12 ------------
 install      |   13 +++++++++++++
 scim.install |   13 -------------
 4 files changed, 41 insertions(+), 42 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-05-26 06:26:52 UTC (rev 125358)
+++ PKGBUILD	2011-05-26 09:22:50 UTC (rev 125359)
@@ -1,29 +1,40 @@
 # $Id$
-# Maintainer: damir <damir at archlinux.org>
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: damir <damir at archlinux.org>
 # Contributor: Gan Lu <rhythm.gan at gmail.com>
 
 pkgname=scim
-pkgver=1.4.9
-pkgrel=2
-pkgdesc="A Input Method development platform"
-arch=("i686" "x86_64")
-url="http://www.scim-im.org/projects/scim"
+pkgver=1.4.10
+pkgrel=1
+pkgdesc='Input method user interface and development platform'
+url='http://www.scim-im.org/projects/scim'
 license=('GPL')
+arch=('i686' 'x86_64')
 depends=('gtk2' 'gcc-libs')
 makedepends=('intltool')
 backup=('etc/scim/config' 'etc/scim/global')
 options=('!libtool')
-install=scim.install
-source=(http://downloads.sourceforge.net/sourceforge/scim/$pkgname-$pkgver.tar.gz
-        gcc45.patch)
-md5sums=('975ba34b01304ea8166ac8ea27aa9e88'
-         '9d7b41421424cedcbc5740098afa4921')
+source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/${pkgname}_$pkgver.tar.gz")
+sha1sums=('bf33a6ceb199453fed909a61f54e971653fe5abf')
 
+install=install
+
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -Np1 -i $srcdir/gcc45.patch
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --with-gnu-ld --with-x --disable-static
-  make
-  make DESTDIR=$pkgdir install
+	cd "$srcdir/$pkgname-$pkgver"
+
+	./bootstrap
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--disable-static \
+		--with-gnu-ld \
+		--with-x \
+
+	make
 }
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
+
+	make DESTDIR="$pkgdir" install
+}

Deleted: gcc45.patch
===================================================================
--- gcc45.patch	2011-05-26 06:26:52 UTC (rev 125358)
+++ gcc45.patch	2011-05-26 09:22:50 UTC (rev 125359)
@@ -1,12 +0,0 @@
-diff -Nur 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 01:42:40.000000000 -0500
-+++ scim-1.4.9/src/ltdl.cpp	2010-07-04 00:19:58.924925581 -0500
-@@ -3361,7 +3361,7 @@
- {
-   lt_dlhandle	handle		= 0;
-   char *	tmp		= 0;
--  char *	ext		= 0;
-+  const char *	ext		= 0;
-   size_t	len;
-   int		errors		= 0;
- 

Copied: scim/trunk/install (from rev 125358, scim/trunk/scim.install)
===================================================================
--- install	                        (rev 0)
+++ install	2011-05-26 09:22:50 UTC (rev 125359)
@@ -0,0 +1,13 @@
+post_install() {
+	echo -n 'updating gtk.immodules... '
+	/usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+	echo 'done.'
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}

Deleted: scim.install
===================================================================
--- scim.install	2011-05-26 06:26:52 UTC (rev 125358)
+++ scim.install	2011-05-26 09:22:50 UTC (rev 125359)
@@ -1,13 +0,0 @@
-post_install() {
-  echo -n "updating gtk.immodules... "
-  /usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
-  echo "done."
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}