1.5.0

3 files changed, 10 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 01e9c64cda6f..c88b11e8135f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = session-desktop
 	pkgdesc = Private messaging from your desktop
-	pkgver = 1.0.6
+	pkgver = 1.5.0
 	pkgrel = 1
 	url = https://getsession.org
 	install = session-desktop.install
@@ -23,10 +23,8 @@ pkgbase = session-desktop
 	options = !strip
 	source = git+https://github.com/loki-project/session-desktop.git
 	source = session-desktop.desktop
-	source = patch.diff.example
 	sha256sums = SKIP
-	sha256sums = 931e317b69e5c5ed3ef1f2ff0c82bf72b8706ab5ac50ad0564f3f164d7d5f7b8
-	sha256sums = 327e29f1c2e52dfa285545d1459ea92651cb6c23c4f4a7b897e9f4382802021a
+	sha256sums = 0c409a40e96e7b1437e9b2f19fddfb63f587b0ad262560a02de32b1469c6d0ff
 
 pkgname = session-desktop
 
diff --git a/PKGBUILD b/PKGBUILD
index 1b44a48b176d..d14dcd798f94 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,7 @@
 # Maintainer: xXR01I1Xx <xxr01i1xx@tuta.io>
 pkgname=session-desktop
-pkgver=1.0.6
+pkgver=1.5.0
 pkgrel=1
-_commit=6438698
 pkgdesc="Private messaging from your desktop"
 arch=(x86_64)
 url="https://getsession.org"
@@ -15,18 +14,13 @@ conflicts=(session-desktop-bin session-desktop-git session-desktop-appimage)
 options=(!strip)
 install=$pkgname.install
 source=('git+https://github.com/loki-project/session-desktop.git'
-        'session-desktop.desktop'
-        'patch.diff.example')
+        'session-desktop.desktop')
 sha256sums=('SKIP'
-            '931e317b69e5c5ed3ef1f2ff0c82bf72b8706ab5ac50ad0564f3f164d7d5f7b8'
-            '327e29f1c2e52dfa285545d1459ea92651cb6c23c4f4a7b897e9f4382802021a')
+            '0c409a40e96e7b1437e9b2f19fddfb63f587b0ad262560a02de32b1469c6d0ff')
 
 prepare() {
   cd $srcdir/session-desktop
-  git checkout $_commit
-  echo "Applying patch"
-  sed "s/ver_placeholder/$pkgver/g" $srcdir/patch.diff.example > $srcdir/patch.diff
-  git apply $srcdir/patch.diff
+  git checkout $(git describe --tags)
   source /usr/share/nvm/init-nvm.sh && nvm install 10.13.0
 }
 
@@ -63,7 +57,7 @@ package() {
   cp $srcdir/session-desktop/build/icons/png/512x512.png $pkgdir/usr/share/icons/hicolor/512x512/apps/session-messenger-desktop.png
   cp $srcdir/session-desktop/build/icons/png/1024x1024.png $pkgdir/usr/share/icons/hicolor/1024x1024/apps/session-messenger-desktop.png
 
-  tar xf $srcdir/session-desktop/release/session-messenger-desktop-linux-x64-$pkgver.tar.xz -C $pkgdir/opt/
-  mv $pkgdir/opt/session-messenger-desktop-linux-x64-$pkgver $pkgdir/opt/Session
+  tar xf $srcdir/session-desktop/release/session-desktop-linux-x64-$pkgver.tar.xz -C $pkgdir/opt/
+  mv $pkgdir/opt/session-desktop-linux-x64-$pkgver $pkgdir/opt/Session
   cp $srcdir/session-desktop.desktop $pkgdir/usr/share/applications/
 }
diff --git a/session-desktop.desktop b/session-desktop.desktop
index 2b44f070ef9e..8087c36e22e4 100644
--- a/session-desktop.desktop
+++ b/session-desktop.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
 Name=Session
-Exec=/opt/Session/session-messenger-desktop %U
+Exec=/opt/Session/session-desktop %U
 Terminal=false
 Type=Application
-Icon=session-messenger-desktop
+Icon=session-desktop
 StartupWMClass=Session
 Comment=Private messaging from your desktop
 Categories=Network;