v1.2.0, remove some workarounds

3 files changed, 18 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a9b422cc46b6..69cdf7c28e52 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,16 @@
 pkgbase = cwtch-bin
 	pkgdesc = A decentralized, privacy-preserving, multi-party messaging protocol client (binary distribution)
-	pkgver = 1.0.0_16_gb1f81e4
-	pkgrel = 2
+	pkgver = 1.2.0
+	pkgrel = 1
 	url = https://cwtch.im
 	arch = x86_64
 	license = MIT
-	depends = tor
+	optdepends = tor: use system tor instead of packaged
+	provides = libcwtch-go
 	conflicts = cwtch
 	conflicts = cwtch-git
-	source = launch-cwtch.sh
-	sha512sums = 8d947083bf4f0b4c90d3f714e36c8d59dadf1f7d9599eb226cfd080f7c492fd5ca0a4f423589a20336d8307d9776486bf17105e4f316852581581da3305e55aa
-	source_x86_64 = https://cwtch.im/releases/cwtch-v1.0.0-16-gb1f81e4/cwtch-v1.0.0-16-gb1f81e4.tar.gz
-	sha512sums_x86_64 = 262a1ed3dfd36be3544d78d256fd658edf94371eadfa3691f564971c4e63be2d0a77c5cd4474c0a9ef89c79dc645e18aa657973b5060495eb0da77f4489064d4
+	conflicts = libcwtch-go
+	source_x86_64 = https://cwtch.im/releases/cwtch-v1.2/cwtch-v1.2.0.tar.gz
+	sha512sums_x86_64 = 4a904b6778c1c4bc81db57111fbd60197e5ccae4953502aff7e2405f8d7d0c5a5b89ffbffe806723f2174d66a632f388e598e83e4df3713bcde0c1b4979e2b70
 
 pkgname = cwtch-bin
-
diff --git a/PKGBUILD b/PKGBUILD
index 04ea2399dc3e..5569f0b266b4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,34 +3,32 @@
 _pkgname=cwtch
 pkgname=$_pkgname-bin
 
-_pkgver=1.0.0-16-gb1f81e4
+_pkgver=1.2.0
 pkgver="${_pkgver//-/_}"
-pkgrel=2
+pkgrel=1
 
 pkgdesc="A decentralized, privacy-preserving, multi-party messaging protocol client (binary distribution)"
-conflicts=('cwtch' 'cwtch-git')
+provides=('libcwtch-go')
+conflicts=('cwtch' 'cwtch-git' 'libcwtch-go')
 arch=('x86_64')
 url='https://cwtch.im'
 license=('MIT')
-depends=('tor')
-source=("launch-cwtch.sh")
-source_x86_64=("$url/releases/$_pkgname-v$_pkgver/$_pkgname-v$_pkgver.tar.gz")
-sha512sums=('8d947083bf4f0b4c90d3f714e36c8d59dadf1f7d9599eb226cfd080f7c492fd5ca0a4f423589a20336d8307d9776486bf17105e4f316852581581da3305e55aa')
-sha512sums_x86_64=('262a1ed3dfd36be3544d78d256fd658edf94371eadfa3691f564971c4e63be2d0a77c5cd4474c0a9ef89c79dc645e18aa657973b5060495eb0da77f4489064d4')
+optdepends=(
+    'tor: use system tor instead of packaged'
+)
+source_x86_64=("$url/releases/$_pkgname-v${_pkgver%.*}/$_pkgname-v$_pkgver.tar.gz")
+sha512sums_x86_64=('4a904b6778c1c4bc81db57111fbd60197e5ccae4953502aff7e2405f8d7d0c5a5b89ffbffe806723f2174d66a632f388e598e83e4df3713bcde0c1b4979e2b70')
 
 package() {
     cd "$srcdir/$_pkgname"
 
-    install -Dm0755 "$srcdir/launch-cwtch.sh" "$pkgdir/usr/bin/cwtch"
-
     # See install-sys.sh
+    install -Dm0755 "cwtch.sys.sh" "$pkgdir/usr/bin/cwtch"
     install -Dm0644 cwtch.png -t "$pkgdir/usr/share/icons/"
     install -dm0755 "$pkgdir/usr/share/cwtch/"
     cp -r data "$pkgdir/usr/share/cwtch/"
     install -dm0755 "$pkgdir/usr/lib/cwtch/"
-    install -Dm0755 cwtch -t "$pkgdir/usr/lib/cwtch/"
+    #install -Dm0755 cwtch -t "$pkgdir/usr/lib/cwtch/"
     cp -r lib/* "$pkgdir/usr/lib/cwtch/"
-    # We wrap `cwtch` so it works without launching via the .desktop file
-    sed -re 's,Exec=.*,Exec=/usr/bin/cwtch,' -i cwtch.sys.desktop
     install -Dm0644 cwtch.sys.desktop "$pkgdir/usr/share/applications/cwtch.desktop"
 }
diff --git a/launch-cwtch.sh b/launch-cwtch.sh
deleted file mode 100644
index 8abadfb3499c..000000000000
--- a/launch-cwtch.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash -eu
-
-exec env LD_LIBRARY_PATH=/usr/lib/cwtch /usr/lib/cwtch/cwtch