[arch-commits] Commit in signal-desktop/trunk (PKGBUILD signal-desktop-wrapper.sh)

[Jan Steffens]

    Date: Sunday, August 22, 2021 @ 20:08:53
  Author: heftig
Revision: 1004235

5.14.0-2: apply a better fix for our sqlcipher woes

Modified:
  signal-desktop/trunk/PKGBUILD
Deleted:
  signal-desktop/trunk/signal-desktop-wrapper.sh

---------------------------+
 PKGBUILD                  |   20 ++++++++------------
 signal-desktop-wrapper.sh |    4 ----
 2 files changed, 8 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-08-22 17:13:05 UTC (rev 1004234)
+++ PKGBUILD	2021-08-22 20:08:53 UTC (rev 1004235)
@@ -4,7 +4,7 @@
 pkgname=signal-desktop
 _pkgname=Signal-Desktop
 pkgver=5.14.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Signal Private Messenger for Linux"
 license=('AGPL3')
 arch=('x86_64')
@@ -15,16 +15,13 @@
   "${pkgname}-${pkgver}.tar.gz::https://github.com/signalapp/${_pkgname}/archive/v${pkgver}.tar.gz"
   "${pkgname}.desktop"
   "expire-from-source-date-epoch.patch"
-  "signal-desktop-wrapper.sh"
 )
 sha512sums=('9e6717591882c0720c9b05f34379a3fc6198b1426129e8cc256b6bfd102f9559c38f92fc6469db9dfa5b7902a3abb139475919f3d82412505d7dfb296660f7dc'
             '90cfee563a985bc73c4e7984715d190ae0b5c7aa887a7dc15c665980ca5cc8420b02f6c7a54e032c29e18876d5d51cfbe5027a9f0a59de3903f50fd469d73ce0'
-            '6673066172d6c367961f3e2d762dd483e51a9f733d52e27d0569b333ad397375fd41d61b8a414b8c9e8dbba560a6c710678b3d105f8d285cb94d70561368d5a2'
-            '14af85b52b0cdcb1e8b533d08b7ab06c86ec769f371405bd78c103690dcda7772d84eca5a719b55f959b4f7b27b4e42d3d78a55cb3ae79ae993f25dc9bda0ae5')
+            '6673066172d6c367961f3e2d762dd483e51a9f733d52e27d0569b333ad397375fd41d61b8a414b8c9e8dbba560a6c710678b3d105f8d285cb94d70561368d5a2')
 b2sums=('a36fff4879a2ad507e02b19f37bbf3473ea6220d4e284e337694e6fa2f9ef1da775ba2f059ee347aca71d478759bee72a32d7abd3ef8f249aca0b3493973bad6'
         'b0974f1409bf77e917a3ecce68a9d066eaf24a6cd35e0d52b0d61fcf2fb014f19962bb445b6eaf668081d370c69c01b08420c056902907574a29a71a4f0f2457'
-        'b8171e6d881a6ffd5588d1cae00ed81412eff1602670003fc1f48b7e6cb2d680340d464b7b38ee8886a8bd8193166ad71e3ad10b0de8b2a397b383b72434e289'
-        '7d3b39c055e22ef2d85f2650574ef1d5b66b4a400a19f01335d4321e9fb220872cd44d3e621a50aee2c7a0cca3cd7aad016a97eb96e767803345996d3c163de7')
+        'b8171e6d881a6ffd5588d1cae00ed81412eff1602670003fc1f48b7e6cb2d680340d464b7b38ee8886a8bd8193166ad71e3ad10b0de8b2a397b383b72434e289')
 
 prepare() {
   cd "${_pkgname}-${pkgver}"
@@ -41,6 +38,10 @@
   # https://github.com/sass/node-sass/issues/2716
   sed -r 's#("resolutions": \{)#"resolutions": {"node-sass/node-gyp": "^6.0.0",#' -i package.json
 
+  # patch better-sqlite3 to encapsulate sqlcipher
+  # https://bugs.archlinux.org/task/69980
+  sed 's|https://github\.com/signalapp/better-sqlite3#2fa02d2484e9f9a10df5ac7ea4617fb2dff30006|https://github.com/heftig/better-sqlite3#c8410c7f4091a5c4e458ce13ac35b04b2eea574b|' -i package.json
+
   yarn install --ignore-engines
 
   # We can't read the release date from git so we use SOURCE_DATE_EPOCH instead
@@ -58,13 +59,8 @@
 
   install -d "${pkgdir}/usr/"{lib,bin}
   cp -a release/linux-unpacked "${pkgdir}/usr/lib/${pkgname}"
+  ln -s "/usr/lib/${pkgname}/${pkgname}" "${pkgdir}/usr/bin/"
 
-  ## temporarily use a wrapper script
-  ## https://bugs.archlinux.org/task/69980
-  ## https://github.com/NixOS/nixpkgs/pull/122926
-  #ln -s "/usr/lib/${pkgname}/${pkgname}" "${pkgdir}/usr/bin/"
-  install -Dm 755 ../signal-desktop-wrapper.sh "${pkgdir}/usr/bin/signal-desktop"
-
   chmod u+s "${pkgdir}/usr/lib/signal-desktop/chrome-sandbox"
 
   install -Dm 644 "../${pkgname}.desktop" -t "${pkgdir}/usr/share/applications"

Deleted: signal-desktop-wrapper.sh
===================================================================
--- signal-desktop-wrapper.sh	2021-08-22 17:13:05 UTC (rev 1004234)
+++ signal-desktop-wrapper.sh	2021-08-22 20:08:53 UTC (rev 1004235)
@@ -1,4 +0,0 @@
-#!/bin/sh
-export SQLCIPHER_LIB="/usr/lib/signal-desktop/resources/app.asar.unpacked/node_modules/better-sqlite3/build/Release/better_sqlite3.node"
-export LD_PRELOAD="$SQLCIPHER_LIB"
-exec /usr/lib/signal-desktop/signal-desktop "$@"