Re: [PR PATCH] [Updated] telegram-desktop: update to 4.8.3.

[baalajimaestro <baalajimaestro@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 515 bytes --]

There is an updated pull request by baalajimaestro against master on the void-packages repository

https://github.com/baalajimaestro/void-packages update/tdesktop/4.8.3
https://github.com/void-linux/void-packages/pull/44342

telegram-desktop: update to 4.8.3.
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, x64-glibc


A patch file from https://github.com/void-linux/void-packages/pull/44342.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/tdesktop/4.8.3-44342.patch --]
[-- Type: text/x-diff, Size: 8124 bytes --]

From fa7d02a405ff926a2f84cf2fb09f4a3347f27ba7 Mon Sep 17 00:00:00 2001
From: baalajimaestro <me@baalajimaestro.me>
Date: Sat, 10 Jun 2023 18:41:55 +0530
Subject: [PATCH 1/2] tg_owt: update to dcb5069.

- Updated libyuv to 77c2121
- Depends additionally on libstrp

Signed-off-by: baalajimaestro <me@baalajimaestro.me>
---
 srcpkgs/tg_owt/template | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index 97d195ddb34a..9ebb6f57a83f 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,11 +1,12 @@
 # Template file for 'tg_owt'
 pkgname=tg_owt
-version=0.0.0.20230107
+version=0.0.0.20230610
 revision=1
-_commit=5098730b9eb6173f0b52068fe2555b7c1015123a
-_libyuv_commit=00950840d1c9bcbb3eb6ebc5aac5793e71166c8b
+_commit=dcb5069ff76bd293e86928804208737e6cee2ccc
+_libyuv_commit=77c2121f7e6b8e694d6e908bbbe9be24214097da
 _abseil_commit=8c0b94e793a66495e0b1f34a5eb26bd7dc672db0
 _crc32c_commit=21fc8ef30415a635e7351ffa0e5d5367943d4a94
+_libsrtp_commit=a566a9cfcd619e8327784aa7cff4a1276dc1e895
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=OFF -DTG_OWT_ARCH_ARMV7_USE_NEON=OFF"
 hostmakedepends="pkg-config yasm protobuf"
@@ -22,12 +23,14 @@ 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
- https://github.com/abseil/abseil-cpp/archive/${_abseil_commit}.tar.gz"
-checksum="@592f434300370529150e46f6414dbb0a5c91dfe7b5977dff624163554f2927b9
- @36881fb364593925d012ff452eda3eb54c2c50cd322f353b76071d342ef72c1d
+ https://github.com/abseil/abseil-cpp/archive/${_abseil_commit}.tar.gz
+ https://github.com/cisco/libsrtp/archive/${_libsrtp_commit}.tar.gz"
+checksum="@6cdfbf64a3e5f4876cc936162fbe57400dd342d4e30c21209d3870853b5a29da
+ @4ed69a9a02126185bb50ec5dabc4e9bb53886deb7a1fd878c6bad248ab73db4e
  @b359ed4f5fd0321d807fd7301e66399c311c1fe6ab4c6a0f5538587d97ba4a8d
- @05b5d2f4b540602e8b247116be0559b8a26addac53f026f751a93163946936fb"
-skip_extraction="${_libyuv_commit}.tar.gz ${_crc32c_commit}.tar.gz ${_abseil_commit}.tar.gz"
+ @05b5d2f4b540602e8b247116be0559b8a26addac53f026f751a93163946936fb
+ @012d2e3055921e4a33b839e35acbb0a28b5bdc7146d04d9f217ab3d29b103606"
+skip_extraction="${_libyuv_commit}.tar.gz ${_crc32c_commit}.tar.gz ${_abseil_commit}.tar.gz ${_libsrtp_commit}.tar.gz"
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
@@ -41,4 +44,5 @@ 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
+	bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_libsrtp_commit}.tar.gz --strip-components 1 -C ${wrksrc}/src/third_party/libsrtp
 }

From a659bd5fcd82a728e2363e8e2416cfcf4c31859a Mon Sep 17 00:00:00 2001
From: baalajimaestro <me@baalajimaestro.me>
Date: Sat, 10 Jun 2023 18:42:12 +0530
Subject: [PATCH 2/2] telegram-desktop: update to 4.8.3.

