diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2011-11-26 11:56:56 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2011-11-26 11:56:56 +0100 |
| commit | 0fc7a60c47b41bf54d1f1429fddb6baddb80007c (patch) | |
| tree | 77f6cc6477ba82a940d83258ffc98e2f26e40284 /extra/gcin | |
| parent | 47ed35d319764a0de3a242524e037319bd1a52bd (diff) | |
| parent | 6a642c093f29814cdd0fdefeee3ab9400eae490f (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/ncdu/PKGBUILD
extra/gcin/PKGBUILD
extra/maxima/PKGBUILD
extra/sbcl/PKGBUILD
kde-unstable/calligra/PKGBUILD
kde-unstable/kdebase-workspace/PKGBUILD
Diffstat (limited to 'extra/gcin')
| -rw-r--r-- | extra/gcin/PKGBUILD | 12 | ||||
| -rw-r--r-- | extra/gcin/qt4-lib64.patch | 17 |
2 files changed, 10 insertions, 19 deletions
diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD index c1d48b9b3..121bfc29e 100644 --- a/extra/gcin/PKGBUILD +++ b/extra/gcin/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 140668 2011-10-18 00:42:56Z bisson $ +# $Id: PKGBUILD 143496 2011-11-25 03:20:54Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=gcin -pkgver=1.7.0 +pkgver=2.1.0 pkgrel=1 pkgdesc='Input method server supporting various input methods' -arch=('i686' 'x86_64' 'mips64el') -license=('LGPL') url='http://hyperrate.com/dir.php?eid=67' +license=('LGPL') +arch=('i686' 'x86_64' 'mips64el') depends=('gtk2' 'libxtst') makedepends=('qt' 'gtk3' 'anthy' 'libchewing') optdepends=('qt: support for qt4 input method' @@ -18,8 +18,8 @@ optdepends=('qt: support for qt4 input method' 'libchewing: support for chewing input method') source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.xz" 'qt4-lib64.patch') -sha1sums=('151d1286dc54d7f7fa230d37e89d3d0fe0845258' - '4307b0d7d6dc10f15909c94973c4357caf31de7e') +sha1sums=('9ab09afece8d94faacdcadb150f87c0337108857' + '4b121e9a86a2ca25869c69b7d4d9623a0c8f55fc') install=install diff --git a/extra/gcin/qt4-lib64.patch b/extra/gcin/qt4-lib64.patch index 13cb3dc15..abc15950e 100644 --- a/extra/gcin/qt4-lib64.patch +++ b/extra/gcin/qt4-lib64.patch @@ -1,15 +1,6 @@ diff -aur old/configure new/configure ---- old/configure 2011-06-08 16:00:37.000000000 +0200 -+++ new/configure 2011-07-05 08:02:33.223601351 +0200 -@@ -164,7 +164,7 @@ - - LIB='lib' - if [ -d /lib64 ]; then --LIB='lib64' -+LIB='lib' - fi - - QT_IM='N' +--- old/configure 2011-11-07 06:51:12.000000000 +1100 ++++ new/configure 2011-11-25 14:02:10.819256960 +1100 @@ -188,7 +188,7 @@ @@ -20,8 +11,8 @@ diff -aur old/configure new/configure pkg-config --libs QtCore QtGui > /dev/null 2> /dev/null if [ $? = 0 ]; then diff -aur old/qt4-im/Makefile new/qt4-im/Makefile ---- old/qt4-im/Makefile 2011-06-08 15:03:50.000000000 +0200 -+++ new/qt4-im/Makefile 2011-07-05 08:04:15.717731695 +0200 +--- old/qt4-im/Makefile 2011-06-08 23:03:50.000000000 +1000 ++++ new/qt4-im/Makefile 2011-11-25 14:05:28.844110772 +1100 @@ -1,5 +1,5 @@ include ../config.mak -QT=qt4 |