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

[Jan Steffens]

    Date: Monday, April 4, 2022 @ 08:52:27
  Author: heftig
Revision: 441501

1.5.26-2: https://github.com/ibus/ibus/issues/2387

Modified:
  ibus/trunk/PKGBUILD

----------+
 PKGBUILD |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-04 08:44:02 UTC (rev 441500)
+++ PKGBUILD	2022-04-04 08:52:27 UTC (rev 441501)
@@ -3,7 +3,7 @@
 pkgbase=ibus
 pkgname=(ibus libibus)
 pkgver=1.5.26
-pkgrel=1
+pkgrel=2
 pkgdesc="Next Generation Input Bus for Linux"
 arch=('x86_64')
 url="https://github.com/ibus/ibus/wiki"
@@ -19,11 +19,15 @@
 
 pkgver() {
   cd ibus
-  git describe --tags | sed 's/-/+/g'
+  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
 }
 
 prepare() {
   cd ibus
+
+  # https://github.com/ibus/ibus/issues/2387
+  git cherry-pick -n 17648f0522910480b6c5dd4f5356ca1f6c160bf5
+
   NOCONFIGURE=1 ./autogen.sh
 }