Date: Thursday, March 14, 2019 @ 14:31:18 Author: yan12125 Revision: 441028
upgpkg: gcin 2.8.9-1 * Make GTK3 as a mandatory dependency and GTK2 as an optional one as GTK3 is the default UI toolkit in this version [1]. Also, /usr/bin/gcin links to GTK3 libraries. * Fix gcin not usable in GTK2 applications if GTK_IM_MODULE=gcin while XMODIFIERS is not set. Tested with pcmanx-gtk2. * Install GTK+ IM modules to the same paths as builtin GTK+ IM modules. * Let ALPM hooks update GTK+ IM module cache instead of creating it manually. Actually the path for GTK2 in post_install() is wrong. [1] https://hyperrate.com/thread.php?tid=34392 Added: gcin/trunk/fix-gtk-immodules-path.patch Modified: gcin/trunk/PKGBUILD Deleted: gcin/trunk/install ------------------------------+ PKGBUILD | 17 +++++++++-------- fix-gtk-immodules-path.patch | 24 ++++++++++++++++++++++++ install | 14 -------------- 3 files changed, 33 insertions(+), 22 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-03-14 13:58:14 UTC (rev 441027) +++ PKGBUILD 2019-03-14 14:31:18 UTC (rev 441028) @@ -5,24 +5,24 @@ # Contributor: damir <[email protected]> pkgname=gcin -pkgver=2.8.8 +pkgver=2.8.9 pkgrel=1 pkgdesc='Input method server supporting various input methods' url='https://hyperrate.com/dir.php?eid=67' license=('LGPL') arch=('x86_64') -depends=('gtk2' 'libxtst') -makedepends=('qt5-base' 'qt4' 'gtk3' 'anthy') +depends=('gtk3' 'libxtst') +makedepends=('qt5-base' 'qt4' 'gtk2' 'anthy') optdepends=('qt5-base: support for qt5 input method' 'qt4: support for qt4 input method' - 'gtk3: support for gtk3 input method' + 'gtk2: support for gtk2 input method' 'anthy: support for anthy input method' 'curl: for downloading and uploading vocabulary databases via ts-edit') -source=("https://hyperrate.com/gcin-source/${pkgname}-${pkgver}.tar.xz";) -sha512sums=('6fa9955f5f4fdd67b80af9e91b65ff15488368453041dd4c71a3875fc08e9027aa9202783f20d4513f3c01528cb6f8141489546cf21be8fa5ba17060d55d09d4') +source=("https://hyperrate.com/gcin-source/${pkgname}-${pkgver}.tar.xz"; + fix-gtk-immodules-path.patch) +sha512sums=('36813c124bb0ad37a5d3e5fde2ce6aecab9d6702e294b0196da1a830690145371d051909244477dcaca66afce7bba96a8c8f0931b97ad81c61fae8eacef29e17' + '54e90b04de45acf9f8821c92234b9708281907cbdf24ebb29f9820945615669d82a8443e49fd49d6c08be4a7b9f2857c8e763f170ef879c8fab1f232bb67e85d') -install=install - prepare() { cd "${srcdir}/${pkgname}-${pkgver}" sed 's/lib64/lib/g' -i configure @@ -34,6 +34,7 @@ sed \ -e 's:QT=qt5:QT=qt:' \ -i qt5-im/Makefile59 + patch -Np1 -i ../fix-gtk-immodules-path.patch } build() { Added: fix-gtk-immodules-path.patch =================================================================== --- fix-gtk-immodules-path.patch (rev 0) +++ fix-gtk-immodules-path.patch 2019-03-14 14:31:18 UTC (rev 441028) @@ -0,0 +1,24 @@ +diff -ur gcin-2.8.9.orig/gtk-im/Makefile gcin-2.8.9/gtk-im/Makefile +--- gcin-2.8.9.orig/gtk-im/Makefile 2019-03-14 21:31:09.553500793 +0800 ++++ gcin-2.8.9/gtk-im/Makefile 2019-03-14 22:07:00.917828776 +0800 +@@ -1,7 +1,7 @@ + include ../config.mak + + OBJS = imgcin.o gtkimcontextgcin.o +-GTK2IM=gtk-2.0/immodules ++GTK2IM=gtk-2.0/`pkg-config --variable=gtk_binary_version gtk+-2.0`/immodules + GTKINC=`pkg-config --cflags gtk+-2.0` + LDFLAGS=`pkg-config --libs gtk+-2.0` + IMMODULES=$(libdir)/$(GTK2IM) +diff -ur gcin-2.8.9.orig/gtk3-im/Makefile gcin-2.8.9/gtk3-im/Makefile +--- gcin-2.8.9.orig/gtk3-im/Makefile 2019-03-14 21:31:09.553500793 +0800 ++++ gcin-2.8.9/gtk3-im/Makefile 2019-03-14 22:06:40.175065314 +0800 +@@ -1,7 +1,7 @@ + include ../config.mak + + OBJS = imgcin.o gtkimcontextgcin.o +-GTK3IM=gtk-3.0/immodules ++GTK3IM=gtk-3.0/`pkg-config --variable=gtk_binary_version gtk+-3.0`/immodules + GTKINC=`pkg-config --cflags gtk+-3.0` + LDFLAGS=`pkg-config --libs gtk+-3.0` + LDFLAGS+='-Wl,--as-needed' Deleted: install =================================================================== --- install 2019-03-14 13:58:14 UTC (rev 441027) +++ install 2019-03-14 14:31:18 UTC (rev 441028) @@ -1,14 +0,0 @@ -post_install() { - 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_remove() { - post_install -}
