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

[Gaetan Bisson]

    Date: Thursday, April 19, 2012 @ 21:05:29
  Author: bisson
Revision: 156509

upstream update

Modified:
  scim/trunk/PKGBUILD
  scim/trunk/install

----------+
 PKGBUILD |   25 ++++++++++++++++---------
 install  |    2 --
 2 files changed, 16 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-04-20 01:03:19 UTC (rev 156508)
+++ PKGBUILD	2012-04-20 01:05:29 UTC (rev 156509)
@@ -4,31 +4,38 @@
 # Contributor: Gan Lu <rhythm.gan at gmail.com>
 
 pkgname=scim
-pkgver=1.4.11
-pkgrel=2
+pkgver=1.4.12
+pkgrel=1
 pkgdesc='Input method user interface and development platform'
 url='http://www.scim-im.org/projects/scim'
-license=('GPL')
+license=('LGPL')
+options=('!libtool')
 arch=('i686' 'x86_64')
-options=('!libtool')
 makedepends=('intltool')
-depends=('gtk2' 'libtool')
+depends=('libltdl' 'gtk2')
 backup=('etc/scim/config' 'etc/scim/global')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('e202e42df52f5c9a88f6ae4d4ce04f94bc22e27c')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
+        'ftp://ftp.archlinux.org/other/scim-docs-20120420.tar.xz')
+sha1sums=('948180ec0af18e435a95edbdb840cf41f3b24d32'
+          'b2cccb43673e1760abf6825768bc4354a981a0ad')
 
+# Docs tarball temporarily generated with:
+# 	svn co https://scim.svn.sourceforge.net/svnroot/scim/scim/trunk/docs docs
+
 install=install
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
+	mv ../docs .
 	./bootstrap
+	sed 's/\$nls_cv_use_gnu_gettext/yes/' -i configure
+
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--disable-static \
-		--with-gnu-ld \
-		--with-x \
+		--with-gtk-version=2 # still a couple issues with 3
 
 	make
 }

Modified: install
===================================================================
--- install	2012-04-20 01:03:19 UTC (rev 156508)
+++ install	2012-04-20 01:05:29 UTC (rev 156509)
@@ -1,7 +1,5 @@
 post_install() {
-	echo -n 'updating gtk.immodules... '
 	/usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
-	echo 'done.'
 }
 
 post_upgrade() {