v16.0.139

2 files changed, 50 insertions, 109 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e61f98e179d3..c98b91b6d9c8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = keyman
 	pkgdesc = IBus engine supporting over 1,000 keyboard layouts (former KMFL)
-	pkgver = 13.0.103
-	pkgrel = 2
+	pkgver = 16.0.139
+	pkgrel = 1
 	url = https://keyman.com/linux/
 	arch = i686
 	arch = x86_64
@@ -10,13 +10,13 @@ pkgbase = keyman
 	makedepends = git
 	depends = ibus
 	depends = webkit2gtk
-	depends = help2man
 	depends = python-magic
 	depends = python-requests-cache
 	depends = python-numpy
 	depends = python-pillow
 	depends = python-qrcode
 	depends = python-lxml
+	depends = python-sentry_sdk
 	optdepends = keyman-onboard: on-screen keyboard
 	conflicts = kmflcomp
 	conflicts = libkmfl
@@ -24,8 +24,7 @@ pkgbase = keyman
 	replaces = kmflcomp
 	replaces = libkmfl
 	replaces = ibus-kmfl
-	source = keyman-13.0.103.tar.gz::https://github.com/keymanapp/keyman/archive/linux-release-stable-13.0.103.tar.gz
-	sha256sums = 30d9db0cd08aa4d6388f483aa32c58776fd9299acb542ded64da5d3d753f6949
+	source = keyman-16.0.139.tar.gz::https://downloads.keyman.com/linux/stable/16.0.139/keyman-16.0.139.tar.gz
+	sha256sums = 7c8036fc7bf50fde6c57735cc4bd128564a9a4669af582e4cacea612accce980
 
 pkgname = keyman
-
diff --git a/PKGBUILD b/PKGBUILD
index 159c1c30e78b..fec5dfee7c76 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,126 +1,67 @@
 # Maintainer: Vitrum <wqdxosty1yhj@bk.ru>
 
 pkgname=keyman
-pkgver=13.0.103
-pkgrel=2
+pkgver=16.0.139
+pkgrel=1
 pkgdesc="IBus engine supporting over 1,000 keyboard layouts (former KMFL)"
 arch=('i686' 'x86_64')
 url="https://keyman.com/linux/"
 license=('GPL')
-depends=('ibus' 'webkit2gtk' 'help2man' 'python-magic' 'python-requests-cache'
-         'python-numpy' 'python-pillow' 'python-qrcode' 'python-lxml')
+depends=('ibus' 'webkit2gtk' 'python-magic' 'python-requests-cache'
+         'python-numpy' 'python-pillow' 'python-qrcode' 'python-lxml' 
+         'python-sentry_sdk')
 makedepends=('meson' 'git')
 optdepends=('keyman-onboard: on-screen keyboard')
 replaces=('kmflcomp' 'libkmfl' 'ibus-kmfl')
 conflicts=('kmflcomp' 'libkmfl' 'ibus-kmfl')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/keymanapp/keyman/archive/linux-release-stable-$pkgver.tar.gz")
