diff --git a/net-im/signal-desktop/Makefile b/net-im/signal-desktop/Makefile index 19be85ba8bd5..33def16c5f00 100644 --- a/net-im/signal-desktop/Makefile +++ b/net-im/signal-desktop/Makefile @@ -1,192 +1,188 @@ PORTNAME= signal-desktop DISTVERSIONPREFIX= v -DISTVERSION= 6.1.0 +DISTVERSION= 6.2.0 CATEGORIES= net-im MASTER_SITES= LOCAL/mikael/signal-desktop/:yarn \ LOCAL/mikael/signal-desktop/:electron_gyp \ LOCAL/mikael/signal-desktop/:npm \ - LOCAL/mikael/signal-desktop/:sqlite + https://build-artifacts.signal.org/desktop/:sqlcipher DISTFILES= signal-desktop-${DISTVERSION}-yarn-cache.tar.gz:yarn \ signal-desktop-${DISTVERSION}-electron-gyp-cache.tar.gz:electron_gyp \ signal-desktop-${DISTVERSION}-npm-cache.tar.gz:npm \ - sqlcipher.tar.gz:sqlite + sqlcipher-4.5.2--3.0.7-4587e88a4219cb76fd595a5b73f82bfd919b235d75626f40783525f4f58a7503.tar.gz:sqlcipher + MAINTAINER= mikael@FreeBSD.org COMMENT= Cross-platform centralized encrypted messaging service WWW= https://signal.org/ LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= aarch64 amd64 BUILD_DEPENDS= ${LOCALBASE}/lib/libringrtc.so:multimedia/ringrtc \ ${LOCALBASE}/lib/libsignal_node.so:net-im/libsignal-node \ app-builder>0:devel/app-builder \ electron${ELECTRON_VER_MAJOR}:devel/electron${ELECTRON_VER_MAJOR} \ npm:www/npm-node16 \ - openssl>0:security/openssl \ + ${LOCALBASE}/lib/libcrypto.a:security/openssl-devel \ vips>0:graphics/vips \ yarn:www/yarn-node16 LIB_DEPENDS= libasound.so:audio/alsa-lib \ libatk-bridge-2.0.so:accessibility/at-spi2-atk \ libatspi.so:accessibility/at-spi2-core \ libcups.so:print/cups \ libdbus-1.so:devel/dbus \ libdrm.so:graphics/libdrm \ libexpat.so:textproc/expat2 \ libFLAC.so:audio/flac \ libfontconfig.so:x11-fonts/fontconfig \ libharfbuzz.so:print/harfbuzz \ libnspr4.so:devel/nspr \ libnss3.so:security/nss \ libopenh264.so:multimedia/openh264 \ libopus.so:audio/opus \ libpci.so:devel/libpci \ libpng16.so:graphics/png \ libsnappy.so:archivers/snappy \ libwebp.so:graphics/webp \ libxkbcommon.so:x11/libxkbcommon \ libxshmfence.so:x11/libxshmfence USES= desktop-file-utils gettext-runtime gl gnome jpeg xorg USE_GITHUB= yes GH_ACCOUNT= signalapp GH_PROJECT= Signal-Desktop USE_GL= gbm gl USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk30 libxml2 libxslt pango USE_XORG= x11 xcb xcomposite xdamage xext xfixes xi xrandr xrender xtst PACKAGE_ENV= SIGNAL_ENV=production MAKE_ENV+= ELECTRON_OVERRIDE_DIST_PATH=${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR} \ HOME=${WRKDIR} \ PLAYWRIGHT_BROWSERS_PATH=${WRKDIR}/.cache \ PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=true \ PLAYWRIGHT_SKIP_VALIDATE_HOST_REQUIREMENTS=true \ - USE_SYSTEM_APP_BUILDER=true + USE_SYSTEM_APP_BUILDER=true \ + SOURCE_DATE_EPOCH=${_BUILD_DATE} # Don't download electron binary distribution on electron node_modules installation MAKE_ENV+= ELECTRON_SKIP_BINARY_DOWNLOAD=1 # Don't create __pycache__ directory when executing node-gyp # This is a workaround to avoid filesystem violations during poudriere build MAKE_ENV+= PYTHONDONTWRITEBYTECODE=1 MAKE_ENV+= ESBUILD_BINARY_PATH=${WRKDIR}/esbuild-freebsd-64/package/bin/esbuild _BUILD_DATE= $$(date +'%s') ELECTRON_VER_MAJOR= 21 # ll work/.cache/yarn/v6 | egrep "ringrtc|signal-client|npm-better-sqlite3|esbuild-freebsd-64" NPM_SIGNAL_DIR= npm-@signalapp-libsignal-client-0.21.1-381d6162ae0e7719dc625780c1d6c3f9f558c33d-integrity NPM_RINGRTC_DIR= npm-ringrtc-2.22.0-9a9d9fbc1ca43e7a0707a960ce9642dbf82dc64a/ -NPM_SQLITE3_DIR= npm-better-sqlite3-7.5.1-afdbd49cf18d0046d7385ca4d23da20c66f00d50/ +NPM_SQLITE3_DIR= npm-@signalapp-better-sqlite3-8.0.3-c279ca3f1d1e7f6554d2a629d717e96e1ec45809-integrity/ NPM_PLAYWRITE_DIR= npm-playwright-core-1.17.1-a16e0f89284a0ed8ae6d77e1c905c84b8a2ba022-integrity NPM_ESBUILD_VERS= 0.15.8 ESBUILD_ARCH= ${ARCH:S/aarch64/arm/:S/amd64//} NODE_ARCH= ${ARCH:S/aarch64/arm64/:S/amd64/x64/} APP_OUT_DIR= linux-${ARCH:S/aarch64/arm64-/:S/amd64//}unpacked PLIST_SUB= NODE_ARCH=${NODE_ARCH} \ SHARP_ARCH=${ARCH:S/aarch64/arm64v8/:S/amd64/x64/} -post-patch: - ${REINPLACE_CMD} "s#%%EPOCH%%#${_BUILD_DATE}#" \ - ${WRKSRC}/ts/scripts/get-expire-time.ts - do-build: ${ECHO_CMD} 'yarn-offline-mirror "../yarn-cache"' > ${WRKSRC}/.yarnrc # electron-builder is stupid and tries to open ${LOCALBASE}/share/electron21/electron with WRITE priv # copy ${LOCALBASE}/share/electron21 in WRKDIR # it's needed for the do-install phase, it's here because of this issue # https://github.com/MikaelUrankar/signal-desktop/issues/6 (I don't know why it fails though) @${RM} -r ${WRKDIR}/electron${ELECTRON_VER_MAJOR} @${CP} -pR ${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR} ${WRKDIR}/electron${ELECTRON_VER_MAJOR} ${CHMOD} -R a+w ${WRKDIR}/electron${ELECTRON_VER_MAJOR} # Install libsignal_node.so and libringrtc.so binaries in the yarn cache ${MKDIR} ${WRKDIR}/.cache/yarn/v6/${NPM_SIGNAL_DIR}/node_modules/@signalapp/libsignal-client/prebuilds/freebsd-${NODE_ARCH} \ ${WRKDIR}/.cache/yarn/v6/${NPM_RINGRTC_DIR}/node_modules/ringrtc/build/freebsd ${CP} ${LOCALBASE}/lib/libsignal_node.so \ ${WRKDIR}/.cache/yarn/v6/${NPM_SIGNAL_DIR}/node_modules/@signalapp/libsignal-client/prebuilds/freebsd-${NODE_ARCH}/node.napi.node ${CP} ${LOCALBASE}/lib/libringrtc.so \ ${WRKDIR}/.cache/yarn/v6/${NPM_RINGRTC_DIR}/node_modules/ringrtc/build/freebsd/libringrtc-${NODE_ARCH}.node - # sqlcipher.tar.gz requires git-lfs to fetch, just copy a previously downloaded one (I've had to use ubuntu for that, - # as I didn't manage to do it with FreeBSD, see https://github.com/signalapp/Signal-Desktop/blob/development/CONTRIBUTING.md for instructions) - ${MKDIR} ${WRKDIR}/.cache/yarn/v6/${NPM_SQLITE3_DIR}/node_modules/better-sqlite3/deps - ${CP} ${DISTDIR}/sqlcipher.tar.gz \ - ${WRKDIR}/.cache/yarn/v6/${NPM_SQLITE3_DIR}/node_modules/better-sqlite3/deps/sqlcipher.tar.gz + ${MKDIR} ${WRKDIR}/.cache/yarn/v6/${NPM_SQLITE3_DIR}/node_modules/@signalapp/better-sqlite3/deps + ${CP} ${DISTDIR}/sqlcipher-4.5.2--3.0.7-4587e88a4219cb76fd595a5b73f82bfd919b235d75626f40783525f4f58a7503.tar.gz \ + ${WRKDIR}/.cache/yarn/v6/${NPM_SQLITE3_DIR}/node_modules/@signalapp/better-sqlite3/deps/sqlcipher.tar.gz # patch-package can't patch playwright-core, patch the yarn cache instead ${CP} ${FILESDIR}/playwrigth-registry.js \ ${WRKDIR}/.cache/yarn/v6/${NPM_PLAYWRITE_DIR}/node_modules/playwright-core/lib/utils/registry.js # patch-package can't patch sqlite3 on aarch64, patch the yarn cache instead cd ${WRKDIR}/.cache/yarn/v6 && ${PATCH} -s -N -i ${FILESDIR}/sqlite3.gyp.diff ${MKDIR} ${WRKDIR}/esbuild-freebsd-64 ${TAR} -xf ${WRKDIR}/yarn-cache/esbuild-freebsd-${ESBUILD_ARCH}64-${NPM_ESBUILD_VERS}.tgz -C ${WRKDIR}/esbuild-freebsd-64 # # For online build # ${RM} ${WRKDIR}/.npmrc # cd ${WRKSRC} && \ # ${SETENV} ${MAKE_ENV} yarn install --frozen-lockfile --ignore-optional # cd ${WRKSRC} && \ # ${SETENV} ${MAKE_ENV} yarn generate # cd ${WRKSRC} && \ # ${SETENV} ${MAKE_ENV} yarn build:webpack # For offline build ${ECHO_CMD} offline=true > ${WRKDIR}/.npmrc cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} yarn install --frozen-lockfile --ignore-optional --offline cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} yarn --offline generate cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} yarn --offline build:webpack do-install: # taken from https://github.com/tagattie/FreeBSD-Electron/blob/master/Mk/Uses/electron.mk#L387 # and editors/vscode cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} ${PACKAGE_ENV} yarn run electron-builder \ --linux --dir --config.npmRebuild=false \ --config.electronVersion=${ELECTRON_VER_MAJOR} \ --config.electronDist=${WRKDIR}/electron${ELECTRON_VER_MAJOR} ${MKDIR} ${STAGEDIR}${DATADIR} cd ${BUILD_WRKSRC}/dist/${APP_OUT_DIR} && \ ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps ${INSTALL_DATA} ${WRKSRC}/images/signal-logo-desktop-linux.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/signal-desktop.png ${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.desktop \ ${STAGEDIR}${PREFIX}/share/applications .for f in chromedriver mksnapshot v8_context_snapshot_generator ${RM} ${STAGEDIR}${DATADIR}/${f} .endfor ${RM} -r ${STAGEDIR}${DATADIR}/gen ${RM} -r ${STAGEDIR}${DATADIR}/node_headers ${RM} -r ${STAGEDIR}${DATADIR}/resources/completions ${RLN} ${STAGEDIR}${DATADIR}/signal-desktop ${STAGEDIR}${PREFIX}/bin create-caches-tarball: # do some cleanup first ${RM} -r ${WRKDIR}/.npm/_logs ${WRKDIR}/.npm/_update-notifier-last-checked ${WRKDIR}/.cache/yarn/v6/.tmp ${FIND} ${WRKDIR}/.cache -type f -perm 755 -exec file {} \; | ${EGREP} "ELF|PE32+|Mach-O" | ${AWK} -F ':' '{print $$1}' | ${XARGS} ${RM} cd ${WRKDIR} && \ ${TAR} czf signal-desktop-${DISTVERSION}-yarn-cache.tar.gz .cache yarn-cache cd ${WRKDIR} && \ ${TAR} czf signal-desktop-${DISTVERSION}-electron-gyp-cache.tar.gz .electron-gyp cd ${WRKDIR} && \ ${TAR} czf signal-desktop-${DISTVERSION}-npm-cache.tar.gz .npm .include diff --git a/net-im/signal-desktop/distinfo b/net-im/signal-desktop/distinfo index cc8233d55117..2b75cc2e82e4 100644 --- a/net-im/signal-desktop/distinfo +++ b/net-im/signal-desktop/distinfo @@ -1,11 +1,11 @@ -TIMESTAMP = 1671199606 -SHA256 (signal-desktop-6.1.0-yarn-cache.tar.gz) = 377cc4aef808c0dbdd939e5f6b101d67b41af36240f6153e83c4ea1242d933e5 -SIZE (signal-desktop-6.1.0-yarn-cache.tar.gz) = 1084112692 -SHA256 (signal-desktop-6.1.0-electron-gyp-cache.tar.gz) = 0cf1ecdb87c699e99ce3af4a2378d95e5440c7e532c209222ddd122deb1d3a4e -SIZE (signal-desktop-6.1.0-electron-gyp-cache.tar.gz) = 267010 -SHA256 (signal-desktop-6.1.0-npm-cache.tar.gz) = 7695f2e5c39eb6aa36a704ba77f34925e5e1e54f65b8b2d8e1f2905730ee512a -SIZE (signal-desktop-6.1.0-npm-cache.tar.gz) = 4429759 -SHA256 (sqlcipher.tar.gz) = fe8bdc5e2f182970fb63a71ec4c519c8192453800bf142f755d7ed99e79fff84 -SIZE (sqlcipher.tar.gz) = 25833894 -SHA256 (signalapp-Signal-Desktop-v6.1.0_GH0.tar.gz) = f981ca229651826dcf2b511499612217719827ab98edac46f931fe2751eccd6f -SIZE (signalapp-Signal-Desktop-v6.1.0_GH0.tar.gz) = 38301590 +TIMESTAMP = 1673792962 +SHA256 (signal-desktop-6.2.0-yarn-cache.tar.gz) = 60a52b9f048f90144129643aa012b97c00317e217e2c1ab218ed2f21036040d6 +SIZE (signal-desktop-6.2.0-yarn-cache.tar.gz) = 1051289021 +SHA256 (signal-desktop-6.2.0-electron-gyp-cache.tar.gz) = 9515098bca084289d8a356e70e95f139d2451c9a62914d510286984937cf298d +SIZE (signal-desktop-6.2.0-electron-gyp-cache.tar.gz) = 266707 +SHA256 (signal-desktop-6.2.0-npm-cache.tar.gz) = a4bfca0df78ccff27b27b0f84a9bc523667b83e6da12b6b4316c98580d25cf9b +SIZE (signal-desktop-6.2.0-npm-cache.tar.gz) = 4433937 +SHA256 (sqlcipher-4.5.2--3.0.7-4587e88a4219cb76fd595a5b73f82bfd919b235d75626f40783525f4f58a7503.tar.gz) = 4587e88a4219cb76fd595a5b73f82bfd919b235d75626f40783525f4f58a7503 +SIZE (sqlcipher-4.5.2--3.0.7-4587e88a4219cb76fd595a5b73f82bfd919b235d75626f40783525f4f58a7503.tar.gz) = 41118646 +SHA256 (signalapp-Signal-Desktop-v6.2.0_GH0.tar.gz) = dcb6967c5a72eada96ddf1fc0fa5ac122b9280cc5c08bfc28d3b93ba1ce40e79 +SIZE (signalapp-Signal-Desktop-v6.2.0_GH0.tar.gz) = 38307325 diff --git a/net-im/signal-desktop/files/patch-signal-desktop b/net-im/signal-desktop/files/patch-signal-desktop index 1ecb066caf3f..9f7bf961a391 100644 --- a/net-im/signal-desktop/files/patch-signal-desktop +++ b/net-im/signal-desktop/files/patch-signal-desktop @@ -1,188 +1,168 @@ --- ts/models/messages.ts 2022-02-12 02:48:01 UTC +++ ts/models/messages.ts @@ -722,7 +722,7 @@ export class MessageModel extends window.Backbone.Mode // Linux emoji support is mixed, so we disable it. (Note that this doesn't touch // the `text`, which can contain emoji.) - const shouldIncludeEmoji = Boolean(emoji) && !window.Signal.OS.isLinux(); + const shouldIncludeEmoji = Boolean(emoji) && !(window.Signal.OS.isLinux() || window.Signal.OS.isFreeBSD()); if (shouldIncludeEmoji) { return window.i18n('message--getNotificationText--text-with-emoji', { text: modifiedText, --- ts/OS.ts 2022-02-12 02:48:01.000000000 +0100 +++ ts/OS.ts 2022-02-18 20:38:13.220898000 +0100 @@ -7,6 +7,7 @@ import semver from 'semver'; export const isMacOS = (): boolean => process.platform === 'darwin'; export const isLinux = (): boolean => process.platform === 'linux'; +export const isFreeBSD = (): boolean => process.platform === 'freebsd'; export const isWindows = (minVersion?: string): boolean => { const osRelease = os.release(); --- ts/services/notifications.ts 2022-02-12 02:48:01.000000000 +0100 +++ ts/services/notifications.ts 2022-02-18 20:39:11.725928000 +0100 @@ -143,7 +143,7 @@ class NotificationService extends EventEmitter { const audioNotificationSupport = getAudioNotificationSupport(); const notification = new window.Notification(title, { - body: OS.isLinux() ? filterNotificationText(message) : message, + body: (OS.isFreeBSD() || OS.isLinux()) ? filterNotificationText(message) : message, icon, silent: silent || audioNotificationSupport !== AudioNotificationSupport.Native, --- ts/set_os_class.ts 2022-02-12 02:48:01.000000000 +0100 +++ ts/set_os_class.ts 2022-02-18 20:39:35.451014000 +0100 @@ -9,6 +9,8 @@ $(document).ready(() => { className = 'os-macos'; } else if (window.Signal.OS.isLinux()) { className = 'os-linux'; + } else if (window.Signal.OS.isFreeBSD()) { + className = 'os-freebsd'; } else { throw new Error('Unexpected operating system; not applying '); } --- ts/test-node/types/Settings_test.ts 2022-02-12 02:48:01.000000000 +0100 +++ ts/test-node/types/Settings_test.ts 2022-02-18 20:41:29.688721000 +0100 @@ -27,6 +27,15 @@ describe('Settings', () => { ); }); + it('returns custom support on FreeBSD', () => { + sandbox.stub(process, 'platform').value('freebsd'); + assert.strictEqual( + Settings.getAudioNotificationSupport(), + Settings.AudioNotificationSupport.Custom + ); + }); + + it('returns no support on Windows 7', () => { sandbox.stub(process, 'platform').value('win32'); sandbox.stub(os, 'release').returns('7.0.0'); @@ -60,6 +69,11 @@ describe('Settings', () => { assert.isTrue(Settings.isAudioNotificationSupported()); }); + it('returns true on FreeBSD', () => { + sandbox.stub(process, 'platform').value('freebsd'); + assert.isTrue(Settings.isAudioNotificationSupported()); + }); + it('returns false on Windows 7', () => { sandbox.stub(process, 'platform').value('win32'); sandbox.stub(os, 'release').returns('7.0.0'); @@ -84,6 +98,11 @@ describe('Settings', () => { assert.isTrue(Settings.isNotificationGroupingSupported()); }); + it('returns true on FreeBSD', () => { + sandbox.stub(process, 'platform').value('freebsd'); + assert.isTrue(Settings.isNotificationGroupingSupported()); + }); + it('returns true on Windows 7', () => { sandbox.stub(process, 'platform').value('win32'); sandbox.stub(os, 'release').returns('7.0.0'); @@ -126,6 +145,11 @@ describe('Settings', () => { assert.isFalse(Settings.isHideMenuBarSupported()); }); + it('returns true on FreeBSD', () => { + sandbox.stub(process, 'platform').value('freebsd'); + assert.isTrue(Settings.isHideMenuBarSupported()); + }); + it('returns true on Windows 7', () => { sandbox.stub(process, 'platform').value('win32'); sandbox.stub(os, 'release').returns('7.0.0'); @@ -148,6 +172,11 @@ describe('Settings', () => { it('returns false on macOS', () => { sandbox.stub(process, 'platform').value('darwin'); assert.isFalse(Settings.isDrawAttentionSupported()); + }); + + it('returns true on FreeBSD', () => { + sandbox.stub(process, 'platform').value('freebsd'); + assert.isTrue(Settings.isDrawAttentionSupported()); }); it('returns true on Windows 7', () => { --- ts/test-node/util/getUserAgent_test.ts 2022-02-12 02:48:01.000000000 +0100 +++ ts/test-node/util/getUserAgent_test.ts 2022-02-18 20:42:25.165838000 +0100 @@ -39,6 +39,14 @@ describe('getUserAgent', () => { ); }); + it('returns the right User-Agent on FreeBSD', function test() { + this.sandbox.stub(process, 'platform').get(() => 'freebsd'); + assert.strictEqual( + getUserAgent('1.2.3', '13.1'), + 'Signal-Desktop/1.2.3 FreeBSD 13.1' + ); + }); + it('omits the platform on unsupported platforms', function test() { this.sandbox.stub(process, 'platform').get(() => 'freebsd'); assert.strictEqual(getUserAgent('1.2.3', '13.1'), 'Signal-Desktop/1.2.3'); --- ts/util/getUserAgent.ts 2022-02-12 02:48:01.000000000 +0100 +++ ts/util/getUserAgent.ts 2022-02-18 20:43:07.232944000 +0100 @@ -7,6 +7,7 @@ const PLATFORM_STRINGS: { [platform: string]: string } win32: 'Windows', darwin: 'macOS', linux: 'Linux', + freebsd: 'FreeBSD', }; export function getUserAgent(appVersion: string): string { --- ts/types/Settings.ts.orig 2022-02-16 16:11:39.000000000 +0100 +++ ts/types/Settings.ts 2022-02-19 22:18:16.945135000 +0100 @@ -19,7 +19,7 @@ export function getAudioNotificationSupport(): AudioNo if (OS.isWindows(MIN_WINDOWS_VERSION) || OS.isMacOS()) { return AudioNotificationSupport.Native; } - if (OS.isLinux()) { + if (OS.isLinux() || OS.isFreeBSD) { return AudioNotificationSupport.Custom; } return AudioNotificationSupport.None; @@ -60,7 +60,7 @@ export const getTitleBarVisibility = (): TitleBarVisib */ export const isSystemTraySupported = (appVersion: string): boolean => // We eventually want to support Linux in production. - OS.isWindows() || (OS.isLinux() && !isProduction(appVersion)); + OS.isWindows() || (OS.isLinux() && !isProduction(appVersion)) || (OS.isFreeBSD() && !isProduction(appVersion)); export const isAutoDownloadUpdatesSupported = (): boolean => OS.isWindows() || OS.isMacOS(); --- app/main.ts.orig 2022-02-24 15:35:11.986213000 +0100 +++ app/main.ts 2022-02-24 15:34:26.610207000 +0100 @@ -451,7 +451,7 @@ let windowIcon: string; if (OS.isWindows()) { windowIcon = join(__dirname, '../build/icons/win/icon.ico'); -} else if (OS.isLinux()) { +} else if (OS.isLinux() || OS.isFreeBSD()) { windowIcon = join(__dirname, '../images/signal-logo-desktop-linux.png'); } else { windowIcon = join(__dirname, '../build/icons/png/512x512.png'); ---- ts/scripts/get-expire-time.ts.orig 2022-02-16 15:11:39.000000000 +0000 -+++ ts/scripts/get-expire-time.ts 2022-02-25 12:31:18.650062000 +0000 -@@ -2,15 +2,12 @@ - // SPDX-License-Identifier: AGPL-3.0-only - - import { join } from 'path'; --import { execSync } from 'child_process'; - import { writeFileSync } from 'fs'; - - import { DAY } from '../util/durations'; - --const unixTimestamp = parseInt( -- execSync('git show -s --format=%ct').toString('utf8'), -- 10 --); -+const unixTimestamp = %%EPOCH%%; -+ - const buildCreation = unixTimestamp * 1000; - - const buildExpiration = buildCreation + DAY * 90; diff --git a/net-im/signal-desktop/files/sqlite3.gyp.diff b/net-im/signal-desktop/files/sqlite3.gyp.diff index fc4d9b0fcaa0..5e78830a21ca 100644 --- a/net-im/signal-desktop/files/sqlite3.gyp.diff +++ b/net-im/signal-desktop/files/sqlite3.gyp.diff @@ -1,17 +1,17 @@ ---- npm-better-sqlite3-7.5.1-afdbd49cf18d0046d7385ca4d23da20c66f00d50/node_modules/better-sqlite3/deps/sqlite3.gyp.orig 2022-07-02 14:34:04 UTC -+++ npm-better-sqlite3-7.5.1-afdbd49cf18d0046d7385ca4d23da20c66f00d50/node_modules/better-sqlite3/deps/sqlite3.gyp -@@ -95,6 +95,14 @@ - ] - } - }, +--- npm-@signalapp-better-sqlite3-8.0.3-c279ca3f1d1e7f6554d2a629d717e96e1ec45809-integrity/node_modules/@signalapp/better-sqlite3/deps/sqlite3.gyp.orig 2022-07-02 14:34:04 UTC ++++ npm-@signalapp-better-sqlite3-8.0.3-c279ca3f1d1e7f6554d2a629d717e96e1ec45809-integrity/node_modules/@signalapp/better-sqlite3/deps/sqlite3.gyp +@@ -92,6 +92,14 @@ + 'libraries': [ + # This statically links libcrypto, whereas -lcrypto would dynamically link it + '<(SHARED_INTERMEDIATE_DIR)/sqlite3/OpenSSL-mac-<(target_arch)/libcrypto.a' ++ ] ++ } ++ }, + 'OS == "freebsd"', { + 'link_settings': { + 'libraries': [ + # This statically links libcrypto, whereas -lcrypto would dynamically link it + '/usr/local/lib/libcrypto.a' -+ ] -+ } -+ }, - { # Linux - 'link_settings': { - 'libraries': [ + ] + } + }, diff --git a/net-im/signal-desktop/pkg-plist b/net-im/signal-desktop/pkg-plist index 6b3ac0810722..be2b9b228d6f 100644 --- a/net-im/signal-desktop/pkg-plist +++ b/net-im/signal-desktop/pkg-plist @@ -1,112 +1,112 @@ bin/signal-desktop share/applications/signal-desktop.desktop share/pixmaps/signal-desktop.png %%DATADIR%%/LICENSE.electron.txt %%DATADIR%%/LICENSES.chromium.html %%DATADIR%%/chrome_100_percent.pak %%DATADIR%%/chrome_200_percent.pak %%DATADIR%%/libEGL.so %%DATADIR%%/libGLESv2.so %%DATADIR%%/libffmpeg.so %%DATADIR%%/libvk_swiftshader.so %%DATADIR%%/libvulkan.so %%DATADIR%%/locales/af-ZA.pak %%DATADIR%%/locales/af.pak %%DATADIR%%/locales/am.pak %%DATADIR%%/locales/ar.pak %%DATADIR%%/locales/az-AZ.pak %%DATADIR%%/locales/bg-BG.pak %%DATADIR%%/locales/bg.pak %%DATADIR%%/locales/bn-BD.pak %%DATADIR%%/locales/bn.pak %%DATADIR%%/locales/bs-BA.pak %%DATADIR%%/locales/ca.pak %%DATADIR%%/locales/cs.pak %%DATADIR%%/locales/da.pak %%DATADIR%%/locales/de.pak %%DATADIR%%/locales/el.pak %%DATADIR%%/locales/en-GB.pak %%DATADIR%%/locales/en-US.pak %%DATADIR%%/locales/es-419.pak %%DATADIR%%/locales/es.pak %%DATADIR%%/locales/et-EE.pak %%DATADIR%%/locales/et.pak %%DATADIR%%/locales/eu.pak %%DATADIR%%/locales/fa-IR.pak %%DATADIR%%/locales/fa.pak %%DATADIR%%/locales/fi.pak %%DATADIR%%/locales/fil.pak %%DATADIR%%/locales/fr.pak %%DATADIR%%/locales/ga-IE.pak %%DATADIR%%/locales/gl-ES.pak %%DATADIR%%/locales/gu-IN.pak %%DATADIR%%/locales/gu.pak %%DATADIR%%/locales/he.pak %%DATADIR%%/locales/hi-IN.pak %%DATADIR%%/locales/hi.pak %%DATADIR%%/locales/hr-HR.pak %%DATADIR%%/locales/hr.pak %%DATADIR%%/locales/hu.pak %%DATADIR%%/locales/id.pak %%DATADIR%%/locales/it.pak %%DATADIR%%/locales/ja.pak %%DATADIR%%/locales/ka-GE.pak %%DATADIR%%/locales/kk-KZ.pak %%DATADIR%%/locales/km-KH.pak %%DATADIR%%/locales/kn-IN.pak %%DATADIR%%/locales/kn.pak %%DATADIR%%/locales/ko.pak %%DATADIR%%/locales/ky-KG.pak %%DATADIR%%/locales/lt-LT.pak %%DATADIR%%/locales/lt.pak %%DATADIR%%/locales/lv-LV.pak %%DATADIR%%/locales/lv.pak %%DATADIR%%/locales/mk-MK.pak %%DATADIR%%/locales/ml-IN.pak %%DATADIR%%/locales/ml.pak %%DATADIR%%/locales/mr-IN.pak %%DATADIR%%/locales/mr.pak %%DATADIR%%/locales/ms.pak %%DATADIR%%/locales/my.pak %%DATADIR%%/locales/nb.pak %%DATADIR%%/locales/nl.pak %%DATADIR%%/locales/pa-IN.pak %%DATADIR%%/locales/pl.pak %%DATADIR%%/locales/pt-BR.pak %%DATADIR%%/locales/pt-PT.pak %%DATADIR%%/locales/ro-RO.pak %%DATADIR%%/locales/ro.pak %%DATADIR%%/locales/ru.pak %%DATADIR%%/locales/sk-SK.pak %%DATADIR%%/locales/sk.pak %%DATADIR%%/locales/sl-SI.pak %%DATADIR%%/locales/sl.pak %%DATADIR%%/locales/sq-AL.pak %%DATADIR%%/locales/sr-RS.pak %%DATADIR%%/locales/sr-YR.pak %%DATADIR%%/locales/sr.pak %%DATADIR%%/locales/sv.pak %%DATADIR%%/locales/sw.pak %%DATADIR%%/locales/ta-IN.pak %%DATADIR%%/locales/ta.pak %%DATADIR%%/locales/te-IN.pak %%DATADIR%%/locales/te.pak %%DATADIR%%/locales/th.pak %%DATADIR%%/locales/tl-PH.pak %%DATADIR%%/locales/tr.pak %%DATADIR%%/locales/uk-UA.pak %%DATADIR%%/locales/uk.pak %%DATADIR%%/locales/ur.pak %%DATADIR%%/locales/vi.pak %%DATADIR%%/locales/zh-CN.pak %%DATADIR%%/locales/zh-HK.pak %%DATADIR%%/locales/zh-TW.pak %%DATADIR%%/resources.pak %%DATADIR%%/resources/app.asar +%%DATADIR%%/resources/app.asar.unpacked/node_modules/@signalapp/better-sqlite3/build/Release/better_sqlite3.node %%DATADIR%%/resources/app.asar.unpacked/node_modules/@signalapp/libsignal-client/prebuilds/freebsd-%%NODE_ARCH%%/node.napi.node -%%DATADIR%%/resources/app.asar.unpacked/node_modules/better-sqlite3/build/Release/better_sqlite3.node %%DATADIR%%/resources/app.asar.unpacked/node_modules/ringrtc/build/freebsd/libringrtc-%%NODE_ARCH%%.node @(,,755) %%DATADIR%%/signal-desktop %%DATADIR%%/snapshot_blob.bin %%DATADIR%%/v8_context_snapshot.bin %%DATADIR%%/vk_swiftshader_icd.json