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

[Jan Steffens]

    Date: Wednesday, May 20, 2020 @ 14:15:45
  Author: heftig
Revision: 387022

1.5.22+8+gf591381e-1

Modified:
  ibus/trunk/PKGBUILD

----------+
 PKGBUILD |   29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-20 14:00:22 UTC (rev 387021)
+++ PKGBUILD	2020-05-20 14:15:45 UTC (rev 387022)
@@ -2,7 +2,7 @@
 
 pkgbase=ibus
 pkgname=(ibus libibus)
-pkgver=1.5.22
+pkgver=1.5.22+8+gf591381e
 pkgrel=1
 pkgdesc="Next Generation Input Bus for Linux"
 arch=('x86_64')
@@ -11,19 +11,26 @@
 depends=('dconf' 'gtk2' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'python-dbus' 'python-gobject'
          'iso-codes' 'python2-gobject2' 'python2-dbus' 'python2-gobject' 'librsvg')
 makedepends=('gobject-introspection' 'vala' 'intltool' 'gnome-common' 'gtk-doc' 'qt5-base'
-             'cldr-emoji-annotation' 'unicode-character-database' 'unicode-emoji')
+             'cldr-emoji-annotation' 'unicode-character-database' 'unicode-emoji' 'git')
 options=('!emptydirs')
-source=("$pkgbase-$pkgver.tar.gz::https://github.com/ibus/ibus/archive/$pkgver.tar.gz")
-sha512sums=('972da51eb5702692f13b4f4cff51b3765890e5a91f936b9fa6b6cafaf00f4d078dc39f14bd00f3883203d295d826647c509024dd197d726d4def8d13d45d71b4')
+_commit=f591381e3c892947ecaffe9131b9039ab9014498  # master
+source=("git+https://github.com/ibus/ibus#commit=$_commit")
+sha512sums=('SKIP')
 
+pkgver() {
+  cd ibus
+  git describe --tags | sed 's/-/+/g'
+}
+
 prepare() {
-  cd ibus-$pkgver
+  cd ibus
   sed -i 's|$(libibus) $(libibus_emoji_dialog)|$(libibus_emoji_dialog) $(libibus)|' ui/gtk3/Makefile.am
+  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  cd ibus-$pkgver
-  ./autogen.sh \
+  cd ibus
+  ./configure \
     --prefix=/usr \
     --libexecdir=/usr/lib/ibus \
     --sysconfdir=/etc \
@@ -35,6 +42,7 @@
     --enable-python-library \
     --with-python=python3 \
     --with-ucd-dir=/usr/share/unicode/
+  sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 
@@ -42,7 +50,7 @@
   depends+=("libibus=$pkgver")
   install=ibus.install
 
-  cd ibus-$pkgver
+  cd ibus
   make DESTDIR="$pkgdir" install
   make -C src DESTDIR="$pkgdir" uninstall
   make -C bindings DESTDIR="$pkgdir" uninstall
@@ -52,9 +60,10 @@
 
 package_libibus() {
   pkgdesc="IBus support library"
-  depends=('glib2')
+  depends=(libg{lib,object,io}-2.0.so)
+  provides=('libibus-1.0.so')
 
-  cd ibus-$pkgver
+  cd ibus
   make -C src DESTDIR="$pkgdir" install
   make -C bindings DESTDIR="$pkgdir" install
   make DESTDIR="$pkgdir" install-pkgconfigDATA