Version bumped

3 files changed, 50 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 46bfea106032..5d25b67761d5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = tableplus
 	pkgdesc = Modern, native, and friendly GUI tool for relational databases (Alpha)
-	pkgver = 0.1.186
+	pkgver = 0.1.196
 	pkgrel = 1
 	url = https://tableplus.com/
 	arch = x86_64
@@ -8,9 +8,19 @@ pkgbase = tableplus
 	depends = gtksourceview3
 	depends = libgee
 	depends = gnome-keyring
+	noextract = libldap-2.5-0_2.5.13+dfsg-1ubuntu1_amd64.deb
+	noextract = libsasl2-2_2.1.28+dfsg-6ubuntu2_amd64.deb
 	source = LICENSE
-	source = tableplus_0.1.186_1_amd64.deb::https://deb.tableplus.com/debian/21/pool/main/t/tableplus/tableplus_0.1.186_amd64.deb
+	source = tableplus_0.1.196_1_amd64.deb::https://deb.tableplus.com/debian/22/pool/main/t/tableplus/tableplus_0.1.196_amd64.deb
+	source = http://archive.ubuntu.com/ubuntu/pool/main/o/openldap/libldap-2.5-0_2.5.13+dfsg-1ubuntu1_amd64.deb
+	source = http://archive.ubuntu.com/ubuntu/pool/main/c/cyrus-sasl2/libsasl2-2_2.1.28+dfsg-6ubuntu2_amd64.deb
+	source = https://archive.archlinux.org/packages/g/glib2/glib2-2.68.4-1-x86_64.pkg.tar.zst
+	source = tableplus.desktop
 	sha256sums = 76f924b1ebad5309ccf0dd7f3fe3d1b57ff3088b208a603900b0e240fdb5debb
-	sha256sums = 11b1ebb30a9fe7ddfd457fb4a9919f46b321606e47bebef39b043c91dd03a1d3
+	sha256sums = 9a839167851f8d9d4aa354989ac252a6d875e83eca4ca66f1d783b19bfdbf6f8
+	sha256sums = 574db9cb32afe6e49f2661beab8b0ad79aed7ce3d7566d7e82c24dd4d0adcef8
+	sha256sums = 78f563e42a1a044d107a27b0db94b7f23b8d601b6bcb1f95bcd9c7380d5379a0
+	sha256sums = e8e759bd9abb58c93067e199088077f3d6fa2c608ebc6f571cb9dd814812bcea
+	sha256sums = 83620b08e325418947f0007ecca7b981a988bfdac3f466db165f9262d1c0e5f4
 
 pkgname = tableplus
diff --git a/PKGBUILD b/PKGBUILD
index 5ffe1e53993f..557b1411c81d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,47 @@
-# Maintainer: Winston Astrachan <winston dot astrachan at gmail dot com>
-# Maintainer: Henry Pham <huy at tableplus dot com>
+# Maintainer: Lucas Saliés Brum <sistematico at gmail dot com>
+# Contributor: Loopsmark <loopsmark at merkur dot pm>
+# Contributor: Winston Astrachan <winston dot astrachan at gmail dot com>
+# Contributor: Henry Pham <huy at tableplus dot com>
 
 pkgname=tableplus
-pkgver=0.1.186
+pkgver=0.1.196
 pkgrel=1
 pkgdesc='Modern, native, and friendly GUI tool for relational databases (Alpha)'
 arch=('x86_64')
 url='https://tableplus.com/'
 license=('custom')
