[arch-commits] Commit in signal-desktop/repos/community-x86_64 (10 files)
Kpcyrd
kpcyrd at archlinux.org
Thu Feb 18 00:31:11 UTC 2021
Date: Thursday, February 18, 2021 @ 00:31:11
Author: kpcyrd
Revision: 863184
archrelease: copy trunk to community-x86_64
Added:
signal-desktop/repos/community-x86_64/PKGBUILD
(from rev 863183, signal-desktop/trunk/PKGBUILD)
signal-desktop/repos/community-x86_64/TRADEMARK_CONSENT.txt
(from rev 863183, signal-desktop/trunk/TRADEMARK_CONSENT.txt)
signal-desktop/repos/community-x86_64/expire-from-source-date-epoch.patch
(from rev 863183, signal-desktop/trunk/expire-from-source-date-epoch.patch)
signal-desktop/repos/community-x86_64/openssl-linking.patch
(from rev 863183, signal-desktop/trunk/openssl-linking.patch)
signal-desktop/repos/community-x86_64/signal-desktop.desktop
(from rev 863183, signal-desktop/trunk/signal-desktop.desktop)
Deleted:
signal-desktop/repos/community-x86_64/PKGBUILD
signal-desktop/repos/community-x86_64/TRADEMARK_CONSENT.txt
signal-desktop/repos/community-x86_64/expire-from-source-date-epoch.patch
signal-desktop/repos/community-x86_64/openssl-linking.patch
signal-desktop/repos/community-x86_64/signal-desktop.desktop
-------------------------------------+
PKGBUILD | 159 +++++++++++++++++-----------------
expire-from-source-date-epoch.patch | 26 ++---
openssl-linking.patch | 38 ++++----
signal-desktop.desktop | 26 ++---
4 files changed, 126 insertions(+), 123 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-02-18 00:30:50 UTC (rev 863183)
+++ PKGBUILD 2021-02-18 00:31:11 UTC (rev 863184)
@@ -1,78 +0,0 @@
-# Maintainer: kpcyrd <kpcyrd[at]archlinux[dot]org>
-# Contributor: Jean Lucas <jean at 4ray.co>
-
-pkgname=signal-desktop
-_pkgname=Signal-Desktop
-pkgver=1.39.6
-pkgrel=2
-pkgdesc="Signal Private Messenger for Linux"
-license=('AGPL3')
-replaces=('signal-desktop-bin')
-arch=('x86_64')
-url="https://signal.org"
-depends=('gtk3' 'libvips' 'libxss' 'hicolor-icon-theme')
-makedepends=('yarn' 'git' 'nodejs' 'npm' 'python')
-source=(
- "${pkgname}-${pkgver}.tar.gz::https://github.com/signalapp/${_pkgname}/archive/v${pkgver}.tar.gz"
- "${pkgname}.desktop"
- "openssl-linking.patch"
- "expire-from-source-date-epoch.patch"
-)
-sha512sums=('d220cf4c4bb182fbb9156ee2dd01b3ca3bddd3756e060a7360f09b7df98d455511f69739fd65ceaca2892df04d4f4b51ef9700514ebea43b51927673d0c5fa0d'
- '90cfee563a985bc73c4e7984715d190ae0b5c7aa887a7dc15c665980ca5cc8420b02f6c7a54e032c29e18876d5d51cfbe5027a9f0a59de3903f50fd469d73ce0'
- '6b846fdf70dae6c4657de523ec133d2f08325740863660b86e75d032bb07a4b97834ba0eeea4c77000c2c20b11739b8e8deaf06584f9279638e640c4b7633dd5'
- '6673066172d6c367961f3e2d762dd483e51a9f733d52e27d0569b333ad397375fd41d61b8a414b8c9e8dbba560a6c710678b3d105f8d285cb94d70561368d5a2')
-b2sums=('4eeafec197508afba825eb6f6486e240c9b782d46b7590b64c09ff2a4a8c4c81d0533c25583ed11f2c9115135f49f1c6f5158aaedddaf8314cf6f8ae56a951c2'
- 'b0974f1409bf77e917a3ecce68a9d066eaf24a6cd35e0d52b0d61fcf2fb014f19962bb445b6eaf668081d370c69c01b08420c056902907574a29a71a4f0f2457'
- '91fe76cd2ef32bd523aa857a219209f93ca5a6a3f5caa35f67c489a8eb79c8e1e404f453bed9e866e543ed48b9df8e17b45ad2ea8891b48d1502a97589a144af'
- 'b8171e6d881a6ffd5588d1cae00ed81412eff1602670003fc1f48b7e6cb2d680340d464b7b38ee8886a8bd8193166ad71e3ad10b0de8b2a397b383b72434e289')
-
-prepare() {
- cd "${_pkgname}-${pkgver}"
-
- # Allow higher Node versions
- sed 's#"node": "#&>=#' -i package.json
-
- # Select node-gyp versions with python3 support
- sed 's#"node-gyp": "5.0.3"#"node-gyp": "6.1.0"#' -i package.json
- # https://github.com/sass/node-sass/pull/2841
- # https://github.com/sass/node-sass/issues/2716
- sed -r 's#("resolutions": \{)#"resolutions": {"node-sass/node-gyp": "^6.0.0",#' -i package.json
-
- yarn install --ignore-engines
-
- # Have SQLCipher dynamically link from OpenSSL
- # See https://github.com/signalapp/Signal-Desktop/issues/2634
- patch --forward --strip=1 --input="${srcdir}/openssl-linking.patch"
-
- # We can't read the release date from git so we use SOURCE_DATE_EPOCH instead
- patch --forward --strip=1 --input="${srcdir}/expire-from-source-date-epoch.patch"
-}
-
-build() {
- cd "${_pkgname}-${pkgver}"
-
- # Gruntfile expects Git commit information which we don't have in a tarball download
- # See https://github.com/signalapp/Signal-Desktop/issues/2376
- yarn generate exec:build-protobuf exec:transpile concat copy:deps sass
-
- yarn build-release --dir
-}
-
-package() {
- cd "${_pkgname}-${pkgver}"
-
- install -d "${pkgdir}/usr/"{lib,bin}
- cp -a release/linux-unpacked "${pkgdir}/usr/lib/${pkgname}"
- ln -s "/usr/lib/${pkgname}/${pkgname}" "${pkgdir}/usr/bin/"
-
- chmod u+s "${pkgdir}/usr/lib/signal-desktop/chrome-sandbox"
-
- install -Dm 644 "../${pkgname}.desktop" -t "${pkgdir}/usr/share/applications"
- for i in 16 24 32 48 64 128 256 512 1024; do
- install -Dm 644 "build/icons/png/${i}x${i}.png" \
- "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/${pkgname}.png"
- done
-}
-
-# vim: ts=2 sw=2 et:
Copied: signal-desktop/repos/community-x86_64/PKGBUILD (from rev 863183, signal-desktop/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-02-18 00:31:11 UTC (rev 863184)
@@ -0,0 +1,81 @@
+# Maintainer: kpcyrd <kpcyrd[at]archlinux[dot]org>
+# Contributor: Jean Lucas <jean at 4ray.co>
+
+pkgname=signal-desktop
+_pkgname=Signal-Desktop
+pkgver=1.40.0
+pkgrel=1
+pkgdesc="Signal Private Messenger for Linux"
+license=('AGPL3')
+replaces=('signal-desktop-bin')
+arch=('x86_64')
+url="https://signal.org"
+depends=('gtk3' 'libvips' 'libxss' 'hicolor-icon-theme')
+makedepends=('yarn' 'git' 'git-lfs' 'nodejs' 'npm' 'python')
+source=(
+ "${pkgname}-${pkgver}.tar.gz::https://github.com/signalapp/${_pkgname}/archive/v${pkgver}.tar.gz"
+ "${pkgname}.desktop"
+ "openssl-linking.patch"
+ "expire-from-source-date-epoch.patch"
+)
+sha512sums=('89afa6e9abb7f7700b6f74a628dd7f0888829a85fb6c11f508fbb4f98f8a19e6af48db0d9f2c766c05c0113fe4f20b8f6a9ca762a16d85c4b27764303f25215c'
+ '90cfee563a985bc73c4e7984715d190ae0b5c7aa887a7dc15c665980ca5cc8420b02f6c7a54e032c29e18876d5d51cfbe5027a9f0a59de3903f50fd469d73ce0'
+ '6b846fdf70dae6c4657de523ec133d2f08325740863660b86e75d032bb07a4b97834ba0eeea4c77000c2c20b11739b8e8deaf06584f9279638e640c4b7633dd5'
+ '6673066172d6c367961f3e2d762dd483e51a9f733d52e27d0569b333ad397375fd41d61b8a414b8c9e8dbba560a6c710678b3d105f8d285cb94d70561368d5a2')
+b2sums=('37226dd78aed10b3f7c288efc2b9b52700e5b4fc16525d5cac1dd861f4394b5493ff27cf09335f98e46a4b24b18b584b2a6a91ec931a1b2dd66508b2a276d892'
+ 'b0974f1409bf77e917a3ecce68a9d066eaf24a6cd35e0d52b0d61fcf2fb014f19962bb445b6eaf668081d370c69c01b08420c056902907574a29a71a4f0f2457'
+ '91fe76cd2ef32bd523aa857a219209f93ca5a6a3f5caa35f67c489a8eb79c8e1e404f453bed9e866e543ed48b9df8e17b45ad2ea8891b48d1502a97589a144af'
+ 'b8171e6d881a6ffd5588d1cae00ed81412eff1602670003fc1f48b7e6cb2d680340d464b7b38ee8886a8bd8193166ad71e3ad10b0de8b2a397b383b72434e289')
+
+prepare() {
+ cd "${_pkgname}-${pkgver}"
+
+ # git-lfs hook needs to be installed for one of the dependencies
+ git lfs install
+
+ # Allow higher Node versions
+ sed 's#"node": "#&>=#' -i package.json
+
+ # Select node-gyp versions with python3 support
+ sed 's#"node-gyp": "5.0.3"#"node-gyp": "6.1.0"#' -i package.json
+ # https://github.com/sass/node-sass/pull/2841
+ # https://github.com/sass/node-sass/issues/2716
+ sed -r 's#("resolutions": \{)#"resolutions": {"node-sass/node-gyp": "^6.0.0",#' -i package.json
+
+ yarn install --ignore-engines
+
+ # Have SQLCipher dynamically link from OpenSSL
+ # See https://github.com/signalapp/Signal-Desktop/issues/2634
+ patch --forward --strip=1 --input="${srcdir}/openssl-linking.patch"
+
+ # We can't read the release date from git so we use SOURCE_DATE_EPOCH instead
+ patch --forward --strip=1 --input="${srcdir}/expire-from-source-date-epoch.patch"
+}
+
+build() {
+ cd "${_pkgname}-${pkgver}"
+
+ # Gruntfile expects Git commit information which we don't have in a tarball download
+ # See https://github.com/signalapp/Signal-Desktop/issues/2376
+ yarn generate exec:build-protobuf exec:transpile concat copy:deps sass
+
+ yarn build-release --dir
+}
+
+package() {
+ cd "${_pkgname}-${pkgver}"
+
+ install -d "${pkgdir}/usr/"{lib,bin}
+ cp -a release/linux-unpacked "${pkgdir}/usr/lib/${pkgname}"
+ ln -s "/usr/lib/${pkgname}/${pkgname}" "${pkgdir}/usr/bin/"
+
+ chmod u+s "${pkgdir}/usr/lib/signal-desktop/chrome-sandbox"
+
+ install -Dm 644 "../${pkgname}.desktop" -t "${pkgdir}/usr/share/applications"
+ for i in 16 24 32 48 64 128 256 512 1024; do
+ install -Dm 644 "build/icons/png/${i}x${i}.png" \
+ "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/${pkgname}.png"
+ done
+}
+
+# vim: ts=2 sw=2 et:
Deleted: TRADEMARK_CONSENT.txt
===================================================================
(Binary files differ)
Copied: signal-desktop/repos/community-x86_64/TRADEMARK_CONSENT.txt (from rev 863183, signal-desktop/trunk/TRADEMARK_CONSENT.txt)
===================================================================
(Binary files differ)
Deleted: expire-from-source-date-epoch.patch
===================================================================
--- expire-from-source-date-epoch.patch 2021-02-18 00:30:50 UTC (rev 863183)
+++ expire-from-source-date-epoch.patch 2021-02-18 00:31:11 UTC (rev 863184)
@@ -1,13 +0,0 @@
---- a/Gruntfile.js
-+++ b/Gruntfile.js
-@@ -203,9 +203,7 @@ module.exports = grunt => {
- });
-
- grunt.registerTask('getExpireTime', () => {
-- grunt.task.requires('gitinfo');
-- const gitinfo = grunt.config.get('gitinfo');
-- const committed = gitinfo.local.branch.current.lastCommitTime;
-+ const committed = parseInt(process.env.SOURCE_DATE_EPOCH, 10) * 1000;
- const time = Date.parse(committed) + 1000 * 60 * 60 * 24 * 90;
- grunt.file.write(
- 'config/local-production.json',
Copied: signal-desktop/repos/community-x86_64/expire-from-source-date-epoch.patch (from rev 863183, signal-desktop/trunk/expire-from-source-date-epoch.patch)
===================================================================
--- expire-from-source-date-epoch.patch (rev 0)
+++ expire-from-source-date-epoch.patch 2021-02-18 00:31:11 UTC (rev 863184)
@@ -0,0 +1,13 @@
+--- a/Gruntfile.js
++++ b/Gruntfile.js
+@@ -203,9 +203,7 @@ module.exports = grunt => {
+ });
+
+ grunt.registerTask('getExpireTime', () => {
+- grunt.task.requires('gitinfo');
+- const gitinfo = grunt.config.get('gitinfo');
+- const committed = gitinfo.local.branch.current.lastCommitTime;
++ const committed = parseInt(process.env.SOURCE_DATE_EPOCH, 10) * 1000;
+ const time = Date.parse(committed) + 1000 * 60 * 60 * 24 * 90;
+ grunt.file.write(
+ 'config/local-production.json',
Deleted: openssl-linking.patch
===================================================================
--- openssl-linking.patch 2021-02-18 00:30:50 UTC (rev 863183)
+++ openssl-linking.patch 2021-02-18 00:31:11 UTC (rev 863184)
@@ -1,19 +0,0 @@
---- a/node_modules/@journeyapps/sqlcipher/deps/sqlite3.gyp 2019-10-27 01:53:29.860275405 -0400
-+++ b/node_modules/@journeyapps/sqlcipher/deps/sqlite3.gyp 2019-10-27 01:51:32.001730882 -0400
-@@ -73,7 +73,7 @@
- 'link_settings': {
- 'libraries': [
- # This statically links libcrypto, whereas -lcrypto would dynamically link it
-- '<(SHARED_INTERMEDIATE_DIR)/sqlcipher-amalgamation-<@(sqlite_version)/OpenSSL-Linux/libcrypto.a'
-+ '-lcrypto'
- ]
- }
- }]
-@@ -141,7 +141,6 @@
- { # linux
- 'include_dirs': [
- '<(SHARED_INTERMEDIATE_DIR)/sqlcipher-amalgamation-<@(sqlite_version)/',
-- '<(SHARED_INTERMEDIATE_DIR)/sqlcipher-amalgamation-<@(sqlite_version)/openssl-include/'
- ]
- }]
- ],
Copied: signal-desktop/repos/community-x86_64/openssl-linking.patch (from rev 863183, signal-desktop/trunk/openssl-linking.patch)
===================================================================
--- openssl-linking.patch (rev 0)
+++ openssl-linking.patch 2021-02-18 00:31:11 UTC (rev 863184)
@@ -0,0 +1,19 @@
+--- a/node_modules/@journeyapps/sqlcipher/deps/sqlite3.gyp 2019-10-27 01:53:29.860275405 -0400
++++ b/node_modules/@journeyapps/sqlcipher/deps/sqlite3.gyp 2019-10-27 01:51:32.001730882 -0400
+@@ -73,7 +73,7 @@
+ 'link_settings': {
+ 'libraries': [
+ # This statically links libcrypto, whereas -lcrypto would dynamically link it
+- '<(SHARED_INTERMEDIATE_DIR)/sqlcipher-amalgamation-<@(sqlite_version)/OpenSSL-Linux/libcrypto.a'
++ '-lcrypto'
+ ]
+ }
+ }]
+@@ -141,7 +141,6 @@
+ { # linux
+ 'include_dirs': [
+ '<(SHARED_INTERMEDIATE_DIR)/sqlcipher-amalgamation-<@(sqlite_version)/',
+- '<(SHARED_INTERMEDIATE_DIR)/sqlcipher-amalgamation-<@(sqlite_version)/openssl-include/'
+ ]
+ }]
+ ],
Deleted: signal-desktop.desktop
===================================================================
--- signal-desktop.desktop 2021-02-18 00:30:50 UTC (rev 863183)
+++ signal-desktop.desktop 2021-02-18 00:31:11 UTC (rev 863184)
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Signal
-Comment=Signal - Private Messenger
-Comment[de]=Signal - Sicherer Messenger
-Icon=signal-desktop
-Exec=signal-desktop -- %u
-Terminal=false
-Categories=Network;InstantMessaging;
-StartupWMClass=Signal
-MimeType=x-scheme-handler/sgnl;
-Keywords=sgnl;chat;im;messaging;messenger;sms;security;privat;
-X-GNOME-UsesNotifications=true
Copied: signal-desktop/repos/community-x86_64/signal-desktop.desktop (from rev 863183, signal-desktop/trunk/signal-desktop.desktop)
===================================================================
--- signal-desktop.desktop (rev 0)
+++ signal-desktop.desktop 2021-02-18 00:31:11 UTC (rev 863184)
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Type=Application
+Name=Signal
+Comment=Signal - Private Messenger
+Comment[de]=Signal - Sicherer Messenger
+Icon=signal-desktop
+Exec=signal-desktop -- %u
+Terminal=false
+Categories=Network;InstantMessaging;
+StartupWMClass=Signal
+MimeType=x-scheme-handler/sgnl;
+Keywords=sgnl;chat;im;messaging;messenger;sms;security;privat;
+X-GNOME-UsesNotifications=true
More information about the arch-commits
mailing list