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

[Felix Yan]

    Date: Tuesday, March 28, 2017 @ 09:36:30
  Author: felixonmars
Revision: 291745

upgpkg: ibus 1.5.15-1

Modified:
  ibus/trunk/PKGBUILD

----------+
 PKGBUILD |   41 +++++++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-28 08:17:21 UTC (rev 291744)
+++ PKGBUILD	2017-03-28 09:36:30 UTC (rev 291745)
@@ -3,19 +3,26 @@
 
 pkgbase=ibus
 pkgname=(ibus libibus)
-pkgver=1.5.14
-pkgrel=2
+pkgver=1.5.15
+pkgrel=1
 pkgdesc="Next Generation Input Bus for Linux"
 arch=('i686' 'x86_64')
 url="https://github.com/ibus/ibus/wiki"
 license=('LGPL')
-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' 'git' 'gnome-common' 'gtk-doc' 'gconf' 'qt5-base' 'nodejs-emojione')
+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' 'gconf' 'qt5-base'
+             'nodejs-emojione' 'cldr-emoji-annotation')
 options=('!emptydirs')
-source=("git+https://github.com/ibus/ibus.git#tag=$pkgver")
+source=("$pkgbase-$pkgver.tar.gz::https://github.com/ibus/ibus/archive/$pkgver.tar.gz")
+sha512sums=('4e8277943127058bda4c4864e3748d3fce6d65ca27d8101dbb7c0e9034c32b306b7921e1e95df98d2cf4dfa1a590659cdf2d019c0e1e91a19112e3374092ff44')
 
+prepare() {
+  sed -i 's|$(libibus) $(libibus_emoji_dialog)|$(libibus_emoji_dialog) $(libibus)|' ibus-$pkgver/ui/gtk3/Makefile.am
+}
+
 build() {
-  cd ${pkgbase}
+  cd ibus-$pkgver
   ./autogen.sh \
     --prefix=/usr \
     --libexecdir=/usr/lib/ibus \
@@ -35,12 +42,12 @@
   depends+=("libibus=$pkgver")
   install=ibus.install
 
-  cd ${pkgbase}
-  make DESTDIR="${pkgdir}" install
-  make -C src DESTDIR="${pkgdir}" uninstall
-  make -C bindings DESTDIR="${pkgdir}" uninstall
-  rm -r "$pkgdir/usr/lib/python2.7/site-packages/gi" # compiled pyc/pyo files were not cleaned
-  make DESTDIR="${pkgdir}" uninstall-pkgconfigDATA
+  cd ibus-$pkgver
+  make DESTDIR="$pkgdir" install
+  make -C src DESTDIR="$pkgdir" uninstall
+  make -C bindings DESTDIR="$pkgdir" uninstall
+  rm -r "$pkgdir"/usr/lib/python2.7/site-packages/gi # compiled pyc/pyo files were not cleaned
+  make DESTDIR="$pkgdir" uninstall-pkgconfigDATA
 }
 
 package_libibus() {
@@ -47,10 +54,8 @@
   pkgdesc="IBus support library"
   depends=('glib2')
 
-  cd ${pkgbase}
-  make -C src DESTDIR="${pkgdir}" install
-  make -C bindings DESTDIR="${pkgdir}" install
-  make DESTDIR="${pkgdir}" install-pkgconfigDATA
+  cd ibus-$pkgver
+  make -C src DESTDIR="$pkgdir" install
+  make -C bindings DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" install-pkgconfigDATA
 }
-
-sha512sums=('SKIP')