[upgpkg] obk-git 2.0.0.r30.gddeebe5-1

Split openbangla-keyboard-git

GitHub Discussion: #219

5 files changed, 95 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1c4643a50452..33f442b99148 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,43 @@
 pkgbase = openbangla-keyboard-git
 	pkgdesc = An OpenSource, Unicode compliant Bengali Input Method
-	pkgver = 2.0.0.r29.g3e39ff9
+	pkgver = 2.0.0.r30.gddeebe5
 	pkgrel = 1
 	url = https://openbangla.github.io
-	install = openbangla-keyboard.install
 	arch = x86_64
 	license = GPL3
 	makedepends = cmake
 	makedepends = rust
 	makedepends = git
-	depends = ibus
-	depends = qt5-base
+	makedepends = ibus
+	makedepends = fcitx5
+	makedepends = qt5-base
 	optdepends = ttf-indic-otf: fonts for Bangla and other Indic scripts
 	optdepends = ttf-freebanglafont: miscellaneous fonts for Bangla script
-	provides = openbangla-keyboard
-	conflicts = openbangla-keyboard
 	source = openbangla-keyboard::git+https://github.com/OpenBangla/OpenBangla-Keyboard#branch=develop
 	source = riti::git+https://github.com/OpenBangla/riti
 	sha256sums = SKIP
 	sha256sums = SKIP
 
 pkgname = openbangla-keyboard-git
+	depends = qt5-base
+	depends = openbangla-im=2.0.0.r30.gddeebe5
+	depends = hicolor-icon-theme
+	provides = openbangla-keyboard=2.0.0.r30.gddeebe5
+	conflicts = openbangla-keyboard
+
+pkgname = ibus-openbangla-git
+	install = ibus-openbangla.install
+	depends = ibus
+	depends = qt5-base
+	depends = openbangla-keyboard-git=2.0.0.r30.gddeebe5
+	provides = ibus-openbangla=2.0.0.r30.gddeebe5
+	provides = openbangla-im=2.0.0.r30.gddeebe5
+	conflicts = ibus-openbangla
 
+pkgname = fcitx5-openbangla-git
+	install = fcitx5-openbangla.install
+	depends = fcitx5
+	depends = openbangla-keyboard-git=2.0.0.r30.gddeebe5
+	provides = fcitx5-openbangla=2.0.0.r30.gddeebe5
+	provides = openbangla-im=2.0.0.r30.gddeebe5
+	conflicts = fcitx5-openbangla
diff --git a/.gitignore b/.gitignore
index 8f9fa7281b06..85bbe162710c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 *
-!openbangla-keyboard.install
 !PKGBUILD
 !.gitignore
 !.SRCINFO
+!fcitx5-openbangla.install
diff --git a/PKGBUILD b/PKGBUILD
index a6922a6e3341..a6a07b2d7abd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,29 @@
 # Maintainer: Ahmad Hasan Mubashshir <ahmubashshir@gmail.com>
 # pkg: git
-pkgname="openbangla-keyboard-git"
-pkgver=2.0.0.r29.g3e39ff9
+pkgbase="openbangla-keyboard-git"
+pkgname=(
+    "$pkgbase"
+    "ibus-openbangla-git"
+    "fcitx5-openbangla-git"
+)
+pkgver=2.0.0.r30.gddeebe5
 pkgrel=1
 pkgdesc="An OpenSource, Unicode compliant Bengali Input Method"
 arch=('x86_64')
 url="https://openbangla.github.io"
 license=('GPL3')
-provides=( 'openbangla-keyboard' )
-conflicts=( 'openbangla-keyboard' )
-depends=('ibus' 'qt5-base')
-makedepends=('cmake' 'rust' 'git')
+makedepends=('cmake' 'rust' 'git' 'ibus' 'fcitx5' 'qt5-base')
 optdepends=('ttf-indic-otf: fonts for Bangla and other Indic scripts'
             'ttf-freebanglafont: miscellaneous fonts for Bangla script')
