diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-01 14:47:52 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-01 14:47:52 +0200 |
| commit | c8bd9200906149d53827aaa64e85a7008d51339f (patch) | |
| tree | 9e366130f0f7afde9d7a478b5c898d873aed0483 /extra/scim | |
| parent | d9a9508e07a00015e2a2f278719a9665ff565961 (diff) | |
| parent | 752015395fc8b95cc4a86b68189cb747fe9a8499 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/jack2/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/vim/PKGBUILD
multilib/lib32-gnutls/PKGBUILD
testing/dmraid/PKGBUILD
testing/dmraid/dmraid_hook
testing/dmraid/dmraid_install
testing/e2fsprogs/PKGBUILD
testing/openssh/PKGBUILD
testing/openssh/sshd.pam
testing/php/PKGBUILD
testing/php/php-fpm.conf.in.patch
testing/php/php.ini.patch
testing/xfce4-session/PKGBUILD
Diffstat (limited to 'extra/scim')
| -rw-r--r-- | extra/scim/PKGBUILD | 17 | ||||
| -rw-r--r-- | extra/scim/install | 4 |
2 files changed, 8 insertions, 13 deletions
diff --git a/extra/scim/PKGBUILD b/extra/scim/PKGBUILD index 5d56274ae..b69339c83 100644 --- a/extra/scim/PKGBUILD +++ b/extra/scim/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 156513 2012-04-20 01:11:09Z bisson $ +# $Id: PKGBUILD 157786 2012-04-29 11:52:40Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Gan Lu <rhythm.gan@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 @@ arch=('i686' 'x86_64' 'mips64el') 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') - -# Docs tarball temporarily generated with: -# svn co https://scim.svn.sourceforge.net/svnroot/scim/scim/trunk/docs docs +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") +sha1sums=('dafe08bbdd3faa0324800cb63e44926d71be2e47') 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 \ diff --git a/extra/scim/install b/extra/scim/install index c05312bfd..ae6ea9d56 100644 --- a/extra/scim/install +++ b/extra/scim/install @@ -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() { |