From 427a04ea6383c2751f1ddeae028c3ad5157a2939 Mon Sep 17 00:00:00 2001 From: swirl Date: Mon, 2 May 2022 14:03:01 -0400 Subject: [PATCH 01/12] fix node ver+update --- .SRCINFO | 4 +++- PKGBUILD | 38 +++++++++++++++++++++----------------- patch.diff.example | 13 ------------- 3 files changed, 24 insertions(+), 31 deletions(-) delete mode 100644 patch.diff.example diff --git a/.SRCINFO b/.SRCINFO index bc72ffa0e477..16660676fa75 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,14 +1,16 @@ pkgbase = session-desktop pkgdesc = Private messaging from your desktop - pkgver = 1.7.6 + pkgver = 1.7.9 pkgrel = 1 url = https://getsession.org install = session-desktop.install arch = x86_64 license = GPL-3.0 makedepends = git + makedepends = git-lfs makedepends = nvm makedepends = yarn + makedepends = nodejs>=14.16.0 depends = libxtst depends = nss depends = alsa-lib diff --git a/PKGBUILD b/PKGBUILD index 0e055aa63531..6cd0218246e7 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,13 +1,13 @@ # Maintainer: xXR01I1Xx pkgname=session-desktop -pkgver=1.7.6 +pkgver=1.7.9 pkgrel=1 pkgdesc="Private messaging from your desktop" arch=(x86_64) url="https://getsession.org" license=('GPL-3.0') depends=(libxtst nss alsa-lib libxss libnotify xdg-utils) -makedepends=('git' 'nvm' 'yarn') +makedepends=('git' 'git-lfs' 'nvm' 'yarn' 'nodejs>=14.16.0') optdepends=('libappindicator-gtk3: for tray support') provides=(session-messenger-desktop) conflicts=(session-desktop-bin session-desktop-git session-desktop-appimage) @@ -20,17 +20,23 @@ sha256sums=('SKIP' prepare() { cd $srcdir/session-desktop - git checkout $(git describe --tags) - source /usr/share/nvm/init-nvm.sh && nvm install 10.19.0 + git checkout v$pkgver + source /usr/share/nvm/init-nvm.sh && nvm install 14.16.0 + git lfs install + nvm install + nvm use + yarn remove better-sqlite3 + yarn add https://github.com/signalapp/better-sqlite3.git#better-sqlcipher } build() { cd "$srcdir/session-desktop" - source /usr/share/nvm/init-nvm.sh && nvm use --delete-prefix v10.13.0 --silent + source /usr/share/nvm/init-nvm.sh && nvm use --delete-prefix v14.16.0 --silent export SIGNAL_ENV=production - yarn install --frozen-lockfile + yarn install yarn generate - yarn lint-full + npm install + yarn grunt $(yarn bin)/electron-builder --config.extraMetadata.environment=$SIGNAL_ENV --publish=never --config.directories.output=release --linux tar.xz } @@ -38,7 +44,6 @@ package() { mkdir -p $pkgdir/usr/share/applications mkdir -p $pkgdir/opt/ mkdir -p $pkgdir/usr/share/icons/hicolor/16x16/apps/ - mkdir -p $pkgdir/usr/share/icons/hicolor/24x24/apps/ mkdir -p $pkgdir/usr/share/icons/hicolor/32x32/apps/ mkdir -p $pkgdir/usr/share/icons/hicolor/48x48/apps/ mkdir -p $pkgdir/usr/share/icons/hicolor/64x64/apps/ @@ -47,15 +52,14 @@ package() { mkdir -p $pkgdir/usr/share/icons/hicolor/512x512/apps/ mkdir -p $pkgdir/usr/share/icons/hicolor/1024x1024/apps/ - cp $srcdir/session-desktop/build/icons/png/16x16.png $pkgdir/usr/share/icons/hicolor/16x16/apps/session-messenger-desktop.png - cp $srcdir/session-desktop/build/icons/png/24x24.png $pkgdir/usr/share/icons/hicolor/24x24/apps/session-messenger-desktop.png - cp $srcdir/session-desktop/build/icons/png/32x32.png $pkgdir/usr/share/icons/hicolor/32x32/apps/session-messenger-desktop.png - cp $srcdir/session-desktop/build/icons/png/48x48.png $pkgdir/usr/share/icons/hicolor/48x48/apps/session-messenger-desktop.png - cp $srcdir/session-desktop/build/icons/png/64x64.png $pkgdir/usr/share/icons/hicolor/64x64/apps/session-messenger-desktop.png - cp $srcdir/session-desktop/build/icons/png/128x128.png $pkgdir/usr/share/icons/hicolor/128x128/apps/session-messenger-desktop.png - cp $srcdir/session-desktop/build/icons/png/256x256.png $pkgdir/usr/share/icons/hicolor/256x256/apps/session-messenger-desktop.png - 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 + cp $srcdir/session-desktop/build/icons/icon_16x16.png $pkgdir/usr/share/icons/hicolor/16x16/apps/session-messenger-desktop.png + cp $srcdir/session-desktop/build/icons/icon_32x32.png $pkgdir/usr/share/icons/hicolor/32x32/apps/session-messenger-desktop.png + cp $srcdir/session-desktop/build/icons/icon_48x48.png $pkgdir/usr/share/icons/hicolor/48x48/apps/session-messenger-desktop.png + cp $srcdir/session-desktop/build/icons/icon_64x64.png $pkgdir/usr/share/icons/hicolor/64x64/apps/session-messenger-desktop.png + cp $srcdir/session-desktop/build/icons/icon_128x128.png $pkgdir/usr/share/icons/hicolor/128x128/apps/session-messenger-desktop.png + cp $srcdir/session-desktop/build/icons/icon_256x256.png $pkgdir/usr/share/icons/hicolor/256x256/apps/session-messenger-desktop.png + cp $srcdir/session-desktop/build/icons/icon_512x512.png $pkgdir/usr/share/icons/hicolor/512x512/apps/session-messenger-desktop.png + cp $srcdir/session-desktop/build/icons/icon_1024x1024.png $pkgdir/usr/share/icons/hicolor/1024x1024/apps/session-messenger-desktop.png 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 diff --git a/patch.diff.example b/patch.diff.example deleted file mode 100644 index e58f16995537..000000000000 --- a/patch.diff.example +++ /dev/null @@ -1,13 +0,0 @@ -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", From 93eebb5e20c42dbe42f3c94e1947595d07dc0824 Mon Sep 17 00:00:00 2001 From: swirl Date: Mon, 2 May 2022 14:07:52 -0400 Subject: [PATCH 02/12] Updated to 1.8.4 This was an auto-update by https://github.com/Icelk/aur-updater --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 16660676fa75..1388774ea508 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = session-desktop pkgdesc = Private messaging from your desktop - pkgver = 1.7.9 + pkgver = 1.8.4 pkgrel = 1 url = https://getsession.org install = session-desktop.install diff --git a/PKGBUILD b/PKGBUILD index 6cd0218246e7..6ae60876db6e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: xXR01I1Xx pkgname=session-desktop -pkgver=1.7.9 +pkgver=1.8.4 pkgrel=1 pkgdesc="Private messaging from your desktop" arch=(x86_64) From b92170f3894cfef6611e88fa6d937fa9e28a26f2 Mon Sep 17 00:00:00 2001 From: swirl Date: Wed, 18 May 2022 01:00:12 -0400 Subject: [PATCH 03/12] Updated to 1.8.5 This was an auto-update by https://github.com/Icelk/aur-updater --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 1388774ea508..9e527c07926e 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = session-desktop pkgdesc = Private messaging from your desktop - pkgver = 1.8.4 + pkgver = 1.8.5 pkgrel = 1 url = https://getsession.org install = session-desktop.install diff --git a/PKGBUILD b/PKGBUILD index 6ae60876db6e..df0a18f4db02 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: xXR01I1Xx pkgname=session-desktop -pkgver=1.8.4 +pkgver=1.8.5 pkgrel=1 pkgdesc="Private messaging from your desktop" arch=(x86_64) From 0ece29d7876321ab81a6e3b71dfded6eda8da607 Mon Sep 17 00:00:00 2001 From: swirl Date: Thu, 19 May 2022 23:00:11 -0400 Subject: [PATCH 04/12] Updated to 1.8.6 This was an auto-update by https://github.com/Icelk/aur-updater --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 9e527c07926e..a083575625bd 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = session-desktop pkgdesc = Private messaging from your desktop - pkgver = 1.8.5 + pkgver = 1.8.6 pkgrel = 1 url = https://getsession.org install = session-desktop.install diff --git a/PKGBUILD b/PKGBUILD index df0a18f4db02..5979a0ca0e53 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: xXR01I1Xx pkgname=session-desktop -pkgver=1.8.5 +pkgver=1.8.6 pkgrel=1 pkgdesc="Private messaging from your desktop" arch=(x86_64) From 25a1d3affb7e8ec8176b058ccbc844a240d5360f Mon Sep 17 00:00:00 2001 From: swirl Date: Wed, 10 Aug 2022 01:00:08 -0400 Subject: [PATCH 05/12] Updated to 1.9.0 This was an auto-update by https://github.com/Icelk/aur-updater --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index a083575625bd..51e119ddf7e2 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = session-desktop pkgdesc = Private messaging from your desktop - pkgver = 1.8.6 + pkgver = 1.9.0 pkgrel = 1 url = https://getsession.org install = session-desktop.install diff --git a/PKGBUILD b/PKGBUILD index 5979a0ca0e53..281bac86c206 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: xXR01I1Xx pkgname=session-desktop -pkgver=1.8.6 +pkgver=1.9.0 pkgrel=1 pkgdesc="Private messaging from your desktop" arch=(x86_64) From 6085b121ecf580f79854c1fa98f809c1f81a1d7a Mon Sep 17 00:00:00 2001 From: swirl Date: Fri, 12 Aug 2022 03:00:08 -0400 Subject: [PATCH 06/12] Updated to 1.9.1 This was an auto-update by https://github.com/Icelk/aur-updater --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 51e119ddf7e2..42e01c586e37 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = session-desktop pkgdesc = Private messaging from your desktop - pkgver = 1.9.0 + pkgver = 1.9.1 pkgrel = 1 url = https://getsession.org install = session-desktop.install diff --git a/PKGBUILD b/PKGBUILD index 281bac86c206..1fcf52093a29 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: xXR01I1Xx pkgname=session-desktop -pkgver=1.9.0 +pkgver=1.9.1 pkgrel=1 pkgdesc="Private messaging from your desktop" arch=(x86_64) From b61a21f181a5de9a419bbedea667d530eb8ce4e4 Mon Sep 17 00:00:00 2001 From: swirl Date: Tue, 6 Sep 2022 00:00:08 -0400 Subject: [PATCH 07/12] Updated to 1.10.0 This was an auto-update by https://github.com/Icelk/aur-updater --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 42e01c586e37..06d9b44ed7cf 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = session-desktop pkgdesc = Private messaging from your desktop - pkgver = 1.9.1 + pkgver = 1.10.0 pkgrel = 1 url = https://getsession.org install = session-desktop.install diff --git a/PKGBUILD b/PKGBUILD index 1fcf52093a29..65a802b12b27 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: xXR01I1Xx pkgname=session-desktop -pkgver=1.9.1 +pkgver=1.10.0 pkgrel=1 pkgdesc="Private messaging from your desktop" arch=(x86_64) From 6477083e6f67c906e5e369d2292d178fa5cf1962 Mon Sep 17 00:00:00 2001 From: swirl Date: Mon, 19 Sep 2022 06:00:07 -0400 Subject: [PATCH 08/12] Updated to 1.10.1 This was an auto-update by https://github.com/Icelk/aur-updater --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 06d9b44ed7cf..988601389dd9 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = session-desktop pkgdesc = Private messaging from your desktop - pkgver = 1.10.0 + pkgver = 1.10.1 pkgrel = 1 url = https://getsession.org install = session-desktop.install diff --git a/PKGBUILD b/PKGBUILD index 65a802b12b27..ef50213cd4e2 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: xXR01I1Xx pkgname=session-desktop -pkgver=1.10.0 +pkgver=1.10.1 pkgrel=1 pkgdesc="Private messaging from your desktop" arch=(x86_64) From c944a9c71988aefae8f404f1d5f734e6a86132f0 Mon Sep 17 00:00:00 2001 From: swirl Date: Wed, 19 Oct 2022 03:00:08 -0400 Subject: [PATCH 09/12] Updated to 1.10.3 This was an auto-update by https://github.com/Icelk/aur-updater --- .SRCINFO | 2 +- PKGBUILD | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 988601389dd9..79b7d0d33225 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = session-desktop pkgdesc = Private messaging from your desktop - pkgver = 1.10.1 + pkgver = 1.10.3 pkgrel = 1 url = https://getsession.org install = session-desktop.install diff --git a/PKGBUILD b/PKGBUILD index ef50213cd4e2..44e62f2e2fa8 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: xXR01I1Xx pkgname=session-desktop -pkgver=1.10.1 +pkgver=1.10.3 pkgrel=1 pkgdesc="Private messaging from your desktop" arch=(x86_64) @@ -21,7 +21,7 @@ sha256sums=('SKIP' prepare() { cd $srcdir/session-desktop git checkout v$pkgver - source /usr/share/nvm/init-nvm.sh && nvm install 14.16.0 + source /usr/share/nvm/init-nvm.sh && nvm install 16 git lfs install nvm install nvm use @@ -31,7 +31,7 @@ prepare() { build() { cd "$srcdir/session-desktop" - source /usr/share/nvm/init-nvm.sh && nvm use --delete-prefix v14.16.0 --silent + source /usr/share/nvm/init-nvm.sh && nvm use --delete-prefix v16 --silent export SIGNAL_ENV=production yarn install yarn generate From 61ced7cde5ceb7bd6cfbce4e9778dfe2e40c73eb Mon Sep 17 00:00:00 2001 From: swirl Date: Sun, 6 Nov 2022 23:00:08 -0500 Subject: [PATCH 10/12] Updated to 1.10.4 This was an auto-update by https://github.com/Icelk/aur-updater --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 79b7d0d33225..45020181cc9d 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = session-desktop pkgdesc = Private messaging from your desktop - pkgver = 1.10.3 + pkgver = 1.10.4 pkgrel = 1 url = https://getsession.org install = session-desktop.install diff --git a/PKGBUILD b/PKGBUILD index 44e62f2e2fa8..49c30db8fff9 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: xXR01I1Xx pkgname=session-desktop -pkgver=1.10.3 +pkgver=1.10.4 pkgrel=1 pkgdesc="Private messaging from your desktop" arch=(x86_64) From a30776fc87204cb512d8be6e7314d55533b90032 Mon Sep 17 00:00:00 2001 From: Antony Ho Date: Sun, 15 May 2022 22:28:25 +0200 Subject: [PATCH 11/12] Update to 1.8.4 - Also remove the modification on nodejs dependency fix --- .SRCINFO | 2 +- PKGBUILD | 40 ++++++++++++++-------------------------- session-desktop.desktop | 2 +- session-desktop.install | 2 -- 4 files changed, 16 insertions(+), 30 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 45020181cc9d..c76a53d1250e 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -26,6 +26,6 @@ pkgbase = session-desktop source = git+https://github.com/loki-project/session-desktop.git source = session-desktop.desktop sha256sums = SKIP - sha256sums = 0c409a40e96e7b1437e9b2f19fddfb63f587b0ad262560a02de32b1469c6d0ff + sha256sums = fde2e8851d93a7a8ca2dc0338535362da3240208262d08155a594500e41a199b pkgname = session-desktop diff --git a/PKGBUILD b/PKGBUILD index 49c30db8fff9..0e8d9d55af2e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -16,7 +16,7 @@ install=$pkgname.install source=('git+https://github.com/loki-project/session-desktop.git' 'session-desktop.desktop') sha256sums=('SKIP' - '0c409a40e96e7b1437e9b2f19fddfb63f587b0ad262560a02de32b1469c6d0ff') + 'fde2e8851d93a7a8ca2dc0338535362da3240208262d08155a594500e41a199b') prepare() { cd $srcdir/session-desktop @@ -25,8 +25,6 @@ prepare() { git lfs install nvm install nvm use - yarn remove better-sqlite3 - yarn add https://github.com/signalapp/better-sqlite3.git#better-sqlcipher } build() { @@ -35,33 +33,23 @@ build() { export SIGNAL_ENV=production yarn install yarn generate - npm install - yarn grunt + export SIGNAL_ENV=production $(yarn bin)/electron-builder --config.extraMetadata.environment=$SIGNAL_ENV --publish=never --config.directories.output=release --linux tar.xz } package() { - mkdir -p $pkgdir/usr/share/applications - mkdir -p $pkgdir/opt/ - mkdir -p $pkgdir/usr/share/icons/hicolor/16x16/apps/ - mkdir -p $pkgdir/usr/share/icons/hicolor/32x32/apps/ - mkdir -p $pkgdir/usr/share/icons/hicolor/48x48/apps/ - mkdir -p $pkgdir/usr/share/icons/hicolor/64x64/apps/ - mkdir -p $pkgdir/usr/share/icons/hicolor/128x128/apps/ - mkdir -p $pkgdir/usr/share/icons/hicolor/256x256/apps/ - mkdir -p $pkgdir/usr/share/icons/hicolor/512x512/apps/ - mkdir -p $pkgdir/usr/share/icons/hicolor/1024x1024/apps/ + install -d "${pkgdir}/usr/"{lib,bin} - cp $srcdir/session-desktop/build/icons/icon_16x16.png $pkgdir/usr/share/icons/hicolor/16x16/apps/session-messenger-desktop.png - cp $srcdir/session-desktop/build/icons/icon_32x32.png $pkgdir/usr/share/icons/hicolor/32x32/apps/session-messenger-desktop.png - cp $srcdir/session-desktop/build/icons/icon_48x48.png $pkgdir/usr/share/icons/hicolor/48x48/apps/session-messenger-desktop.png - cp $srcdir/session-desktop/build/icons/icon_64x64.png $pkgdir/usr/share/icons/hicolor/64x64/apps/session-messenger-desktop.png - cp $srcdir/session-desktop/build/icons/icon_128x128.png $pkgdir/usr/share/icons/hicolor/128x128/apps/session-messenger-desktop.png - cp $srcdir/session-desktop/build/icons/icon_256x256.png $pkgdir/usr/share/icons/hicolor/256x256/apps/session-messenger-desktop.png - cp $srcdir/session-desktop/build/icons/icon_512x512.png $pkgdir/usr/share/icons/hicolor/512x512/apps/session-messenger-desktop.png - cp $srcdir/session-desktop/build/icons/icon_1024x1024.png $pkgdir/usr/share/icons/hicolor/1024x1024/apps/session-messenger-desktop.png + cp -a $srcdir/session-desktop/release/linux-unpacked $pkgdir/usr/lib/$pkgname - 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/ + install -Dm644 $srcdir/session-desktop/build/session_icon_source_1024px.png $pkgdir/usr/share/pixmaps/$pkgname.png + + for size in 16 32 48 64 128 256 512 1024; do + install -Dm644 "${srcdir}/session-desktop/build/icons/icon_${size}x${size}.png" \ + "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/${pkgname}.png" + done + + install -Dm644 $srcdir/session-desktop.desktop $pkgdir/usr/share/applications/${pkgname}.desktop + + ln -s "/usr/lib/${pkgname}/session-desktop" "${pkgdir}/usr/bin/" } diff --git a/session-desktop.desktop b/session-desktop.desktop index 8087c36e22e4..42987497f25e 100644 --- a/session-desktop.desktop +++ b/session-desktop.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Name=Session -Exec=/opt/Session/session-desktop %U +Exec=session-desktop %U Terminal=false Type=Application Icon=session-desktop diff --git a/session-desktop.install b/session-desktop.install index 080ddd42bc24..b3c52f69d91f 100644 --- a/session-desktop.install +++ b/session-desktop.install @@ -1,5 +1,4 @@ post_install() { - ln -sf /opt/Session/session-messenger-desktop /usr/bin/session-messenger-desktop update-desktop-database /usr/share/applications gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } @@ -9,7 +8,6 @@ post_upgrade() { } post_remove() { - rm -f '/usr/bin/session-messenger-desktop' update-desktop-database /usr/share/applications gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } From 0214a643cacb7af0ffbd5274ce404fe9bf7ffbc8 Mon Sep 17 00:00:00 2001 From: Antony Ho Date: Tue, 10 Oct 2023 01:26:14 +0200 Subject: [PATCH 12/12] Update build script according to upstream changes on package.json - Update Session Desktop version - Update NodeJS required version - Update build script - Add workaround in build script for electron-builder Linux target --- .SRCINFO | 4 ++-- PKGBUILD | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index c76a53d1250e..5698258af08e 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = session-desktop pkgdesc = Private messaging from your desktop - pkgver = 1.10.4 + pkgver = 1.11.4 pkgrel = 1 url = https://getsession.org install = session-desktop.install @@ -10,7 +10,7 @@ pkgbase = session-desktop makedepends = git-lfs makedepends = nvm makedepends = yarn - makedepends = nodejs>=14.16.0 + makedepends = nodejs depends = libxtst depends = nss depends = alsa-lib diff --git a/PKGBUILD b/PKGBUILD index 0e8d9d55af2e..77312fa8c193 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,13 +1,13 @@ -# Maintainer: xXR01I1Xx +# Maintainer: Antony Ho pkgname=session-desktop -pkgver=1.10.4 +pkgver=1.11.4 pkgrel=1 pkgdesc="Private messaging from your desktop" arch=(x86_64) url="https://getsession.org" license=('GPL-3.0') depends=(libxtst nss alsa-lib libxss libnotify xdg-utils) -makedepends=('git' 'git-lfs' 'nvm' 'yarn' 'nodejs>=14.16.0') +makedepends=('git' 'git-lfs' 'nvm' 'yarn' 'nodejs') optdepends=('libappindicator-gtk3: for tray support') provides=(session-messenger-desktop) conflicts=(session-desktop-bin session-desktop-git session-desktop-appimage) @@ -21,20 +21,20 @@ sha256sums=('SKIP' prepare() { cd $srcdir/session-desktop git checkout v$pkgver - source /usr/share/nvm/init-nvm.sh && nvm install 16 + source /usr/share/nvm/init-nvm.sh git lfs install nvm install nvm use } build() { - cd "$srcdir/session-desktop" - source /usr/share/nvm/init-nvm.sh && nvm use --delete-prefix v16 --silent - export SIGNAL_ENV=production + cd $srcdir/session-desktop + source /usr/share/nvm/init-nvm.sh && nvm use --delete-prefix yarn install - yarn generate export SIGNAL_ENV=production - $(yarn bin)/electron-builder --config.extraMetadata.environment=$SIGNAL_ENV --publish=never --config.directories.output=release --linux tar.xz + yarn build-everything + sed -i 's/\"target\": \[\"deb\", \"rpm\", \"freebsd\"\]/\"target\": \"tar.xz\"/g' package.json + $(yarn bin)/electron-builder --config.extraMetadata.environment=$SIGNAL_ENV --publish=never --config.directories.output=release --linux } package() {