diff --git a/net-im/signal-desktop/Makefile b/net-im/signal-desktop/Makefile index 7f56e8ba93a1..7b054fb3bded 100644 --- a/net-im/signal-desktop/Makefile +++ b/net-im/signal-desktop/Makefile @@ -1,240 +1,236 @@ PORTNAME= signal-desktop DISTVERSIONPREFIX= v -DISTVERSION= 6.34.0 +DISTVERSION= 6.35.0 CATEGORIES= net-im MASTER_SITES= LOCAL/mikael/signal-desktop/:npm \ LOCAL/mikael/signal-desktop/:sqlite \ LOCAL/mikael/signal-desktop/:yarn \ https://build-artifacts.signal.org/desktop/:sqlcipher DISTFILES= signal-desktop-${DISTVERSION}-yarn-cache.tar.gz:yarn \ signal-desktop-6.4.1-npm-cache.tar.gz:npm \ ${SQLCIPHER}.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 EXTRACT_DEPENDS=jq:textproc/jq \ yarn-node18>0:www/yarn-node18 BUILD_DEPENDS= ${LOCALBASE}/lib/libcrypto.a:security/openssl \ ${LOCALBASE}/lib/libringrtc.so:multimedia/ringrtc \ ${LOCALBASE}/lib/libsignal_node.so:net-im/libsignal-node \ ${LOCALBASE}/lib/libsignal_tokenizer.a:devel/signal-fts5-extension \ app-builder>0:devel/app-builder \ electron${ELECTRON_VER_MAJOR}:devel/electron${ELECTRON_VER_MAJOR} \ jq:textproc/jq \ npm:www/npm-node18 \ vips>0:graphics/vips \ yarn:www/yarn-node18 LIB_DEPENDS= libasound.so:audio/alsa-lib \ libatk-bridge-2.0.so:accessibility/at-spi2-core \ libatspi.so:accessibility/at-spi2-core \ libcups.so:print/cups \ libdbus-1.so:devel/dbus \ libdrm.so:graphics/libdrm \ libepoll-shim.so:devel/libepoll-shim \ libevent.so:devel/libevent \ libexpat.so:textproc/expat2 \ libFLAC.so:audio/flac \ libffi.so:devel/libffi \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libicuuc.so:devel/icu \ 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 \ libwayland-client.so:graphics/wayland \ 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} \ USE_SYSTEM_APP_BUILDER=true \ SOURCE_DATE_EPOCH=${_BUILD_DATE} \ PATH=${WRKSRC}/node_modules/.bin:${LOCALBASE}/bin:${PATH} # 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= 25 # sh get_deps.sh NPM_SIGNAL_DIR= npm-@signalapp-libsignal-client-0.31.0-f420a009f97b80ba5da216b9cdaec543f3ef7097-integrity NPM_RINGRTC_DIR= npm-@signalapp-ringrtc-2.33.0-a18baa71c43e4a4d5ea996febcdfaac4e5a62f51-integrity NPM_SQLITE3_DIR= npm-@signalapp-better-sqlite3-8.5.2-910669f44e76a46d06df45fabefcd3ac2e7c4cce-integrity NPM_ESBUILD_VERS= 0.17.11 SQLCIPHER= sqlcipher-4.5.5-fts5-fix--3.0.7--0.2.1-ef53ea45ed92b928ecfd33c552d8d405263e86e63dec38e1ec63e1b0193b630b ESBUILD_ARCH= ${ARCH:S/aarch64/arm64/:S/amd64/x64/} 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/} YARN_TIMESTAMP= 1661146515 .include .if ${ARCH} == aarch64 PLIST_SUB+= NOT_AARCH64="@comment " .elif ${ARCH} == amd64 PLIST_SUB+= NOT_AARCH64="" .endif fetch-yarn: if [ ! -f ${DISTDIR}/signal-desktop-${DISTVERSION}-yarn-cache.tar.gz ]; then \ ${MKDIR} /tmp/signal-desktop; \ ${FETCH_CMD} -o - https://raw.githubusercontent.com/signalapp/Signal-Desktop/v${DISTVERSION}/package.json | \ ${PREFIX}/bin/jq '.engines.node = ""' > /tmp/signal-desktop/package.json; \ ${FETCH_CMD} -o /tmp/signal-desktop/yarn.lock https://raw.githubusercontent.com/signalapp/Signal-Desktop/v${DISTVERSION}/yarn.lock; \ ${ECHO_CMD} 'yarn-offline-mirror "./yarn-offline-cache"' >> \ /tmp/signal-desktop/.yarnrc; \ ${PREFIX}/bin/jq 'del(.devDependencies."@signalapp/mock-server")' /tmp/signal-desktop/package.json > /tmp/signal-desktop/package.json.tmp; \ ${MV} /tmp/signal-desktop/package.json.tmp /tmp/signal-desktop/package.json; \ cd /tmp/signal-desktop && ${SETENV} HOME=/tmp/signal-desktop XDG_CACHE_HOME=/tmp/signal-desktop/.cache \ yarn --frozen-lockfile --ignore-scripts; \ ${MTREE_CMD} -cbnSp yarn-offline-cache | ${MTREE_CMD} -C | ${SED} \ -e 's:time=[0-9.]*:time=${YARN_TIMESTAMP}.000000000:' \ -e 's:\([gu]id\)=[0-9]*:\1=0:g' \ -e 's:flags=.*:flags=none:' \ -e 's:^\.:./yarn-offline-cache:' > yarn-offline-cache.mtree; \ ${TAR} cJf ${DISTDIR}/signal-desktop-${DISTVERSION}-yarn-cache.tar.gz \ @yarn-offline-cache.mtree; \ ${RM} -r ${WRKDIR}; \ fi -post-patch: - ${REINPLACE_CMD} "s#%%EPOCH%%#${_BUILD_DATE}#" \ - ${WRKSRC}/ts/scripts/get-expire-time.ts - post-extract: # install yarn modules and fail silently ${ECHO_CMD} 'yarn-offline-mirror "../yarn-offline-cache"' > ${WRKSRC}/.yarnrc ${ECHO_CMD} 'nodedir "${LOCALBASE}"' >> ${WRKSRC}/.yarnrc # Update node engine ${PREFIX}/bin/jq '.engines.node = ""' ${WRKSRC}/package.json > ${WRKSRC}/package.json.tmp ${MV} ${WRKSRC}/package.json.tmp ${WRKSRC}/package.json # remove mock-server as it doesn't build and is useless ${PREFIX}/bin/jq 'del(.devDependencies."@signalapp/mock-server")' ${WRKSRC}/package.json > ${WRKSRC}/package.json.tmp ${MV} ${WRKSRC}/package.json.tmp ${WRKSRC}/package.json cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} yarn install --frozen-lockfile --ignore-optional --offline || ${TRUE} do-build: ${ECHO_CMD} 'yarn-offline-mirror "../yarn-offline-cache"' > ${WRKSRC}/.yarnrc ${ECHO_CMD} 'nodedir "${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR}/node_headers"' >> ${WRKSRC}/.yarnrc # electron-builder is stupid and tries to open ${LOCALBASE}/share/electron25/electron with WRITE priv # copy ${LOCALBASE}/share/electron25 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/@signalapp/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/@signalapp/ringrtc/build/freebsd/libringrtc-${NODE_ARCH}.node ${MKDIR} ${WRKDIR}/.cache/yarn/v6/${NPM_SQLITE3_DIR}/node_modules/@signalapp/better-sqlite3/deps ${CP} ${DISTDIR}/${SQLCIPHER}.tar.gz \ ${WRKDIR}/.cache/yarn/v6/${NPM_SQLITE3_DIR}/node_modules/@signalapp/better-sqlite3/deps/sqlcipher.tar.gz ${CP} ${FILESDIR}/fetch-prebuild.js \ ${WRKDIR}/.cache/yarn/v6/${NPM_RINGRTC_DIR}/node_modules/@signalapp/ringrtc/scripts/fetch-prebuild.js ${CP} ${FILESDIR}/download.js \ ${WRKDIR}/.cache/yarn/v6/${NPM_SQLITE3_DIR}/node_modules/@signalapp/better-sqlite3/deps/download.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-offline-cache/@esbuild-freebsd-${ESBUILD_ARCH}-${NPM_ESBUILD_VERS}.tgz -C ${WRKDIR}/esbuild-freebsd-64 # 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:esbuild:prod 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 # This seems to be only required for Windows: ${RM} -r ${STAGEDIR}${DATADIR}/resources/app.asar.unpacked/node_modules/@nodert-win10-rs4 ${RM} -r ${STAGEDIR}${DATADIR}/resources/app.asar.unpacked/node_modules/@signalapp/windows-dummy-keystroke 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 bf5efd9a4ece..6d3b5b1d95bb 100644 --- a/net-im/signal-desktop/distinfo +++ b/net-im/signal-desktop/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1697273870 -SHA256 (signal-desktop-6.34.0-yarn-cache.tar.gz) = fc3e8ef83cd33da3c2cb61377d5b261550b8e4a7d328be6db64f1fcd5304d608 -SIZE (signal-desktop-6.34.0-yarn-cache.tar.gz) = 374320508 +TIMESTAMP = 1697785584 +SHA256 (signal-desktop-6.35.0-yarn-cache.tar.gz) = fc3e8ef83cd33da3c2cb61377d5b261550b8e4a7d328be6db64f1fcd5304d608 +SIZE (signal-desktop-6.35.0-yarn-cache.tar.gz) = 374320508 SHA256 (signal-desktop-6.4.1-npm-cache.tar.gz) = 8acc503a579760faf8ea660d504f3b3ffadc495bf09584228da4cc9af20e33fe SIZE (signal-desktop-6.4.1-npm-cache.tar.gz) = 4466353 SHA256 (sqlcipher-4.5.5-fts5-fix--3.0.7--0.2.1-ef53ea45ed92b928ecfd33c552d8d405263e86e63dec38e1ec63e1b0193b630b.tar.gz) = ef53ea45ed92b928ecfd33c552d8d405263e86e63dec38e1ec63e1b0193b630b SIZE (sqlcipher-4.5.5-fts5-fix--3.0.7--0.2.1-ef53ea45ed92b928ecfd33c552d8d405263e86e63dec38e1ec63e1b0193b630b.tar.gz) = 75708533 -SHA256 (signalapp-Signal-Desktop-v6.34.0_GH0.tar.gz) = 62cb1f6a3c835eca3a23fe379b43f93576e7d9a0e4d6098e8edab948fb671c10 -SIZE (signalapp-Signal-Desktop-v6.34.0_GH0.tar.gz) = 42556130 +SHA256 (signalapp-Signal-Desktop-v6.35.0_GH0.tar.gz) = 822a4f5b722c6288e28c2d697093fa90a2d71c63bb336ef1f6194bb11b26dc80 +SIZE (signalapp-Signal-Desktop-v6.35.0_GH0.tar.gz) = 42554576 diff --git a/net-im/signal-desktop/files/patch-app_main.ts b/net-im/signal-desktop/files/patch-app_main.ts new file mode 100644 index 000000000000..abd04e0d996e --- /dev/null +++ b/net-im/signal-desktop/files/patch-app_main.ts @@ -0,0 +1,11 @@ +--- app/main.ts.orig 2023-10-19 19:29:53 UTC ++++ app/main.ts +@@ -648,7 +648,7 @@ if (OS.isWindows()) { + + 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'); diff --git a/net-im/signal-desktop/files/patch-signal-desktop b/net-im/signal-desktop/files/patch-signal-desktop deleted file mode 100644 index 13a8755a56bd..000000000000 --- a/net-im/signal-desktop/files/patch-signal-desktop +++ /dev/null @@ -1,149 +0,0 @@ ---- ts/models/messages.ts.orig 2023-02-02 21:51:07.000000000 +0100 -+++ ts/models/messages.ts 2023-02-03 18:17:14.799327000 +0100 -@@ -908,7 +908,7 @@ export class MessageModel extends window.Backbone.Mode - }); - } - -- if (!window.Signal.OS.isLinux()) { -+ if (!(window.Signal.OS.isLinux() || window.Signal.OS.isFreeBSD())) { - return attributes.storyReaction.emoji; - } - -@@ -927,7 +927,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/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 -@@ -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/state/getInitialState.ts.orig 2023-02-05 14:58:42.686190000 +0100 -+++ ts/state/getInitialState.ts 2023-02-05 14:59:18.608061000 +0100 -@@ -69,7 +69,7 @@ export function getInitialState({ - - const theme = getThemeType(); - -- let osName: 'windows' | 'macos' | 'linux' | undefined; -+ let osName: 'windows' | 'macos' | 'linux' | 'freebsd' | undefined; - - if (OS.isWindows()) { - osName = 'windows'; -@@ -77,6 +77,8 @@ export function getInitialState({ - osName = 'macos'; - } else if (OS.isLinux()) { - osName = 'linux'; -+ } else if (OS.isFreeBSD()) { -+ osName = 'freebsd'; - } - - return { ---- ts/scripts/fuse-electron.ts.orig 2023-02-05 15:01:26.625383000 +0100 -+++ ts/scripts/fuse-electron.ts 2023-02-05 15:02:05.602959000 +0100 -@@ -17,7 +17,7 @@ export async function afterPack({ - target = `${productFilename}.app`; - } else if (electronPlatformName === 'win32') { - target = `${productFilename}.exe`; -- } else if (electronPlatformName === 'linux') { -+ } else if (electronPlatformName === 'linux' || electronPlatformName === 'freebsd') { - // Sadly, `LinuxPackager` type is not exported by electron-builder so we - // have to improvise - target = (packager as unknown as { executableName: string }).executableName; ---- ts/state/ducks/user.ts.orig 2023-09-06 22:21:55.000000000 +0200 -+++ ts/state/ducks/user.ts 2023-09-07 19:44:10.838670000 +0200 -@@ -23,7 +23,7 @@ export type UserStateType = Readonly<{ - isMainWindowMaximized: boolean; - localeMessages: LocaleMessagesType; - menuOptions: MenuOptionsType; -- osName: 'linux' | 'macos' | 'windows' | undefined; -+ osName: 'linux' | 'macos' | 'windows' | 'freebsd' | undefined; - ourAci: AciString | undefined; - ourConversationId: string | undefined; - ourDeviceId: number | undefined; -@@ -114,7 +114,7 @@ export function getEmptyState(): UserStateType { - // Reducer - - export function getEmptyState(): UserStateType { -- let osName: 'windows' | 'macos' | 'linux' | undefined; -+ let osName: 'windows' | 'macos' | 'linux' | 'freebsd' | undefined; - - if (OS.isWindows()) { - osName = 'windows'; -@@ -122,6 +122,8 @@ export function getEmptyState(): UserStateType { - osName = 'macos'; - } else if (OS.isLinux()) { - osName = 'linux'; -+ } else if (OS.isFreeBSD()) { -+ osName = 'freebsd'; - } - - return { ---- ts/util/os/shared.ts.orig 2023-05-11 11:10:27.504955000 +0200 -+++ ts/util/os/shared.ts 2023-05-11 11:11:17.326542000 +0200 -@@ -32,6 +32,7 @@ export function getOSFunctions(osRelease: string): OST - const isMacOS = createIsPlatform('darwin', osRelease); - const isLinux = createIsPlatform('linux', osRelease); - const isWindows = createIsPlatform('win32', osRelease); -+ const isFreeBSD = createIsPlatform('freebsd', osRelease); - - // Windows 10 and above - const hasCustomTitleBar = (): boolean => -@@ -44,6 +45,9 @@ export function getOSFunctions(osRelease: string): OST - if (isWindows()) { - return 'Windows'; - } -+ if (isFreeBSD()) { -+ return 'FreeBSD'; -+ } - return 'Linux'; - }; - -@@ -54,6 +58,9 @@ export function getOSFunctions(osRelease: string): OST - if (isWindows()) { - return 'os-windows'; - } -+ if (isFreeBSD()) { -+ return 'os-freebsd'; -+ } - return 'os-linux'; - }; - -@@ -64,5 +71,6 @@ export function getOSFunctions(osRelease: string): OST - isLinux, - isMacOS, - isWindows, -+ isFreeBSD, - }; - } diff --git a/net-im/signal-desktop/files/patch-ts_scripts_fuse-electron.ts b/net-im/signal-desktop/files/patch-ts_scripts_fuse-electron.ts new file mode 100644 index 000000000000..c5628e9f2e78 --- /dev/null +++ b/net-im/signal-desktop/files/patch-ts_scripts_fuse-electron.ts @@ -0,0 +1,11 @@ +--- ts/scripts/fuse-electron.ts.orig 2023-10-19 19:29:53 UTC ++++ ts/scripts/fuse-electron.ts +@@ -17,7 +17,7 @@ export async function afterPack({ + target = `${productFilename}.app`; + } else if (electronPlatformName === 'win32') { + target = `${productFilename}.exe`; +- } else if (electronPlatformName === 'linux') { ++ } else if (electronPlatformName === 'linux' || electronPlatformName === 'freebsd') { + // Sadly, `LinuxPackager` type is not exported by electron-builder so we + // have to improvise + target = (packager as unknown as { executableName: string }).executableName; diff --git a/net-im/signal-desktop/files/patch-ts_state_ducks_user.ts b/net-im/signal-desktop/files/patch-ts_state_ducks_user.ts new file mode 100644 index 000000000000..12f1493dab46 --- /dev/null +++ b/net-im/signal-desktop/files/patch-ts_state_ducks_user.ts @@ -0,0 +1,29 @@ +--- ts/state/ducks/user.ts.orig 2023-10-19 19:29:53 UTC ++++ ts/state/ducks/user.ts +@@ -23,7 +23,7 @@ export type UserStateType = Readonly<{ + isMainWindowMaximized: boolean; + localeMessages: LocaleMessagesType; + menuOptions: MenuOptionsType; +- osName: 'linux' | 'macos' | 'windows' | undefined; ++ osName: 'linux' | 'macos' | 'windows' | 'freebsd' | undefined; + ourAci: AciString | undefined; + ourConversationId: string | undefined; + ourDeviceId: number | undefined; +@@ -114,7 +114,7 @@ export function getEmptyState(): UserStateType { + // Reducer + + export function getEmptyState(): UserStateType { +- let osName: 'windows' | 'macos' | 'linux' | undefined; ++ let osName: 'windows' | 'macos' | 'linux' | 'freebsd' | undefined; + + if (OS.isWindows()) { + osName = 'windows'; +@@ -122,6 +122,8 @@ export function getEmptyState(): UserStateType { + osName = 'macos'; + } else if (OS.isLinux()) { + osName = 'linux'; ++ } else if (OS.isFreeBSD()) { ++ osName = 'freebsd'; + } + + return { diff --git a/net-im/signal-desktop/files/patch-ts_state_getInitialState.ts b/net-im/signal-desktop/files/patch-ts_state_getInitialState.ts new file mode 100644 index 000000000000..92ba02386fe6 --- /dev/null +++ b/net-im/signal-desktop/files/patch-ts_state_getInitialState.ts @@ -0,0 +1,20 @@ +--- ts/state/getInitialState.ts.orig 2023-10-19 19:29:53 UTC ++++ ts/state/getInitialState.ts +@@ -72,7 +72,7 @@ export function getInitialState({ + + const theme = getThemeType(); + +- let osName: 'windows' | 'macos' | 'linux' | undefined; ++ let osName: 'windows' | 'macos' | 'linux' | 'freebsd' | undefined; + + if (OS.isWindows()) { + osName = 'windows'; +@@ -80,6 +80,8 @@ export function getInitialState({ + osName = 'macos'; + } else if (OS.isLinux()) { + osName = 'linux'; ++ } else if (OS.isFreeBSD()) { ++ osName = 'freebsd'; + } + + return { diff --git a/net-im/signal-desktop/files/patch-ts_types_Settings.ts b/net-im/signal-desktop/files/patch-ts_types_Settings.ts new file mode 100644 index 000000000000..950e6adf8fb4 --- /dev/null +++ b/net-im/signal-desktop/files/patch-ts_types_Settings.ts @@ -0,0 +1,11 @@ +--- ts/types/Settings.ts.orig 2023-10-19 19:29:53 UTC ++++ ts/types/Settings.ts +@@ -34,7 +34,7 @@ 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)); + + // On Windows minimize and start in system tray is default when app is selected + // to launch at login, because we can provide `['--start-in-tray']` args. diff --git a/net-im/signal-desktop/files/patch-ts_updater_index.ts b/net-im/signal-desktop/files/patch-ts_updater_index.ts index b2882bff6384..b87f5678d1a7 100644 --- a/net-im/signal-desktop/files/patch-ts_updater_index.ts +++ b/net-im/signal-desktop/files/patch-ts_updater_index.ts @@ -1,10 +1,10 @@ ---- ts/updater/index.ts.orig 2022-12-04 09:57:09 UTC +--- ts/updater/index.ts.orig 2023-10-19 19:29:53 UTC +++ ts/updater/index.ts -@@ -61,6 +61,6 @@ function autoUpdateDisabled() { +@@ -72,6 +72,6 @@ function autoUpdateDisabled() { function autoUpdateDisabled() { return ( - process.platform === 'linux' || process.mas || !config.get('updatesEnabled') + process.platform === 'freebsd' || process.platform === 'linux' || process.mas || !config.get('updatesEnabled') ); } diff --git a/net-im/signal-desktop/files/patch-ts_util_getUserAgent.ts b/net-im/signal-desktop/files/patch-ts_util_getUserAgent.ts new file mode 100644 index 000000000000..4d540e455587 --- /dev/null +++ b/net-im/signal-desktop/files/patch-ts_util_getUserAgent.ts @@ -0,0 +1,10 @@ +--- ts/util/getUserAgent.ts.orig 2023-10-19 19:29:53 UTC ++++ ts/util/getUserAgent.ts +@@ -9,6 +9,7 @@ const PLATFORM_STRINGS: { [platform: string]: string } + win32: 'Windows', + darwin: 'macOS', + linux: 'Linux', ++ freebsd: 'FreeBSD', + }; + + export function getUserAgent( diff --git a/net-im/signal-desktop/files/patch-ts_util_os_shared.ts b/net-im/signal-desktop/files/patch-ts_util_os_shared.ts new file mode 100644 index 000000000000..01fb523e2d3a --- /dev/null +++ b/net-im/signal-desktop/files/patch-ts_util_os_shared.ts @@ -0,0 +1,37 @@ +--- ts/util/os/shared.ts.orig 2023-10-19 19:29:53 UTC ++++ ts/util/os/shared.ts +@@ -32,6 +32,7 @@ export function getOSFunctions(osRelease: string): OST + const isMacOS = createIsPlatform('darwin', osRelease); + const isLinux = createIsPlatform('linux', osRelease); + const isWindows = createIsPlatform('win32', osRelease); ++ const isFreeBSD = createIsPlatform('freebsd', osRelease); + + // Windows 10 and above + const hasCustomTitleBar = (): boolean => +@@ -44,6 +45,9 @@ export function getOSFunctions(osRelease: string): OST + if (isWindows()) { + return 'Windows'; + } ++ if (isFreeBSD()) { ++ return 'FreeBSD'; ++ } + return 'Linux'; + }; + +@@ -54,6 +58,9 @@ export function getOSFunctions(osRelease: string): OST + if (isWindows()) { + return 'os-windows'; + } ++ if (isFreeBSD()) { ++ return 'os-freebsd'; ++ } + return 'os-linux'; + }; + +@@ -64,5 +71,6 @@ export function getOSFunctions(osRelease: string): OST + isLinux, + isMacOS, + isWindows, ++ isFreeBSD, + }; + } diff --git a/net-im/signal-desktop/get_deps.sh b/net-im/signal-desktop/get_deps.sh index 573200e4c5ce..bc504e3101b3 100644 --- a/net-im/signal-desktop/get_deps.sh +++ b/net-im/signal-desktop/get_deps.sh @@ -1,44 +1,44 @@ #!/bin/sh -SIGNAL_VERS=v6.34.0 +SIGNAL_VERS=v6.35.0 fetch -qo /tmp/package.json https://raw.githubusercontent.com/signalapp/Signal-Desktop/${SIGNAL_VERS}/package.json node_version=$(awk /'"node":'/'{print $2}' /tmp/package.json | sed 's/"//g') echo "NODE_VERSION= ${node_version}" ringrtc_version=$(grep '@signalapp/ringrtc"' /tmp/package.json | awk -F ":" '{print $2}' | sed -E 's#("|,| )##g') echo "RINGRTC_VERSION= ${ringrtc_version}" webrtc_version=$(fetch -qo - https://raw.githubusercontent.com/signalapp/ringrtc/v${ringrtc_version}/config/version.properties | grep 'webrtc.version' | awk -F '=' '{print $2}') echo "WEBRTC_REV= ${webrtc_version}" libsignalclient_version=$(grep '@signalapp/libsignal-client' /tmp/package.json | awk -F ":" '{print $2}' | sed -E 's#("|,| )##g') echo "LIBSIGNAL_VERSION= ${libsignalclient_version}" electron_version=$(grep '"electron":' /tmp/package.json | awk -F ":" '{print $2}' | sed -E 's#("|,| )##g') echo "ELECTRON_VERSION= ${electron_version}" bsqlite3_version=$(grep '@signalapp/better-sqlite3' /tmp/package.json | awk -F ":" '{print $2}' | sed -E 's#("|,| )##g') esbuild_version=$(grep '"esbuild":' /tmp/package.json | awk -F ":" '{print $2}' | sed -E 's#("|,| )##g') echo "ESBUILD_VERSION= ${esbuild_version}" fetch -qo /tmp/download.js https://raw.githubusercontent.com/signalapp/better-sqlite3/v${bsqlite3_version}/deps/download.js BASE_URI=https://build-artifacts.signal.org/desktop HASH=$(awk /"HASH ="/'{print $4}' /tmp/download.js | sed -e 's#;##g' -e "s#'##g") SQLCIPHER_VERSION=$(awk /"SQLCIPHER_VERSION ="/'{print $4}' /tmp/download.js | sed -e 's#;##g' -e "s#'##g") OPENSSL_VERSION=$(awk /"OPENSSL_VERSION ="/'{print $4}' /tmp/download.js | sed -e 's#;##g' -e "s#'##g") TOKENIZER_VERSION=$(awk /"TOKENIZER_VERSION ="/'{print $4}' /tmp/download.js | sed -e 's#;##g' -e "s#'##g") TAG="${SQLCIPHER_VERSION}--${OPENSSL_VERSION}--${TOKENIZER_VERSION}" echo "Signal-FTS5-Extension= ${TOKENIZER_VERSION}" echo "SQLCIPHER=sqlcipher-${TAG}-${HASH}" | portedit merge -i Makefile fetch -qo /tmp/yarn.lock https://raw.githubusercontent.com/signalapp/Signal-Desktop/${SIGNAL_VERS}/yarn.lock npm_signal_hash=$(egrep "libsignal-client.*${libsignalclient_version}" /tmp/yarn.lock | awk -F '#' /resolved/'{print $2}' | sed 's/"//g') echo "NPM_SIGNAL_DIR=npm-@signalapp-libsignal-client-${libsignalclient_version}-${npm_signal_hash}-integrity" | portedit merge -i Makefile npm_ringrtc_hash=$(grep ringrtc /tmp/yarn.lock | awk -F '#' /resolved/'{print $2}' | sed 's/"//g') echo "NPM_RINGRTC_DIR=npm-@signalapp-ringrtc-${ringrtc_version}-${npm_ringrtc_hash}-integrity" | portedit merge -i Makefile npm_bsqlite3_hash=$(grep better-sqlite3 /tmp/yarn.lock | awk -F '#' /resolved/'{print $2}' | sed 's/"//g') echo "NPM_SQLITE3_DIR=npm-@signalapp-better-sqlite3-${bsqlite3_version}-${npm_bsqlite3_hash}-integrity" | portedit merge -i Makefile