- Depends additionally on:
  clang
  boost-devel
  fmt-devel
  gobject-introspection
and 2 new submodules

cppgir and expected-lite have been included as done by Arch Linux Team

Added exclude-cppgir.patch from Alpine Linux, to exclude it from binary

Signed-off-by: baalajimaestro <me@baalajimaestro.me>
---
 .../patches/exclude-cppgir.patch              | 13 +++++++
 srcpkgs/telegram-desktop/template             | 35 +++++++++++++------
 2 files changed, 37 insertions(+), 11 deletions(-)
 create mode 100644 srcpkgs/telegram-desktop/patches/exclude-cppgir.patch

diff --git a/srcpkgs/telegram-desktop/patches/exclude-cppgir.patch b/srcpkgs/telegram-desktop/patches/exclude-cppgir.patch
new file mode 100644
index 000000000000..24c16cabb3b5
--- /dev/null
+++ b/srcpkgs/telegram-desktop/patches/exclude-cppgir.patch
@@ -0,0 +1,13 @@
+--
+diff --git a/cmake/external/glib/CMakeLists.txt b/cmake/external/glib/CMakeLists.txt
+index 66385e3..20b62a7 100644
+--- a/cmake/external/glib/CMakeLists.txt
++++ b/cmake/external/glib/CMakeLists.txt
+@@ -11,7 +11,7 @@ function(add_cppgir) # isolate scope
+     set(BUILD_TESTING OFF)
+     set(BUILD_DOC OFF)
+     set(CMAKE_DISABLE_FIND_PACKAGE_Qt5Core ON)
+-    add_subdirectory(cppgir)
++    add_subdirectory(cppgir EXCLUDE_FROM_ALL)
+ endfunction()
+ add_cppgir()
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index f114b2341dc5..8b9316ba4a93 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,9 +1,10 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=4.8.1
-revision=3
+version=4.8.3
+revision=1
+_cppgir_commit=960fe054ffaab7cf55722fea6094c56a8ee8f18e
 build_style=cmake
-build_helper="qemu"
+build_helper="qemu gir"
 configure_args="-DTDESKTOP_API_ID=209235
  -DTDESKTOP_API_HASH=169ee702e1df4b6e66d80311db36cc43
  -DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON
@@ -12,20 +13,26 @@ configure_args="-DTDESKTOP_API_ID=209235
  -DQT_HOST_PATH=/usr"
 hostmakedepends="pkg-config qt6-base python3 extra-cmake-modules
  qt6-wayland-tools 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) protobuf-devel
- glibmm2.68-devel tg_owt webkit2gtk-devel rnnoise-devel jemalloc-devel qt6-declarative-devel"
+makedepends="alsa-lib-devel boost-devel clang ffmpeg-devel fmt-devel
+ gobject-introspection 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) 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"
 maintainer="John <me@johnnynator.dev>"
 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=96660bb151c035a80c5b32a8fe043cecb54e9fe450329cf612ecb752db68c06f
+distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz
+ https://github.com/martinmoene/expected-lite/archive/refs/tags/v0.6.3.tar.gz
+ https://gitlab.com/mnauw/cppgir/-/archive/${_cppgir_commit}/cppgir-${_cppgir_commit}.tar.gz"
+checksum="7e0e86fab9660fa76e1b0d04c0fdb134359cc8ca89f0fe3656533122710cd7fe
+ @826a4d24a0996483491f4a7f73e70f47c75c5078c489cfe84a46d508d1a7a58c
+ @39d0afc4d505ba8ff74b50d6182e8fb8bef03059c02681e7b82e7a849e5cd49c"
+skip_extraction="cppgir-${_cppgir_commit}.tar.gz v0.6.3.tar.gz"
 
 build_options="spellcheck"
 build_options_default="spellcheck"
@@ -41,3 +48,9 @@ fi
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	broken="UI doesn't go beyond initial screen, also LE specific code in networking"
 fi
+
+post_extract() {
+	mkdir ${wrksrc}/cmake/external/glib/cppgir/expected-lite
+	bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/v0.6.3.tar.gz --strip-components 1 -C ${wrksrc}/cmake/external/glib/cppgir/expected-lite
+	bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/cppgir-${_cppgir_commit}.tar.gz --strip-components 1 -C ${wrksrc}/cmake/external/glib/cppgir
+}