From 96b547b5dd6deb32345e707c08cdd4edbd69d93f Mon Sep 17 00:00:00 2001 From: xXR01I1Xx Date: Fri, 3 Apr 2020 12:20:47 +0200 Subject: [PATCH] Updated to version 1.0.6 --- .SRCINFO | 6 ++++-- PKGBUILD | 16 +++++++++++----- patch.diff.example | 13 +++++++++++++ 3 files changed, 28 insertions(+), 7 deletions(-) create mode 100644 patch.diff.example diff --git a/.SRCINFO b/.SRCINFO index bcb76ec889a1..01e9c64cda6f 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = session-desktop pkgdesc = Private messaging from your desktop - pkgver = 1.0.5 - pkgrel = 3 + pkgver = 1.0.6 + pkgrel = 1 url = https://getsession.org install = session-desktop.install arch = x86_64 @@ -23,8 +23,10 @@ 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 pkgname = session-desktop diff --git a/PKGBUILD b/PKGBUILD index 10610dc043e8..1b44a48b176d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,8 @@ # Maintainer: xXR01I1Xx pkgname=session-desktop -pkgver=1.0.5 -pkgrel=3 +pkgver=1.0.6 +pkgrel=1 +_commit=6438698 pkgdesc="Private messaging from your desktop" arch=(x86_64) url="https://getsession.org" @@ -14,13 +15,18 @@ 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') + 'session-desktop.desktop' + 'patch.diff.example') sha256sums=('SKIP' - '931e317b69e5c5ed3ef1f2ff0c82bf72b8706ab5ac50ad0564f3f164d7d5f7b8') + '931e317b69e5c5ed3ef1f2ff0c82bf72b8706ab5ac50ad0564f3f164d7d5f7b8' + '327e29f1c2e52dfa285545d1459ea92651cb6c23c4f4a7b897e9f4382802021a') prepare() { cd $srcdir/session-desktop - git checkout 0188252 + git checkout $_commit + echo "Applying patch" + sed "s/ver_placeholder/$pkgver/g" $srcdir/patch.diff.example > $srcdir/patch.diff + git apply $srcdir/patch.diff source /usr/share/nvm/init-nvm.sh && nvm install 10.13.0 } diff --git a/patch.diff.example b/patch.diff.example new file mode 100644 index 000000000000..e58f16995537 --- /dev/null +++ b/patch.diff.example @@ -0,0 +1,13 @@ +diff --git a/package.json b/package.json +index d05625c7..128028f8 100644 +--- a/package.json ++++ b/package.json +@@ -2,7 +2,7 @@ + "name": "session-messenger-desktop", + "productName": "Session", + "description": "Private messaging from your desktop", +- "version": "1.0.5", ++ "version": "ver_placeholder", + "license": "GPL-3.0", + "author": { + "name": "Loki Project",