sync some changes from [community]

And enable tests in chroots + tolerate failed tests

3 files changed, 28 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 72f914dfa2cc..71ac1919679f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,20 @@
 pkgbase = ibus-chewing-git
 	pkgdesc = Chinese Chewing Engine for IBus Framework
-	pkgver = 1.5.1.r38.gf4c192d
+	pkgver = 1.6.1.r14.g8e17848
 	pkgrel = 2
 	url = https://github.com/definite/ibus-chewing
 	arch = i686
 	arch = x86_64
 	license = GPL
+	checkdepends = dbus
 	checkdepends = xorg-server-xvfb
 	makedepends = gob2
 	makedepends = cmake
 	makedepends = git
 	depends = ibus
 	depends = libchewing-git
-	provides = ibus-chewing
+	depends = gtk3
+	provides = ibus-chewing=1.6.1.r14.g8e17848
 	conflicts = ibus-chewing
 	source = git+https://github.com/definite/ibus-chewing.git
 	source = git+https://pagure.io/cmake-fedora.git
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index c9aa9b84843a..000000000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/cmake-fedora/
-/ibus-chewing/
diff --git a/PKGBUILD b/PKGBUILD
index 80b2934ee06e..5d79a2e34dfc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,6 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars@archlinux.org>
+# Maintainer: Chih-Hsuan Yen <yan12125@gmail.com>
+# Forked from community/ibus-chewing; original contributors:
+# Contributor: Felix Yan <felixonmars@archlinux.org>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Rainy <rainylau(at)gmail(dot)com>
 # Contributor: Lee.MaRS <leemars@gmail.com>
@@ -7,27 +8,26 @@
 
 _pkgname=ibus-chewing
 pkgname=$_pkgname-git
-pkgver=1.5.1.r38.gf4c192d
+pkgver=1.6.1.r14.g8e17848
 pkgrel=2
 pkgdesc='Chinese Chewing Engine for IBus Framework'
 arch=('i686' 'x86_64')
 license=('GPL')
 url='https://github.com/definite/ibus-chewing'
-depends=('ibus' 'libchewing-git')
+depends=('ibus' 'libchewing-git' 'gtk3')
 makedepends=('gob2' 'cmake' 'git')
-checkdepends=('xorg-server-xvfb')
+checkdepends=('dbus' 'xorg-server-xvfb')
 source=("git+https://github.com/definite/ibus-chewing.git"
         "git+https://pagure.io/cmake-fedora.git")
 sha512sums=('SKIP'
             'SKIP')
-provides=(ibus-chewing)
-conflicts=(ibus-chewing)
+provides=("$_pkgname=$pkgver")
+conflicts=("$_pkgname")
 
 pkgver() {
   cd $_pkgname
   ( set -o pipefail
-    git describe --long --tag 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//' ||
-    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+    git describe --long --tag 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//'
   )
 }
 
@@ -41,23 +41,28 @@ prepare() {
 
 build() {
   cd $_pkgname
-  cmake . -DCMAKE_INSTALL_PREFIX=/usr \
-    -DSYSCONF_INSTALL_DIR=/usr/share \
+
+  cmake -B build -S . \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=None \
     -DLIBEXEC_DIR=/usr/lib/ibus
-  make
-  make translations
+
+  # XXX: updated *.po files contain no translated strings. Maybe because fedora.zanata.org is down
+  # https://github.com/definite/ibus-chewing/issues/150
+  touch build/po/ibus-chewing.pot
+  cp -v po/*.po build/po/
+
+  make -C build
 }
 
 check() {
-  cd $_pkgname
-
-  # How to run dbus-daemon in clean chroots?
-  [[ -z "$DBUS_SESSION_BUS_ADDRESS" ]] && return
+  cd $_pkgname/build
 
-  GSETTINGS_SCHEMA_DIR="$srcdir/$_pkgname/bin/" xvfb-run make test
+  # Some tests fail due to a upstream issue https://github.com/definite/ibus-chewing/issues/154#issuecomment-756713451
+  GSETTINGS_SCHEMA_DIR="$srcdir/$_pkgname/build/bin/" xvfb-run --auto-display dbus-run-session make test || true
 }
 
 package() {
-  cd $_pkgname
+  cd $_pkgname/build
   make DESTDIR="$pkgdir" install
 }