[arch-commits] Commit in ibus/repos/extra-x86_64 (4 files)

[Jan Steffens]

    Date: Wednesday, May 20, 2020 @ 14:19:41
  Author: heftig
Revision: 387025

archrelease: copy trunk to extra-x86_64

Added:
  ibus/repos/extra-x86_64/PKGBUILD
    (from rev 387024, ibus/trunk/PKGBUILD)
  ibus/repos/extra-x86_64/ibus.install
    (from rev 387024, ibus/trunk/ibus.install)
Deleted:
  ibus/repos/extra-x86_64/PKGBUILD
  ibus/repos/extra-x86_64/ibus.install

--------------+
 PKGBUILD     |  131 ++++++++++++++++++++++++++++++---------------------------
 ibus.install |   32 ++++++-------
 2 files changed, 86 insertions(+), 77 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-20 14:16:40 UTC (rev 387024)
+++ PKGBUILD	2020-05-20 14:19:41 UTC (rev 387025)
@@ -1,61 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgbase=ibus
-pkgname=(ibus libibus)
-pkgver=1.5.22
-pkgrel=1
-pkgdesc="Next Generation Input Bus for Linux"
-arch=('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' 'gnome-common' 'gtk-doc' 'qt5-base'
-             'cldr-emoji-annotation' 'unicode-character-database' 'unicode-emoji')
-options=('!emptydirs')
-source=("$pkgbase-$pkgver.tar.gz::https://github.com/ibus/ibus/archive/$pkgver.tar.gz")
-sha512sums=('972da51eb5702692f13b4f4cff51b3765890e5a91f936b9fa6b6cafaf00f4d078dc39f14bd00f3883203d295d826647c509024dd197d726d4def8d13d45d71b4')
-
-prepare() {
-  cd ibus-$pkgver
-  sed -i 's|$(libibus) $(libibus_emoji_dialog)|$(libibus_emoji_dialog) $(libibus)|' ui/gtk3/Makefile.am
-}
-
-build() {
-  cd ibus-$pkgver
-  ./autogen.sh \
-    --prefix=/usr \
-    --libexecdir=/usr/lib/ibus \
-    --sysconfdir=/etc \
-    --enable-dconf \
-    --enable-wayland \
-    --enable-gtk-doc \
-    --disable-memconf \
-    --enable-ui \
-    --enable-python-library \
-    --with-python=python3 \
-    --with-ucd-dir=/usr/share/unicode/
-  make
-}
-
-package_ibus() {
-  depends+=("libibus=$pkgver")
-  install=ibus.install
-
-  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() {
-  pkgdesc="IBus support library"
-  depends=('glib2')
-
-  cd ibus-$pkgver
-  make -C src DESTDIR="$pkgdir" install
-  make -C bindings DESTDIR="$pkgdir" install
-  make DESTDIR="$pkgdir" install-pkgconfigDATA
-}

Copied: ibus/repos/extra-x86_64/PKGBUILD (from rev 387024, ibus/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-05-20 14:19:41 UTC (rev 387025)
@@ -0,0 +1,70 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgbase=ibus
+pkgname=(ibus libibus)
+pkgver=1.5.22+8+gf591381e
+pkgrel=1
+pkgdesc="Next Generation Input Bus for Linux"
+arch=('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' 'gnome-common' 'gtk-doc' 'qt5-base'
+             'cldr-emoji-annotation' 'unicode-character-database' 'unicode-emoji' 'git')
+options=('!emptydirs')
+_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
+  sed -i 's|$(libibus) $(libibus_emoji_dialog)|$(libibus_emoji_dialog) $(libibus)|' ui/gtk3/Makefile.am
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+  cd ibus
+  ./configure \
+    --prefix=/usr \
+    --libexecdir=/usr/lib/ibus \
+    --sysconfdir=/etc \
+    --enable-dconf \
+    --enable-wayland \
+    --enable-gtk-doc \
+    --disable-memconf \
+    --enable-ui \
+    --enable-python-library \
+    --with-python=python3 \
+    --with-ucd-dir=/usr/share/unicode/
+  sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make
+}
+
+package_ibus() {
+  depends+=("libibus=$pkgver")
+  install=ibus.install
+
+  cd ibus
+  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() {
+  pkgdesc="IBus support library"
+  depends=(libg{lib,object,io}-2.0.so)
+  provides=('libibus-1.0.so')
+
+  cd ibus
+  make -C src DESTDIR="$pkgdir" install
+  make -C bindings DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" install-pkgconfigDATA
+}

Deleted: ibus.install
===================================================================
--- ibus.install	2020-05-20 14:16:40 UTC (rev 387024)
+++ ibus.install	2020-05-20 14:19:41 UTC (rev 387025)
@@ -1,16 +0,0 @@
-post_install() {
-  gtk-query-immodules-2.0 --update-cache
-  gtk-query-immodules-3.0 --update-cache
-
-  dconf update
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-
-  rm -f etc/dconf/db/ibus
-}

Copied: ibus/repos/extra-x86_64/ibus.install (from rev 387024, ibus/trunk/ibus.install)
===================================================================
--- ibus.install	                        (rev 0)
+++ ibus.install	2020-05-20 14:19:41 UTC (rev 387025)
@@ -0,0 +1,16 @@
+post_install() {
+  gtk-query-immodules-2.0 --update-cache
+  gtk-query-immodules-3.0 --update-cache
+
+  dconf update
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+
+  rm -f etc/dconf/db/ibus
+}