[arch-commits] Commit in signal-desktop/repos/community-x86_64 (10 files)
Kpcyrd
kpcyrd at archlinux.org
Fri Apr 24 02:20:38 UTC 2020
Date: Friday, April 24, 2020 @ 02:20:38
Author: kpcyrd
Revision: 618582
archrelease: copy trunk to community-x86_64
Added:
signal-desktop/repos/community-x86_64/PKGBUILD
(from rev 618581, signal-desktop/trunk/PKGBUILD)
signal-desktop/repos/community-x86_64/TRADEMARK_CONSENT.txt
(from rev 618581, signal-desktop/trunk/TRADEMARK_CONSENT.txt)
signal-desktop/repos/community-x86_64/expire-from-source-date-epoch.patch
(from rev 618581, signal-desktop/trunk/expire-from-source-date-epoch.patch)
signal-desktop/repos/community-x86_64/openssl-linking.patch
(from rev 618581, signal-desktop/trunk/openssl-linking.patch)
signal-desktop/repos/community-x86_64/signal-desktop.desktop
(from rev 618581, 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 | 186 +++++++++++++++++-----------------
expire-from-source-date-epoch.patch | 26 ++--
openssl-linking.patch | 38 +++---
signal-desktop.desktop | 18 +--
4 files changed, 134 insertions(+), 134 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-04-24 02:20:26 UTC (rev 618581)
+++ PKGBUILD 2020-04-24 02:20:38 UTC (rev 618582)
@@ -1,93 +0,0 @@
-# Maintainer: kpcyrd <kpcyrd[at]archlinux[dot]org>
-# Contributor: Jean Lucas <jean at 4ray.co>
-
-pkgname=signal-desktop
-_pkgname=Signal-Desktop
-pkgver=1.33.2
-pkgrel=1
-pkgdesc="Electron application that links with Signal on mobile"
-license=('GPL3')
-replaces=('signal-desktop-bin')
-arch=('x86_64')
-url="https://signal.org"
-depends=('electron' 'libvips')
-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"
- # Cherry-pick a specific commit for the node-spellchecker dependency
- # See https://github.com/atom/node-spellchecker/issues/127
- "https://github.com/atom/node-spellchecker/archive/613ff91dd2d9a5ee0e86be8a3682beecc4e94887.tar.gz"
-)
-sha512sums=('042e07394b2da171e8d0502b3afa49ebefd3f96df3b008d93a3ef41136d5fe934489ecbae2f92a83ae7fab69418aae67836a1d92e85fff904ee8fd7bfdf0a3bb'
- 'c5ec0bf524e527ecf94207ef6aa1f2671346e115ec15de6d063cde0960151813752a1814e003705fc1a99d4e2eae1b3ca4d03432a50790957186e240527cc361'
- '6b846fdf70dae6c4657de523ec133d2f08325740863660b86e75d032bb07a4b97834ba0eeea4c77000c2c20b11739b8e8deaf06584f9279638e640c4b7633dd5'
- '6673066172d6c367961f3e2d762dd483e51a9f733d52e27d0569b333ad397375fd41d61b8a414b8c9e8dbba560a6c710678b3d105f8d285cb94d70561368d5a2'
- '42f57802fa91dafb6dbfb5a3f613c4c07df65e97f8da84c9a54292c97a4d170f8455461aac8f6f7819d1ffbea4bf6c28488f8950056ba988776d060be3f107dd')
-b2sums=('2ee62d48901dfd36815c4a41b5bc590bee293a6b66ab1ff30987b1c43feadee2ac34e7357e7be062cd0f6a2b9139b599b31e77f73d2aba1c55e47392ee0c10a3'
- 'c0ceb5b903965727714b1848c818877f4b740c4734deafcfaf777046002a445d79cd4d86bbbf3d763dbda8e8d542b60605ae2ca43196ea76b089f2e808926dbc'
- '91fe76cd2ef32bd523aa857a219209f93ca5a6a3f5caa35f67c489a8eb79c8e1e404f453bed9e866e543ed48b9df8e17b45ad2ea8891b48d1502a97589a144af'
- 'b8171e6d881a6ffd5588d1cae00ed81412eff1602670003fc1f48b7e6cb2d680340d464b7b38ee8886a8bd8193166ad71e3ad10b0de8b2a397b383b72434e289'
- '53ad39f0bed69c5c5635d2e581f4ce56e3080fee16f184add08adee1164c2d68059d52071478a05cdacf04186f9964250f46f09e80553bf35e1f2f4cd1976d1b')
-
-prepare() {
- cd "${_pkgname}-${pkgver}"
-
- # Fix SpellChecker build with imminent Node 13
- # See https://github.com/atom/node-spellchecker/issues/127
- sed -r 's#("spellchecker": ").*"#\1file:'"${srcdir}"'/613ff91dd2d9a5ee0e86be8a3682beecc4e94887.tar.gz"#' -i package.json
-
- # Set system Electron version for ABI compatibility
- sed -r 's#("electron": ").*"#\1'$(cat /usr/lib/electron/version)'"#' -i package.json
-
- # 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 's#"resolutions": {#"resolutions": {"node-sass/node-gyp": "^6.0.0",#' -i package.json
-
- yarn install
-
- # 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
-}
-
-package() {
- cd "${_pkgname}-${pkgver}"
-
- install -d "${pkgdir}/usr/"{lib,bin}
- cp -a release/linux-unpacked/resources "${pkgdir}/usr/lib/${pkgname}"
- cat << EOF > "${pkgdir}"/usr/bin/${pkgname}
-#!/bin/sh
-
-NODE_ENV=production electron /usr/lib/${pkgname}/app.asar "\$@"
-EOF
- chmod +x "${pkgdir}/usr/bin/${pkgname}"
-
- 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 618581, signal-desktop/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-04-24 02:20:38 UTC (rev 618582)
@@ -0,0 +1,93 @@
+# Maintainer: kpcyrd <kpcyrd[at]archlinux[dot]org>
+# Contributor: Jean Lucas <jean at 4ray.co>
+
+pkgname=signal-desktop
+_pkgname=Signal-Desktop
+pkgver=1.33.3
+pkgrel=1
+pkgdesc="Electron application that links with Signal on mobile"
+license=('GPL3')
+replaces=('signal-desktop-bin')
+arch=('x86_64')
+url="https://signal.org"
+depends=('electron' 'libvips')
+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"
+ # Cherry-pick a specific commit for the node-spellchecker dependency
+ # See https://github.com/atom/node-spellchecker/issues/127
+ "https://github.com/atom/node-spellchecker/archive/613ff91dd2d9a5ee0e86be8a3682beecc4e94887.tar.gz"
+)
+sha512sums=('86c61b37a5204fbdab41782d5879dad3c5d85acce046f7734f119abb7b51c4f6c572bf75094a463c600f48736897931a2614ac521ae19ba27eee09099576b6b3'
+ 'c5ec0bf524e527ecf94207ef6aa1f2671346e115ec15de6d063cde0960151813752a1814e003705fc1a99d4e2eae1b3ca4d03432a50790957186e240527cc361'
+ '6b846fdf70dae6c4657de523ec133d2f08325740863660b86e75d032bb07a4b97834ba0eeea4c77000c2c20b11739b8e8deaf06584f9279638e640c4b7633dd5'
+ '6673066172d6c367961f3e2d762dd483e51a9f733d52e27d0569b333ad397375fd41d61b8a414b8c9e8dbba560a6c710678b3d105f8d285cb94d70561368d5a2'
+ '42f57802fa91dafb6dbfb5a3f613c4c07df65e97f8da84c9a54292c97a4d170f8455461aac8f6f7819d1ffbea4bf6c28488f8950056ba988776d060be3f107dd')
+b2sums=('8586e262e56d01f33653dc18474678b79745f2eaa39d55e8cb7bbe5aa36f6edacecb1372e48bd125e6ef9b8a625ddf1f71e7e9945d413816a82d6a8db7b88c15'
+ 'c0ceb5b903965727714b1848c818877f4b740c4734deafcfaf777046002a445d79cd4d86bbbf3d763dbda8e8d542b60605ae2ca43196ea76b089f2e808926dbc'
+ '91fe76cd2ef32bd523aa857a219209f93ca5a6a3f5caa35f67c489a8eb79c8e1e404f453bed9e866e543ed48b9df8e17b45ad2ea8891b48d1502a97589a144af'
+ 'b8171e6d881a6ffd5588d1cae00ed81412eff1602670003fc1f48b7e6cb2d680340d464b7b38ee8886a8bd8193166ad71e3ad10b0de8b2a397b383b72434e289'
+ '53ad39f0bed69c5c5635d2e581f4ce56e3080fee16f184add08adee1164c2d68059d52071478a05cdacf04186f9964250f46f09e80553bf35e1f2f4cd1976d1b')
+
+prepare() {
+ cd "${_pkgname}-${pkgver}"
+
+ # Fix SpellChecker build with imminent Node 13
+ # See https://github.com/atom/node-spellchecker/issues/127
+ sed -r 's#("spellchecker": ").*"#\1file:'"${srcdir}"'/613ff91dd2d9a5ee0e86be8a3682beecc4e94887.tar.gz"#' -i package.json
+
+ # Set system Electron version for ABI compatibility
+ sed -r 's#("electron": ").*"#\1'$(cat /usr/lib/electron/version)'"#' -i package.json
+
+ # 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 's#"resolutions": {#"resolutions": {"node-sass/node-gyp": "^6.0.0",#' -i package.json
+
+ yarn install
+
+ # 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
+}
+
+package() {
+ cd "${_pkgname}-${pkgver}"
+
+ install -d "${pkgdir}/usr/"{lib,bin}
+ cp -a release/linux-unpacked/resources "${pkgdir}/usr/lib/${pkgname}"
+ cat << EOF > "${pkgdir}"/usr/bin/${pkgname}
+#!/bin/sh
+
+NODE_ENV=production electron /usr/lib/${pkgname}/app.asar "\$@"
+EOF
+ chmod +x "${pkgdir}/usr/bin/${pkgname}"
+
+ 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 618581, signal-desktop/trunk/TRADEMARK_CONSENT.txt)
===================================================================
(Binary files differ)
Deleted: expire-from-source-date-epoch.patch
===================================================================
--- expire-from-source-date-epoch.patch 2020-04-24 02:20:26 UTC (rev 618581)
+++ expire-from-source-date-epoch.patch 2020-04-24 02:20:38 UTC (rev 618582)
@@ -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 618581, signal-desktop/trunk/expire-from-source-date-epoch.patch)
===================================================================
--- expire-from-source-date-epoch.patch (rev 0)
+++ expire-from-source-date-epoch.patch 2020-04-24 02:20:38 UTC (rev 618582)
@@ -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 2020-04-24 02:20:26 UTC (rev 618581)
+++ openssl-linking.patch 2020-04-24 02:20:38 UTC (rev 618582)
@@ -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 618581, signal-desktop/trunk/openssl-linking.patch)
===================================================================
--- openssl-linking.patch (rev 0)
+++ openssl-linking.patch 2020-04-24 02:20:38 UTC (rev 618582)
@@ -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 2020-04-24 02:20:26 UTC (rev 618581)
+++ signal-desktop.desktop 2020-04-24 02:20:38 UTC (rev 618582)
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Signal
-Comment=Electron application that links with Signal on mobile
-Icon=signal-desktop
-Exec=signal-desktop
-Terminal=false
-Categories=Network;InstantMessaging;
-StartupWMClass=Signal
Copied: signal-desktop/repos/community-x86_64/signal-desktop.desktop (from rev 618581, signal-desktop/trunk/signal-desktop.desktop)
===================================================================
--- signal-desktop.desktop (rev 0)
+++ signal-desktop.desktop 2020-04-24 02:20:38 UTC (rev 618582)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=Signal
+Comment=Electron application that links with Signal on mobile
+Icon=signal-desktop
+Exec=signal-desktop
+Terminal=false
+Categories=Network;InstantMessaging;
+StartupWMClass=Signal
More information about the arch-commits
mailing list