-sha256sums=('30d9db0cd08aa4d6388f483aa32c58776fd9299acb542ded64da5d3d753f6949')
+source=("$pkgname-$pkgver.tar.gz::https://downloads.keyman.com/linux/stable/16.0.139/keyman-$pkgver.tar.gz")
+sha256sums=('7c8036fc7bf50fde6c57735cc4bd128564a9a4669af582e4cacea612accce980')
 
 prepare() {
-    _basedir="$srcdir/keyman-linux-release-stable-${pkgver}/linux"
+    cd "$srcdir/keyman/core"
+    sed -i '44 {s/^/#/}' meson.build
 
-    cd "$_basedir/ibus-kmfl"
-    sed -i 's:${libexecdir}:/usr/lib/ibus:' src/kmfl.xml.in.in
-
-    cd "$_basedir/ibus-keyman"
-    sed -i 's:${libexecdir}:/usr/lib/ibus:' src/keyman.xml.in.in
-    
-    cd "$_basedir/keyman-config/keyman_config/"
-    _majorvers=$(cat "$_basedir/../resources/VERSION.md")
-    sed -e "s/_VERSION_/${pkgver}/" \
-        -e "s/_MAJORVERSION_/${_majorvers}/" \
-        version.py.in > version.py
 }
 
 build() {
-    _basedir="$srcdir/keyman-linux-release-stable-${pkgver}/linux"
-
-    # configure all subprojects
-    cd "$_basedir"
-    make reconf
+    cd "$srcdir/keyman/core"
+    #core/build.sh configure -- --prefix=/usr
+    arch-meson ./ build
+    meson compile -C build
 
-    # keyboardprocessor
-    echo
-    echo
-    echo "### keyboardprocessor #####################"
-    echo
-    echo
-    cd "$_basedir"
-    meson ../common/engine/keyboardprocessor keyboardprocessor
-    cd keyboardprocessor
-    meson configure -Dprefix=/usr
-    ninja reconfigure
-    ninja
+    cd "$srcdir/keyman/linux/ibus-keyman"
+    ./configure \
+        KEYMAN_PROC_CFLAGS=" \
+            -I$srcdir/keyman/core/build/include \
+            -I$srcdir/keyman/common/include \
+            -I$srcdir/keyman/core/include" \
+        --prefix=/usr \
+        --libexecdir=/usr/lib/ibus \
+        --datadir=/usr/share
+    make
 
-    # extract headers
-    mkdir -p "$srcdir/include/kmfl"
-    cp "$_basedir/kmflcomp/include/"*.h "$srcdir/include/kmfl"
-    cp "$_basedir/libkmfl/include/"*.h  "$srcdir/include/kmfl"
-
-    # keyman base binaries
-    for proj in kmflcomp libkmfl ibus-kmfl ibus-keyman; do
-        echo
-        echo
-        echo "### $proj #####################"
-        echo
-        echo
-        cd "$_basedir/$proj"
-        #autoreconf --install --force
-        ./configure \
-            CPPFLAGS="-I$srcdir/include" \
-            LDFLAGS="-L$_basedir/kmflcomp/src -L$_basedir/libkmfl/src" \
-            KEYMAN_PROC_CFLAGS="-I$_basedir/keyboardprocessor/include -I$_basedir/../common/engine/keyboardprocessor/include" \
-            KEYMAN_PROC_LIBS="-L$_basedir/libkmfl/src -L$_basedir/keyboardprocessor/src -lkmnkbp0" \
-            --prefix=/usr \
-            --libexecdir=/usr/lib/ibus \
-            --datadir=/usr/share
-        make
-    done
-
-    # keyman-config
-    echo
-    echo
-    echo "### keyman-config #####################"
-    echo
-    echo
-    cd "$_basedir/keyman-config"
+    cd "$srcdir/keyman/linux/keyman-config"
     python setup.py build
+    make man
+}
+
+check() {
+    cd "$srcdir/keyman/core"
+    # meson test -C build
 }
 
 package() {
-    _basedir="$srcdir/keyman-linux-release-stable-${pkgver}/linux"
+    cd "$srcdir/keyman/core"
+    meson install -C build --destdir "$pkgdir"
 
-    # keyboardprocessor
-    echo
-    echo
-    echo "### keyboardprocessor #####################"
-    echo
-    echo
-    cd "$_basedir"
-    DESTDIR="$pkgdir" ninja -C keyboardprocessor install
+    cd "$srcdir/keyman/linux/ibus-keyman"
+    make DESTDIR="$pkgdir/" install
 
-    # keyman base binaries
-    for proj in kmflcomp libkmfl ibus-kmfl ibus-keyman; do
-        echo
-        echo
-        echo "### $proj #####################"
-        echo
-        echo
-        cd "$_basedir/$proj"
-        make DESTDIR="$pkgdir/" install
-    done
-    
-    # keyman-config
-    echo
-    echo
-    echo "### keyman-config #####################"
-    echo
-    echo
-    cd "$_basedir/keyman-config"
+    cd "$srcdir/keyman/linux/keyman-config"
     python setup.py install --root="$pkgdir/" --optimize=1 --skip-build
-    make man
+
+    install -Dm644 --target-directory="$pkgdir/usr/share/man/man1" ../../debian/man/*.1
     install -Dm644 --target-directory="$pkgdir/usr/share/keyman/icons" keyman_config/icons/*
-    install -Dm644 --target-directory="$pkgdir/usr/share/man/man1" debian/man/*.1
     # icons app
     install -Dm644 --target-directory="$pkgdir/usr/share/icons/hicolor/24x24/apps" icons/24/km-config.png
     install -Dm644 --target-directory="$pkgdir/usr/share/icons/hicolor/32x32/apps" icons/32/km-config.png
@@ -134,13 +75,14 @@ package() {
     install -Dm644 --target-directory="$pkgdir/usr/share/icons/hicolor/48x48/mimetypes" icons/48/application-x-kmp.png
     install -Dm644 --target-directory="$pkgdir/usr/share/icons/hicolor/64x64/mimetypes" icons/64/application-x-kmp.png
     # desktop
-    install -Dm644 --target-directory="$pkgdir/usr/share/applications" debian/km-config.desktop
-    # mime
-    install -Dm644 debian/keyman.sharedmimeinfo "$pkgdir/usr/share/mime/packages/keyman.xml"
+    install -Dm644 --target-directory="$pkgdir/usr/share/applications" km-config.desktop 
+   # mime (only in github?)
+    # install -Dm644 debian/keyman.sharedmimeinfo "$pkgdir/usr/share/mime/packages/keyman.xml"
     # glib schemas
     install -Dm644 --target-directory="$pkgdir/usr/share/glib-2.0/schemas" com.keyman.gschema.xml
+    # bash completions
+    install -Dm644 --target-directory="$pkgdir/usr/share/bash-completion/completions/" *.bash-completion
+    for file in $pkgdir/usr/share/bash-completion/completions/*; do
+        mv -- "$file" "${file%%.bash-completion}"
+    done
 }
-
-#post_install() {
-#    ibus restart
-#}