forge/ayaports
1
0
Fork 0
Code Issues 43 Pull requests 11 Projects Releases Packages Wiki Activity Actions

backports/signal-desktop: downgrade to 6.18.1

Browse source
This commit is contained in:
Antoine Martin 2023-08-30 11:52:38 -04:00
parent f06a24abed
commit 6354220dfd
4 changed files with 32 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
backports/signal-desktop/APKBUILD
View file

@ -1,8 +1,8 @@
# Contributor: lauren n. liberda <lauren@selfisekai.rocks> # Contributor: Lauren N. Liberda <lauren@selfisekai.rocks>
# Maintainer: lauren n. liberda <lauren@selfisekai.rocks> # Maintainer: Lauren N. Liberda <lauren@selfisekai.rocks>
pkgname=signal-desktop pkgname=signal-desktop
pkgver=6.29.1 pkgver=6.18.1
pkgrel=0 pkgrel=1
pkgdesc="A messaging app for simple private communication with friends" pkgdesc="A messaging app for simple private communication with friends"
url="https://github.com/signalapp/Signal-Desktop/" url="https://github.com/signalapp/Signal-Desktop/"
# same as electron # same as electron
@ -18,29 +18,21 @@ depends="
" "
makedepends=" makedepends="
alsa-lib-dev alsa-lib-dev
aom-dev
brotli-dev
bsd-compat-headers bsd-compat-headers
cargo cargo
cargo-auditable cargo-auditable
cbindgen cbindgen
clang-dev clang-dev
cmake cmake
crc32c-dev
dav1d-dev
electron-dev electron-dev
electron-tasje electron-tasje
ffmpeg-dev ffmpeg-dev
git-lfs git-lfs
glib-dev glib-dev
gn gn
jsoncpp-dev
libavif-dev
libjpeg-turbo-dev
libepoxy-dev libepoxy-dev
libevent-dev libevent-dev
libvpx-dev libvpx-dev
libwebp-dev
lld lld
llvm-dev llvm-dev
mesa-dev mesa-dev
@ -62,14 +54,14 @@ makedepends="
options="net !check" options="net !check"
# follow signal-desktop package.json -> @signalapp/libsignal-client # follow signal-desktop package.json -> @signalapp/libsignal-client
_libsignalver=0.29.1 _libsignalver=0.22.0
# follow signal-desktop package.json -> @signalapp/ringrtc # follow signal-desktop package.json -> @signalapp/ringrtc
_ringrtcver=2.29.1 _ringrtcver=2.26.4
# follow ringrtc (on version above) -> config/version.properties -> webrtc.version # follow ringrtc (on version above) -> config/version.properties -> webrtc.version
# downloading tarball generated with abuild snapshot (with gclient dependencies fetched) # downloading tarball generated with abuild snapshot (with gclient dependencies fetched)
_webrtcver=5615e _webrtcver=5481c
# follow @signalapp/better-sqlite3 (on version in package.json) -> deps/download.js -> TOKENIZER_VERSION # follow @signalapp/better-sqlite3 (on version in package.json) -> deps/download.js -> TOKENIZER_VERSION
# last bsqlite version: 8.4.3 # last bsqlite version: 8.4.3
@ -79,11 +71,12 @@ source="
https://github.com/signalapp/Signal-Desktop/archive/refs/tags/v$pkgver/Signal-Desktop-$pkgver.tar.gz https://github.com/signalapp/Signal-Desktop/archive/refs/tags/v$pkgver/Signal-Desktop-$pkgver.tar.gz
https://github.com/signalapp/libsignal/archive/refs/tags/v$_libsignalver/libsignal-$_libsignalver.tar.gz https://github.com/signalapp/libsignal/archive/refs/tags/v$_libsignalver/libsignal-$_libsignalver.tar.gz
https://github.com/signalapp/ringrtc/archive/refs/tags/v$_ringrtcver/ringrtc-$_ringrtcver.tar.gz https://github.com/signalapp/ringrtc/archive/refs/tags/v$_ringrtcver/ringrtc-$_ringrtcver.tar.gz
https://s3.sakamoto.pl/lnl-aports-snapshots/webrtc-$_webrtcver.tar.zst https://s3.sakamoto.pl/lnl-aports-snapshots/webrtc-$_webrtcver.tar.xz
https://github.com/signalapp/Signal-FTS5-Extension/archive/refs/tags/v$_stokenizerver/stokenizer-$_stokenizerver.tar.gz https://github.com/signalapp/Signal-FTS5-Extension/archive/refs/tags/v$_stokenizerver/stokenizer-$_stokenizerver.tar.gz
bettersqlite-use-system-sqlcipher.patch bettersqlite-use-system-sqlcipher.patch
libsignal-auditable.patch libsignal-too-new-clang.patch
libsignal-fix-build-rust-1.69.patch
signal-disable-updates.patch signal-disable-updates.patch
signal-update-links.patch signal-update-links.patch
signal-tasje-whatever-the-fuck-is-ignore-doing-here.patch signal-tasje-whatever-the-fuck-is-ignore-doing-here.patch
@ -92,7 +85,6 @@ source="
webrtc-shared-like-my-wife.patch webrtc-shared-like-my-wife.patch
webrtc-use-alpine-target.patch webrtc-use-alpine-target.patch
webrtc-gcc13.patch webrtc-gcc13.patch
webrtc-opus-is-ours.patch
signal-desktop signal-desktop
" "
@ -113,7 +105,7 @@ export CPPFLAGS="$CPPFLAGS -D__DATE__= -D__TIME__= -D__TIMESTAMP__="
export CARGO_PROFILE_RELEASE_OPT_LEVEL=2 export CARGO_PROFILE_RELEASE_OPT_LEVEL=2
export CARGO_PROFILE_RELEASE_STRIP="symbols" export CARGO_PROFILE_RELEASE_STRIP="symbols"
export RUSTFLAGS="$RUSTFLAGS -C linker=clang" export RUSTFLAGS="$RUSTFLAGS -C linker=clang -C link-arg=-fuse-ld=lld"
export YARN_CACHE_FOLDER="$srcdir/.yarn" export YARN_CACHE_FOLDER="$srcdir/.yarn"
@ -126,7 +118,7 @@ snapshot() {
rm -rf src rm -rf src
rm -rf webrtc-$_webrtcver rm -rf webrtc-$_webrtcver
rm -f webrtc-$_webrtcver.tar rm -f webrtc-$_webrtcver.tar
rm -f webrtc-$_webrtcver.tar.zst rm -f webrtc-$_webrtcver.tar.xz
echo " echo "
solutions = [{ solutions = [{
@ -161,14 +153,10 @@ target_cpu_only = True
--exclude-vcs \ --exclude-vcs \
webrtc-$_webrtcver webrtc-$_webrtcver
zstd --ultra --long -22 -T4 -vv webrtc-$_webrtcver.tar xz -T0 -e -9 -vv -k webrtc-$_webrtcver.tar
} }
# manual patches
default_prepare() { :; }
prepare() { prepare() {
default_prepare
msg "Applying patches" msg "Applying patches"
for x in $source; do for x in $source; do
case "$x" in case "$x" in
@ -199,22 +187,14 @@ prepare() {
cd "$srcdir"/webrtc-$_webrtcver cd "$srcdir"/webrtc-$_webrtcver
local use_system=" local use_system="
brotli
crc32c
dav1d
ffmpeg ffmpeg
fontconfig fontconfig
freetype freetype
harfbuzz-ng harfbuzz-ng
icu icu
jsoncpp
libaom
libavif
libdrm libdrm
libevent libevent
libjpeg
libpng libpng
libvpx
libwebp libwebp
libxml libxml
libxslt libxslt
@ -222,12 +202,11 @@ prepare() {
opus opus
re2 re2
snappy snappy
woff2
zlib zlib
" "
for _lib in $use_system libjpeg_turbo; do for _lib in $use_system; do
msg "Removing buildscripts for system provided $_lib" msg "Removing buildscripts for system provided $_lib"
find . -type f -path "*{third_party,ringrtc}/$_lib/*" \ find . -type f -path "*third_party/$_lib/*" \
\! -path "*third_party/$_lib/chromium/*" \ \! -path "*third_party/$_lib/chromium/*" \
\! -path "*third_party/$_lib/google/*" \ \! -path "*third_party/$_lib/google/*" \
\! -path './base/third_party/icu/*' \ \! -path './base/third_party/icu/*' \
@ -473,13 +452,14 @@ package() {
} }
sha512sums=" sha512sums="
52fb87261bdca50384da55770000bf3c919f38845fa7696db784a2d284be471d0168025f33a1325258845b8e5d565374601f92f49f27ce5ef5f3096bd06c7183 Signal-Desktop-6.29.1.tar.gz e9adc32f15f0f62bfd23adf0de46dea12433e93a585b9ba9fbdbd4000c17b88ddcbf9b65038f2ae232d1b591c9fe3b04e6ced3598a449bffe3b0123ce0c8d3af Signal-Desktop-6.18.1.tar.gz
2c05396340acee647e6a339bf8fabf34eccc47f51cdd0815f52d9811fe4d79a99659987b4eb3e379c7a4f55772f2b9607af9570c0f5bcb8121b1cde449285c14 libsignal-0.29.1.tar.gz 9483c8d302728d6caa123f1fb9a977c7cb3aea09ecd1d2cfb3b19f2f2c66f884c41e37642c89db4eeeb0d607fddf281ba27ba4bd0a90e43b972d0cbc607e1483 libsignal-0.22.0.tar.gz
c4b9a7b82dab89d753a992fe67f39e87802cd1c6d53ae13e651bbf3879081318a538f3f0ff36be2a62384579a947ef98914c9e237ae150a19e43c2acb6d8add9 ringrtc-2.29.1.tar.gz 684405e325a5c9cc0446b4e8ab949e888bf699f20f8a7bd64cb741c712b6d42b79d87a518720f6393ab667c9bef442dbb85404128302a41c8caf4d33711bb41e ringrtc-2.26.4.tar.gz
119276f4729dff05a352dc460bb870dd44fd762fce7df9fa28832bafe1a8bbfa7c9ea8c57de2eaa95b9cb7ad934f7462d8dc6f627e58d592bc598590fa8f5ad3 webrtc-5615e.tar.zst ef35942c377a2681ebdea2b68c6d3af0712cd866d143b50479b1e03de274c324b57059ea9f88b5c20d08c3b5b2b0aad8aed52e713aa2eb3da45b642d1aaae418 webrtc-5481c.tar.xz
84a1f2fc29262a12842e94698d124a85b823128e72a493b0be8ea92fbb72c5c268499f4a6827cdedaae06ec73cce4039a39fe5c5d536cbef330e59ba0183da28 stokenizer-0.2.1.tar.gz 84a1f2fc29262a12842e94698d124a85b823128e72a493b0be8ea92fbb72c5c268499f4a6827cdedaae06ec73cce4039a39fe5c5d536cbef330e59ba0183da28 stokenizer-0.2.1.tar.gz
be5b4e823543b79175a12314f10c6326d9f0d59f470136962daed4665887006acc05b48b40dc1b67747396d8f6f7d23be298c1e110ccdd35ff9b09d5e6b80bab bettersqlite-use-system-sqlcipher.patch be5b4e823543b79175a12314f10c6326d9f0d59f470136962daed4665887006acc05b48b40dc1b67747396d8f6f7d23be298c1e110ccdd35ff9b09d5e6b80bab bettersqlite-use-system-sqlcipher.patch
90d47914e30f095515c47c9ef7c763a7a2583a281228d6ea7e2a3444be670b3ae506c82b4fcea8a228f88f688a43c23c8dcef52b65805d2105287234550718a5 libsignal-auditable.patch 78be44ef201d9e6e127979a496f7244c8d93e936f85ad8753fea1646e6142f8a0dbff705ba612c8c724d19e6a9e89ccae254719326021818e04cccef452fc308 libsignal-too-new-clang.patch
f2b39498192744fadb7e2b969979653a5bd84af0befcc0a9b2ac60f63a487cc2d0d90a0345c7e884c84b3759c62f07d97c576ef1e2b271bdd993893e26a45c5c libsignal-fix-build-rust-1.69.patch
60a45285d885922f5c21f64b761a10efbee9081baf3efa4c8c13abc6a43dc4d27662ed10e239b0fa2071ab9e3a0dbbb4b11d6e3d26fe2b74a19f39e72b74a5bd signal-disable-updates.patch 60a45285d885922f5c21f64b761a10efbee9081baf3efa4c8c13abc6a43dc4d27662ed10e239b0fa2071ab9e3a0dbbb4b11d6e3d26fe2b74a19f39e72b74a5bd signal-disable-updates.patch
d50eb5724502df9ea4d795db8cfc27af767c25168d7db2af512e615be7cc2ca290210a9ae78e1abb153c0198677e858ad3d74926c958099d0319295e7d9e7f1d signal-update-links.patch d50eb5724502df9ea4d795db8cfc27af767c25168d7db2af512e615be7cc2ca290210a9ae78e1abb153c0198677e858ad3d74926c958099d0319295e7d9e7f1d signal-update-links.patch
ae91177b9df6bd5ac5cdbe28e6b591138d2c4b057dde84596ac89fc46e94bf713da18f652346486ebb1c88e7035d595b757b099b160aafa2c7cf103dfb2db8ab signal-tasje-whatever-the-fuck-is-ignore-doing-here.patch ae91177b9df6bd5ac5cdbe28e6b591138d2c4b057dde84596ac89fc46e94bf713da18f652346486ebb1c88e7035d595b757b099b160aafa2c7cf103dfb2db8ab signal-tasje-whatever-the-fuck-is-ignore-doing-here.patch
@ -487,7 +467,6 @@ ae91177b9df6bd5ac5cdbe28e6b591138d2c4b057dde84596ac89fc46e94bf713da18f652346486e
ab51b8fdcda1d8811213d2c5d8cb5d8457b478a02e23ce40f36b38ec56d45a3bd7a2d184720c27046f98a27771551cfad93c1290fe93856cc02695d318b33e47 ringrtc-webrtc-renamed.patch ab51b8fdcda1d8811213d2c5d8cb5d8457b478a02e23ce40f36b38ec56d45a3bd7a2d184720c27046f98a27771551cfad93c1290fe93856cc02695d318b33e47 ringrtc-webrtc-renamed.patch
9d92389637cdda83a0a7039fa6c52516d7bc491d0b1e42d5374b9d1f4fa7b9c930642f2dca896da17a2dc3344fa1bb97434c8dddd0539a4fedfd0dec809fc875 webrtc-shared-like-my-wife.patch 9d92389637cdda83a0a7039fa6c52516d7bc491d0b1e42d5374b9d1f4fa7b9c930642f2dca896da17a2dc3344fa1bb97434c8dddd0539a4fedfd0dec809fc875 webrtc-shared-like-my-wife.patch
354f516a74c5491727afe084ef7688b3e1359d230daa720ffc30b33d3ea7579c9f37a50fbdc5fe2e8dc5322e42a0a39e4ae3449d4cf5b77daed2229bd743028c webrtc-use-alpine-target.patch 354f516a74c5491727afe084ef7688b3e1359d230daa720ffc30b33d3ea7579c9f37a50fbdc5fe2e8dc5322e42a0a39e4ae3449d4cf5b77daed2229bd743028c webrtc-use-alpine-target.patch
78fdcbc66103ade6fd4fecae85a919c00344a96ac5a7ddd6fa708451d1cf24346d715e5b5dd6e0c4f9f42ececf781d3083e8833970f6fbc92578261001472a70 webrtc-gcc13.patch 209a606c0fa5ee517df4b8492932f20761dced3324e05a669fdf47c06a175aa5d5900e54e822ccd39fd57edfa4e689537e34a3b26918cc5da7a41633f5a1f162 webrtc-gcc13.patch
51d6e6427b4dd5c6b4942d597917a628aebca34815f15894406e0e8f121c663261beab488d9f04e24fe1bbc4c055124667c3728b1db29a99e110887e89c88c63 webrtc-opus-is-ours.patch
87534e7b5ad7365509eab75629e6bd1a9ed61ee92f7e358405a0abaf0df57de14623fb3894eb082f8785422e5c087e1c50f9e2e5cafbb2529591fd7bf447f7f5 signal-desktop 87534e7b5ad7365509eab75629e6bd1a9ed61ee92f7e358405a0abaf0df57de14623fb3894eb082f8785422e5c087e1c50f9e2e5cafbb2529591fd7bf447f7f5 signal-desktop
" "

11
backports/signal-desktop/libsignal-auditable.patch
View file

@ -1,11 +0,0 @@
--- ./node/build_node_bridge.py.orig
+++ ./node/build_node_bridge.py
@@ -63,7 +63,7 @@
out_dir = options.out_dir.strip('"') or os.path.join('build', configuration_name)
- cmdline = ['cargo', 'build', '--target', cargo_target, '-p', 'libsignal-node']
+ cmdline = ['cargo', 'auditable', 'build', '--target', cargo_target, '-p', 'libsignal-node']
if configuration_name == 'Release':
cmdline.append('--release')
print("Running '%s'" % (' '.join(cmdline)))

10
backports/signal-desktop/webrtc-gcc13.patch
View file

@ -18,3 +18,13 @@
#include <string> #include <string>
#include <vector> #include <vector>
--- ./third_party/abseil-cpp/absl/strings/internal/damerau_levenshtein_distance.h.orig
+++ ./third_party/abseil-cpp/absl/strings/internal/damerau_levenshtein_distance.h
@@ -16,6 +16,7 @@
#define ABSL_STRINGS_INTERNAL_DAMERAU_LEVENSHTEIN_DISTANCE_H_
#include <numeric>
+#include <stdint.h>
#include <vector>
#include "absl/strings/string_view.h"

11
backports/signal-desktop/webrtc-opus-is-ours.patch
View file

@ -1,11 +0,0 @@
--- ./modules/audio_coding/BUILD.gn.orig
+++ ./modules/audio_coding/BUILD.gn
@@ -551,7 +551,7 @@
if (rtc_build_opus) {
deps += [ rtc_opus_dir ]
- public_configs = [ "//ringrtc/opus:opus_config" ]
+ public_configs = [ "//third_party/opus:opus_config" ]
} else if (build_with_mozilla) {
include_dirs = [ getenv("DIST") + "/include/opus" ]
}