From 25a541daa2633272230db953bd706d8377434683 Mon Sep 17 00:00:00 2001 From: baalajimaestro Date: Tue, 3 Jan 2023 06:27:45 +0530 Subject: [PATCH 1/2] telegram-desktop: Bump to 4.5.2 Signed-off-by: baalajimaestro --- srcpkgs/telegram-desktop/patches/cld3.patch | 14 ++++++++++++++ srcpkgs/telegram-desktop/template | 9 ++++----- 2 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/telegram-desktop/patches/cld3.patch diff --git a/srcpkgs/telegram-desktop/patches/cld3.patch b/srcpkgs/telegram-desktop/patches/cld3.patch new file mode 100644 index 000000000000..3e3367ecfa72 --- /dev/null +++ b/srcpkgs/telegram-desktop/patches/cld3.patch @@ -0,0 +1,14 @@ +getonescriptspan_test.cc is just a test file that shouldn't be linked into any program. + +Ref: https://github.com/google/cld3/pull/78 +--- +--- a/cmake/external/cld3/CMakeLists.txt 2022-12-31 07:19:02.000000000 +0100 ++++ - 2023-01-06 13:30:13.082990927 +0100 +@@ -80,7 +80,6 @@ + script_span/generated_entities.cc + script_span/getonescriptspan.cc + script_span/getonescriptspan.h +- script_span/getonescriptspan_test.cc + script_span/utf8statetable.cc + script_span/offsetmap.cc + script_span/text_processing.cc diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template index 42a0ac05a1c9..fd0425ca70cf 100644 --- a/srcpkgs/telegram-desktop/template +++ b/srcpkgs/telegram-desktop/template @@ -1,23 +1,22 @@ # Template file for 'telegram-desktop' pkgname=telegram-desktop -version=4.3.1 +version=4.5.2 revision=1 build_style=cmake build_helper="qemu" configure_args="-DTDESKTOP_API_ID=209235 -DTDESKTOP_API_HASH=169ee702e1df4b6e66d80311db36cc43 -DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON - -DTDESKTOP_LAUNCHER_BASENAME=org.telegram.desktop.desktop -DDESKTOP_APP_DISABLE_SPELLCHECK=$(vopt_if spellcheck 'false' 'true') -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner -DQT_HOST_PATH=/usr" hostmakedepends="pkg-config qt6-base-devel python3 extra-cmake-modules - qt6-wayland-devel wayland-devel" + qt6-wayland-devel wayland-devel protobuf" makedepends="alsa-lib-devel ffmpeg-devel libdbusmenu-glib-devel libopenal-devel minizip-devel opus-devel xxHash-devel pulseaudio-devel range-v3 qt6-svg-devel libva-devel rapidjson liblz4-devel liblzma-devel gtk+3-devel MesaLib-devel qt6-wayland-devel qt6-qt5compat-devel libatomic-devel - xcb-util-keysyms-devel $(vopt_if spellcheck hunspell-devel) + xcb-util-keysyms-devel $(vopt_if spellcheck hunspell-devel) protobuf-devel glibmm2.68-devel tg_owt webkit2gtk-devel rnnoise-devel jemalloc-devel qt6-declarative-devel" depends="qt6-imageformats ttf-opensans" short_desc="Telegram Desktop messaging app" @@ -26,7 +25,7 @@ license="GPL-3.0-or-later, OpenSSL" homepage="https://desktop.telegram.org/" changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt" distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz" -checksum=3c1d8c09b72db5c9f5e2d3b467b451a6ba94c3ba8295b9880842a4e3496153dd +checksum=b2c77dc4cd3589a60a7eb124233d339d68eb18ff9c1be52c64c048b42bf45bba build_options="spellcheck" build_options_default="spellcheck" From af43e1ef1bb4337cf0be8dfa4c336b31467e3677 Mon Sep 17 00:00:00 2001 From: baalajimaestro Date: Tue, 3 Jan 2023 07:44:19 +0530 Subject: [PATCH 2/2] tg_owt: Uprev to 9b70d7679 - Updated libyuv module as per https://github.com/desktop-app/tg_owt/commit/cc8edd5719556e1711f50da9a3f7a4c59bba574d - Added abseil-cpp module as per https://github.com/desktop-app/tg_owt/commit/d9935115a8eb13e3f6b818f8871b875e78c422f8 - Added patch to handle missing cstdint header Signed-off-by: baalajimaestro --- .../fix-missing-cstdint-include-musl.patch | 10 ++++++++++ srcpkgs/tg_owt/template | 20 +++++++++++-------- 2 files changed, 22 insertions(+), 8 deletions(-) create mode 100644 srcpkgs/tg_owt/patches/fix-missing-cstdint-include-musl.patch diff --git a/srcpkgs/tg_owt/patches/fix-missing-cstdint-include-musl.patch b/srcpkgs/tg_owt/patches/fix-missing-cstdint-include-musl.patch new file mode 100644 index 000000000000..cbb30143ea6f --- /dev/null +++ b/srcpkgs/tg_owt/patches/fix-missing-cstdint-include-musl.patch @@ -0,0 +1,10 @@ +--- a/src/modules/audio_coding/neteq/reorder_optimizer.cc ++++ b/src/modules/audio_coding/neteq/reorder_optimizer.cc +@@ -11,6 +11,7 @@ + #include "modules/audio_coding/neteq/reorder_optimizer.h" + + #include ++#include + #include + #include + diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template index 08fe4355202e..2fbdafe7b672 100644 --- a/srcpkgs/tg_owt/template +++ b/srcpkgs/tg_owt/template @@ -1,9 +1,10 @@ # Template file for 'tg_owt' pkgname=tg_owt -version=0.0.0.20220508 +version=0.0.0.20221208 revision=1 -_commit=10d5f4bf77333ef6b43516f90d2ce13273255f41 -_libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452 +_commit=9b70d7679e86e6c216127d5a6a06ef5aa4f54793 +_libyuv_commit=00950840d1c9bcbb3eb6ebc5aac5793e71166c8b +_abseil_commit=8c0b94e793a66495e0b1f34a5eb26bd7dc672db0 _crc32c_commit=21fc8ef30415a635e7351ffa0e5d5367943d4a94 build_style=cmake configure_args="-DBUILD_SHARED_LIBS=OFF -DTG_OWT_ARCH_ARMV7_USE_NEON=OFF" @@ -20,11 +21,13 @@ license="GPL-3.0-or-later" homepage="https://github.com/desktop-app/tg_owt" distfiles="https://github.com/desktop-app/tg_owt/archive/${_commit}.tar.gz https://chromium.googlesource.com/libyuv/libyuv/+archive/${_libyuv_commit}.tar.gz - https://github.com/google/crc32c/archive/${_crc32c_commit}.tar.gz" -checksum="@b8a4b1a9e4f8936c02b4a31c19d6282a914df976b9cbdfadb3ae40ca1a185ac6 - @1dd51820852df840c339bf3f18e6cf1166de33d5631a69cd1eae5b2b34c113e3 - @b359ed4f5fd0321d807fd7301e66399c311c1fe6ab4c6a0f5538587d97ba4a8d" -skip_extraction="${_libyuv_commit}.tar.gz ${_crc32c_commit}.tar.gz" + https://github.com/google/crc32c/archive/${_crc32c_commit}.tar.gz + https://github.com/abseil/abseil-cpp/archive/${_abseil_commit}.tar.gz" +checksum="@572576cd1680773e45e1afbc024637d2af3b89b5d5fdfc7ba403bf98a0224bdc + @36881fb364593925d012ff452eda3eb54c2c50cd322f353b76071d342ef72c1d + @b359ed4f5fd0321d807fd7301e66399c311c1fe6ab4c6a0f5538587d97ba4a8d + @05b5d2f4b540602e8b247116be0559b8a26addac53f026f751a93163946936fb" +skip_extraction="${_libyuv_commit}.tar.gz ${_crc32c_commit}.tar.gz ${_abseil_commit}.tar.gz" if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" musl-legacy-compat" @@ -37,4 +40,5 @@ fi post_extract() { bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_libyuv_commit}.tar.gz -C ${wrksrc}/src/third_party/libyuv bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_crc32c_commit}.tar.gz --strip-components 1 -C ${wrksrc}/src/third_party/crc32c/src + bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_abseil_commit}.tar.gz --strip-components 1 -C ${wrksrc}/src/third_party/abseil-cpp }