Date: Monday, November 23, 2020 @ 22:33:03 Author: kpcyrd Revision: 760164
archrelease: copy trunk to community-x86_64 Added: signal-desktop/repos/community-x86_64/PKGBUILD (from rev 760163, signal-desktop/trunk/PKGBUILD) signal-desktop/repos/community-x86_64/TRADEMARK_CONSENT.txt (from rev 760163, signal-desktop/trunk/TRADEMARK_CONSENT.txt) signal-desktop/repos/community-x86_64/expire-from-source-date-epoch.patch (from rev 760163, signal-desktop/trunk/expire-from-source-date-epoch.patch) signal-desktop/repos/community-x86_64/openssl-linking.patch (from rev 760163, signal-desktop/trunk/openssl-linking.patch) signal-desktop/repos/community-x86_64/signal-desktop.desktop (from rev 760163, 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 | 174 +++++++++++++++++----------------- expire-from-source-date-epoch.patch | 26 ++--- openssl-linking.patch | 38 +++---- signal-desktop.desktop | 18 +-- 4 files changed, 128 insertions(+), 128 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-11-23 22:32:35 UTC (rev 760163) +++ PKGBUILD 2020-11-23 22:33:03 UTC (rev 760164) @@ -1,87 +0,0 @@ -# Maintainer: kpcyrd <kpcyrd[at]archlinux[dot]org> -# Contributor: Jean Lucas <j...@4ray.co> - -pkgname=signal-desktop -_pkgname=Signal-Desktop -pkgver=1.38.1 -pkgrel=1 -pkgdesc="Signal Private Messenger for Linux" -license=('GPL3') -replaces=('signal-desktop-bin') -arch=('x86_64') -url="https://signal.org" -depends=('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" - # 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=('0f12801f069c3d70e462163f9aff87f92561527549406f2eb7ff1c081be2981811d7a9ced90a595ad7405bc13a3e9aae5ca1dfaf826c50d8b4c6a978e2061818' - 'd07220429c479e3b6aaafede95da117bdb735877162f584265a16434ed75a926c21534e8d291de53e58a1bf0a72cdd41a9a8ae7314e2f6fec98c938852a3b991' - '6b846fdf70dae6c4657de523ec133d2f08325740863660b86e75d032bb07a4b97834ba0eeea4c77000c2c20b11739b8e8deaf06584f9279638e640c4b7633dd5' - '6673066172d6c367961f3e2d762dd483e51a9f733d52e27d0569b333ad397375fd41d61b8a414b8c9e8dbba560a6c710678b3d105f8d285cb94d70561368d5a2' - '42f57802fa91dafb6dbfb5a3f613c4c07df65e97f8da84c9a54292c97a4d170f8455461aac8f6f7819d1ffbea4bf6c28488f8950056ba988776d060be3f107dd') -b2sums=('44fa8471dfdcec97fb7764b794e2f32e63a1dfd1cdcb678c6582f7eb10599ad4d72264435cab338f0074139c5e0ef5819590180a93fe6946cb802557e455e55b' - 'b05d190f28029c65d5cc15f69804db0b2775ff55b4db3a721c1dcf4aa8219b459453740fd26afecb6d72a515366af80af0b985d7b58e542a9edd76bb251ae000' - '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 - - # 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 760163, signal-desktop/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-11-23 22:33:03 UTC (rev 760164) @@ -0,0 +1,87 @@ +# Maintainer: kpcyrd <kpcyrd[at]archlinux[dot]org> +# Contributor: Jean Lucas <j...@4ray.co> + +pkgname=signal-desktop +_pkgname=Signal-Desktop +pkgver=1.38.2 +pkgrel=1 +pkgdesc="Signal Private Messenger for Linux" +license=('GPL3') +replaces=('signal-desktop-bin') +arch=('x86_64') +url="https://signal.org" +depends=('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" + # 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=('fb95083483b5d236829d0a42cae2393da58845edee723c398a2b0f25b1d277c9c1dd10f09323b53d719b410603ce9cb186d9a5ebfdbb7db2420e0377d9fd0801' + 'd07220429c479e3b6aaafede95da117bdb735877162f584265a16434ed75a926c21534e8d291de53e58a1bf0a72cdd41a9a8ae7314e2f6fec98c938852a3b991' + '6b846fdf70dae6c4657de523ec133d2f08325740863660b86e75d032bb07a4b97834ba0eeea4c77000c2c20b11739b8e8deaf06584f9279638e640c4b7633dd5' + '6673066172d6c367961f3e2d762dd483e51a9f733d52e27d0569b333ad397375fd41d61b8a414b8c9e8dbba560a6c710678b3d105f8d285cb94d70561368d5a2' + '42f57802fa91dafb6dbfb5a3f613c4c07df65e97f8da84c9a54292c97a4d170f8455461aac8f6f7819d1ffbea4bf6c28488f8950056ba988776d060be3f107dd') +b2sums=('74ed0f367bf760c4dab7ea664c88d8bae295cd3368d7dd9e2cadd1bb5a1fd359a83585529bb8b646f25e4593bb407b8f94adfbfd1d617f0c3660c2f476f194e4' + 'b05d190f28029c65d5cc15f69804db0b2775ff55b4db3a721c1dcf4aa8219b459453740fd26afecb6d72a515366af80af0b985d7b58e542a9edd76bb251ae000' + '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 + + # 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 760163, signal-desktop/trunk/TRADEMARK_CONSENT.txt) =================================================================== (Binary files differ) Deleted: expire-from-source-date-epoch.patch =================================================================== --- expire-from-source-date-epoch.patch 2020-11-23 22:32:35 UTC (rev 760163) +++ expire-from-source-date-epoch.patch 2020-11-23 22:33:03 UTC (rev 760164) @@ -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 760163, signal-desktop/trunk/expire-from-source-date-epoch.patch) =================================================================== --- expire-from-source-date-epoch.patch (rev 0) +++ expire-from-source-date-epoch.patch 2020-11-23 22:33:03 UTC (rev 760164) @@ -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-11-23 22:32:35 UTC (rev 760163) +++ openssl-linking.patch 2020-11-23 22:33:03 UTC (rev 760164) @@ -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 760163, signal-desktop/trunk/openssl-linking.patch) =================================================================== --- openssl-linking.patch (rev 0) +++ openssl-linking.patch 2020-11-23 22:33:03 UTC (rev 760164) @@ -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-11-23 22:32:35 UTC (rev 760163) +++ signal-desktop.desktop 2020-11-23 22:33:03 UTC (rev 760164) @@ -1,9 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Signal -Comment=Signal Private Messenger for Linux -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 760163, signal-desktop/trunk/signal-desktop.desktop) =================================================================== --- signal-desktop.desktop (rev 0) +++ signal-desktop.desktop 2020-11-23 22:33:03 UTC (rev 760164) @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Signal +Comment=Signal Private Messenger for Linux +Icon=signal-desktop +Exec=signal-desktop +Terminal=false +Categories=Network;InstantMessaging; +StartupWMClass=Signal