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

[Gaetan Bisson]

    Date: Sunday, April 29, 2012 @ 07:52:21
  Author: bisson
Revision: 157785

upstream update

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

----------+
 PKGBUILD |   15 ++++-----------
 install  |    4 +++-
 2 files changed, 7 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-04-29 11:28:45 UTC (rev 157784)
+++ PKGBUILD	2012-04-29 11:52:21 UTC (rev 157785)
@@ -4,7 +4,7 @@
 # Contributor: Gan Lu <rhythm.gan at gmail.com>
 
 pkgname=scim
-pkgver=1.4.12
+pkgver=1.4.13
 pkgrel=1
 pkgdesc='Input method user interface and development platform'
 url='http://www.scim-im.org/projects/scim'
@@ -14,22 +14,15 @@
 makedepends=('intltool')
 depends=('libltdl' 'gtk2')
 backup=('etc/scim/config' 'etc/scim/global')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
-        'ftp://ftp.archlinux.org/other/scim/scim-docs-20120420.tar.xz')
-sha1sums=('948180ec0af18e435a95edbdb840cf41f3b24d32'
-          'b2cccb43673e1760abf6825768bc4354a981a0ad')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('dafe08bbdd3faa0324800cb63e44926d71be2e47')
 
-# 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
+	export CXXFLAGS+=' -fpermissive' # so configure detects gettext with gcc-4.7
 
 	./configure \
 		--prefix=/usr \

Modified: install
===================================================================
--- install	2012-04-29 11:28:45 UTC (rev 157784)
+++ install	2012-04-29 11:52:21 UTC (rev 157785)
@@ -1,5 +1,7 @@
 post_install() {
-	/usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+	[[ -x usr/bin/gtk-query-immodules-2.0 ]] && usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+	[[ -x usr/bin/gtk-query-immodules-3.0 ]] && usr/bin/gtk-query-immodules-3.0 > /etc/gtk-3.0/gtk.immodules
+	true
 }
 
 post_upgrade() {