-depends=('gtksourceview3' 'libgee'  'gnome-keyring')
+depends=('gtksourceview3' 'libgee' 'gnome-keyring')
 source=('LICENSE'
-        "tableplus_${pkgver}_${pkgrel}_amd64.deb::https://deb.tableplus.com/debian/21/pool/main/t/tableplus/tableplus_${pkgver}_amd64.deb")
+    "tableplus_${pkgver}_${pkgrel}_amd64.deb::https://deb.tableplus.com/debian/22/pool/main/t/tableplus/tableplus_${pkgver}_amd64.deb"
+    'http://archive.ubuntu.com/ubuntu/pool/main/o/openldap/libldap-2.5-0_2.5.13+dfsg-1ubuntu1_amd64.deb'
+    'http://archive.ubuntu.com/ubuntu/pool/main/c/cyrus-sasl2/libsasl2-2_2.1.28+dfsg-6ubuntu2_amd64.deb'
+    'https://archive.archlinux.org/packages/g/glib2/glib2-2.68.4-1-x86_64.pkg.tar.zst'
+    'tableplus.desktop')
+noextract=('libldap-2.5-0_2.5.13+dfsg-1ubuntu1_amd64.deb' 'libsasl2-2_2.1.28+dfsg-6ubuntu2_amd64.deb')
 sha256sums=('76f924b1ebad5309ccf0dd7f3fe3d1b57ff3088b208a603900b0e240fdb5debb'
-            '11b1ebb30a9fe7ddfd457fb4a9919f46b321606e47bebef39b043c91dd03a1d3')
+            '9a839167851f8d9d4aa354989ac252a6d875e83eca4ca66f1d783b19bfdbf6f8'
+            '574db9cb32afe6e49f2661beab8b0ad79aed7ce3d7566d7e82c24dd4d0adcef8'
+            '78f563e42a1a044d107a27b0db94b7f23b8d601b6bcb1f95bcd9c7380d5379a0'
+            'e8e759bd9abb58c93067e199088077f3d6fa2c608ebc6f571cb9dd814812bcea'
+            '83620b08e325418947f0007ecca7b981a988bfdac3f466db165f9262d1c0e5f4')
 
 prepare() {
     tar -xf "${srcdir}/data.tar.zst"
+    ar p libldap-2.5-0_2.5.13+dfsg-1ubuntu1_amd64.deb data.tar.zst | tar x --zst
+    ar p libsasl2-2_2.1.28+dfsg-6ubuntu2_amd64.deb data.tar.zst | tar x --zst
 }
 
 package() {
-    cd "$srcdir"
+    install -d $pkgdir/opt/tableplus $pkgdir/usr/local/bin
+    install -Dm755 $srcdir/opt/tableplus/tableplus -t $pkgdir/opt/tableplus/
+    install -m755 $srcdir/opt/tableplus/tableplus -t $pkgdir/opt/tableplus/
+    install -Dm644 $srcdir/opt/tableplus/tableplus.desktop -t $pkgdir/usr/share/applications/
+    install -Dm644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+    install -Dm755 $srcdir/usr/lib/x86_64-linux-gnu/{liblber-2.5.so.0,libldap-2.5.so.0,libsasl2.so.2} -t $pkgdir/opt/tableplus/lib/
+    install -Dm755 $srcdir/usr/lib/libgio-2.0.so.0.6800.4 -t $pkgdir/opt/tableplus/lib/
 
-    install -d "${pkgdir}/opt/tableplus/"
-    install -Dm755 opt/tableplus/tableplus -t "$pkgdir/usr/local/bin/"
-    install -Dm644 opt/tableplus/tableplus.desktop -t "${pkgdir}/usr/share/applications/"
-    install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-    cp -r opt/tableplus/resource "${pkgdir}/opt/tableplus/"
+    cp -r $srcdir/opt/tableplus/resource $pkgdir/opt/tableplus/
 
-    echo "" >> "${pkgdir}/usr/share/applications/tableplus.desktop"
-    echo "Categories=Utility;Development;" >> "${pkgdir}/usr/share/applications/tableplus.desktop"
-    echo "Comment=Modern, native, and friendly GUI tool for relational databases (Alpha)" >> "${pkgdir}/usr/share/applications/tableplus.desktop"
-
-    find "${pkgdir}/opt/tableplus/" -type d -exec chmod 755 {} \;
-    find "${pkgdir}/opt/tableplus/" -type f -exec chmod 644 {} \;
+    echo -e '#!/bin/sh\n/usr/bin/env LD_LIBRARY_PATH=/opt/tableplus/lib /opt/tableplus/tableplus "$@"' >$pkgdir/usr/local/bin/tableplus
+    chmod 755 $pkgdir/usr/local/bin/tableplus
 }
diff --git a/tableplus.desktop b/tableplus.desktop
new file mode 100644
index 000000000000..50d0e09841be
--- /dev/null
+++ b/tableplus.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=TablePlus
+Type=Application
+Exec=/usr/local/bin/tableplus
+Icon=/opt/tableplus/resource/image/logo.png
+Terminal=false
+Categories=Utility;Development;
+Comment=Modern, native, and friendly GUI tool for relational databases (Alpha)
\ No newline at end of file