Fix build failures

- Use correct nodejs version for building the package
- Update package build dependency
- Apply git lfs as it is needed according to official docs
- Fix the way checking out corresponding version from tag
- Use the new merged branch of better-sqlite3 from SignalApp to solve NodeJS
  dependency issue during build time
- Fix icon file paths on copying from src
- Remove 24x24 icon copying as the file doesn't exist
- Update build commands to update and install dependency with proper workflow
  on building package for NodeJS
- Bump version to 1.7.9

2 files changed, 21 insertions, 30 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 0e055aa63531..6cd0218246e7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
 # Maintainer: xXR01I1Xx <xxr01i1xx@tuta.io>
 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",