diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-04 10:10:35 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-04 10:10:35 -0300 |
| commit | b9ab7ef683fd366635faca49342ee005846037ab (patch) | |
| tree | 3bb0ff57a43d068e85dc5318887f700b071c7f8f /extra/gcin | |
| parent | 7046a475b24925c0ec7816ef7d2cdcf3b9cd4eb0 (diff) | |
| parent | ab1410d33401cf1fc4a384bb0b2d9901c8fe8d14 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/gimmie/PKGBUILD
community/glipper-old/PKGBUILD
community/glipper/PKGBUILD
community/lcms2/PKGBUILD
community/libpanelappletmm/PKGBUILD
community/panflute/PKGBUILD
community/sensors-applet/PKGBUILD
community/wtf/PKGBUILD
community/xmonad-log-applet/PKGBUILD
core/binutils/PKGBUILD
core/tzdata/PKGBUILD
extra/a52dec/PKGBUILD
extra/aubio/PKGBUILD
extra/automoc4/PKGBUILD
extra/deskbar-applet/PKGBUILD
extra/eject/PKGBUILD
extra/ekiga/PKGBUILD
extra/gnome-netstatus/PKGBUILD
extra/gnome-python-desktop/PKGBUILD
extra/htdig/PKGBUILD
extra/ktorrent/PKGBUILD
extra/libgail-gnome/PKGBUILD
extra/libktorrent/PKGBUILD
extra/libofa/PKGBUILD
extra/netspeed-applet/PKGBUILD
extra/openexr/PKGBUILD
extra/postgresql/PKGBUILD
extra/pulseaudio-mixer-applet/PKGBUILD
extra/seahorse-plugins/PKGBUILD
extra/telepathy-qt4/PKGBUILD
libre/kernel26-libre/PKGBUILD
testing/libtool/PKGBUILD
testing/xfsprogs/PKGBUILD
Diffstat (limited to 'extra/gcin')
| -rw-r--r-- | extra/gcin/PKGBUILD | 16 | ||||
| -rw-r--r-- | extra/gcin/install | 11 |
2 files changed, 16 insertions, 11 deletions
diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD index a54e8e427..ebfebbd14 100644 --- a/extra/gcin/PKGBUILD +++ b/extra/gcin/PKGBUILD @@ -1,19 +1,21 @@ -# $Id: PKGBUILD 121293 2011-04-30 12:04:42Z bisson $ +# $Id: PKGBUILD 122190 2011-05-02 18:01:07Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=gcin pkgver=1.6.1 -pkgrel=1 +pkgrel=2 pkgdesc='Input method server supporting various input methods' arch=('i686' 'x86_64' 'mips64el') license=('LGPL') -url='http://www.csie.nctu.edu.tw/~cp76/gcin/' +url='http://cle.linux.org.tw/gcin/download/' depends=('gtk2' 'libxtst') -makedepends=('anthy' 'qt') -optdepends=('qt: support for qt4 input method') -source=("${url}download/${pkgname}-${pkgver}.tar.bz2" +makedepends=('qt' 'gtk3' 'anthy') +optdepends=('qt: support for qt4 input method' + 'gtk3: support for gtk3 input method' + 'anthy: support for anthy input method') +source=("${url}${pkgname}-${pkgver}.tar.bz2" 'fix_x86_64_libdir.patch' 'fix_qt4_paths.patch') sha1sums=('acbfffbaf7eccd32ef251493e8c03dd126023b51' @@ -26,6 +28,8 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 -i ../fix_x86_64_libdir.patch patch -p1 -i ../fix_qt4_paths.patch + sed '/^GTK2IM=/c GTK2IM=gtk-2.0/2.10.0/immodules' -i gtk-im/Makefile + sed '/^GTK3IM=/c GTK3IM=gtk-3.0/3.0.0/immodules' -i gtk-im/Makefile # FS#24051 ./configure --prefix=/usr --use_i18n=Y make } diff --git a/extra/gcin/install b/extra/gcin/install index 1097ea400..c16d11b5e 100644 --- a/extra/gcin/install +++ b/extra/gcin/install @@ -1,13 +1,14 @@ post_install() { - echo -n "updating gtk.immodules... " - /usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules - echo "done." + echo -n "updating 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 > /usr/lib/gtk-3.0/3.0.0/immodules.cache + echo "done." } post_upgrade() { - post_install + post_install } post_remove() { - post_install + post_install } |