-install="${pkgname%*-git}.install"
 source=(
-    "${pkgname%*-git}::git+https://github.com/OpenBangla/OpenBangla-Keyboard#branch=develop"
+    "${pkgbase%*-git}::git+https://github.com/OpenBangla/OpenBangla-Keyboard#branch=develop"
     "riti::git+https://github.com/OpenBangla/riti"
 )
 sha256sums=('SKIP'
             'SKIP')
 pkgver()
 {
-    cd "$srcdir/${pkgname%*-git}"
+    cd "$srcdir/${pkgbase%*-git}"
     (
         set -o pipefail
         git describe --tags --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
@@ -31,20 +32,63 @@ pkgver()
 }
 
 prepare() {
-    cd "$srcdir/${pkgname%*-git}"
+    cd "$srcdir/${pkgbase%*-git}"
     git submodule init
     git config submodule."src/engine/riti".url $srcdir/riti
     git submodule update
 }
 
 build() {
-    cd "$srcdir/${pkgname%*-git}"
     if [[ -d build ]]; then rm -rf build; fi
-    mkdir build && cd build
-    cmake ..
-    make
+    cmake -B build -S "${pkgbase%*-git}" \
+        -DBIN_DIR:PATH=/usr/bin \
+        -DLIBEXECDIR:PATH="/usr/lib/$pkgname" \
+        -DCMAKE_BUILD_TYPE=None \
+        -DCMAKE_SKIP_INSTALL_RPATH=YES \
+        -DCMAKE_SKIP_RPATH=YES \
+        -DENABLE_FCITX=YES \
+        -DENABLE_IBUS=YES
+    make -C build
 }
-package() {
-    cd "$srcdir/${pkgname%*-git}"
+package_openbangla-keyboard-git() {
+    depends=('qt5-base' "openbangla-im=$pkgver" 'hicolor-icon-theme')
+    provides=("${pkgbase%*-git}=$pkgver")
+    conflicts=("${pkgbase%*-git}")
+
     make -C build DESTDIR="$pkgdir" install
+    mv -t "$pkgdir/../" \
+            "$pkgdir/usr/lib" \
+            "$pkgdir/usr/share/ibus" \
+            "$pkgdir/usr/share/fcitx5"
+}
+
+package_ibus-openbangla-git () {
+    depends=('ibus' 'qt5-base' "$pkgbase=$pkgver")
+    conflicts=('ibus-openbangla')
+    install="ibus-openbangla.install"
+    provides=(
+        "ibus-openbangla=$pkgver"
+        "openbangla-im=$pkgver"
+    )
+
+    mkdir -p "$pkgdir/usr/"{lib,share}
+    mv "$pkgdir/../lib/openbangla-keyboard-git" "$pkgdir/usr/lib/ibus-openbangla-git"
+    mv "$pkgdir/usr/lib/ibus-openbangla-git/"ibus{-engine,}-openbangla
+    mv "$pkgdir/../ibus" "$pkgdir/usr/share/ibus"
+    sed -i '/<exec>/{s/\(openbangla\)-keyboard/ibus-\1/;s/-engine//;}' \
+        "$pkgdir/usr/share/ibus/component/openbangla.xml"
+}
+
+package_fcitx5-openbangla-git() {
+    depends=('fcitx5' "$pkgbase=$pkgver")
+    conflicts=('fcitx5-openbangla')
+    install="fcitx5-openbangla.install"
+    provides=(
+        "fcitx5-openbangla=$pkgver"
+        "openbangla-im=$pkgver"
+    )
+
+    mkdir -p "$pkgdir/usr/"{lib,share}
+    mv "$pkgdir/../lib/fcitx5" "$pkgdir/usr/lib/fcitx5"
+    mv "$pkgdir/../fcitx5" "$pkgdir/usr/share/fcitx5"
 }
diff --git a/fcitx5-openbangla.install b/fcitx5-openbangla.install
new file mode 100644
index 000000000000..1fb3fe9b3227
--- /dev/null
+++ b/fcitx5-openbangla.install
@@ -0,0 +1,7 @@
+post_install() {
+    echo "To enable OpenBangla-Keyboard:"
+    echo "1. Make sure fcitx5 is the active input method,"
+    echo "2. Add the OpenBangla-Keyboard engine to fcitx5 input method list."
+}
+
+# vim: ft=sh:ts=4:noet
diff --git a/openbangla-keyboard.install b/ibus-openbangla.install
index c5ce22cbad37..a96a150a1029 100644
--- a/openbangla-keyboard.install
+++ b/ibus-openbangla.install
@@ -3,3 +3,5 @@ post_install() {
     echo "1. Make sure ibus is the active input method,"
     echo "2. Add the OpenBangla-Keyboard engine to ibus input method list."
 }
+
+# vim: ft=sh:ts=4:noet