* Re: [PR PATCH] [Updated] Update/tdesktop/4.8.3
2023-06-10 15:15 [PR PATCH] Update/tdesktop/4.8.3 baalajimaestro
@ 2023-06-10 15:16 ` baalajimaestro
2023-06-10 15:36 ` [PR PATCH] [Updated] telegram-desktop: update to 4.8.3 baalajimaestro
` (10 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: baalajimaestro @ 2023-06-10 15:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 502 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
Update/tdesktop/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: 7182 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 11130e07f55d2e376bde956ec04ad27ebf948dbf 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.
- Built as per https://gitlab.archlinux.org/archlinux/packaging/packages/telegram-desktop/-/blob/main/PKGBUILD
- 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
Signed-off-by: baalajimaestro <me@baalajimaestro.me>
---
srcpkgs/telegram-desktop/template | 33 +++++++++++++++++++++----------
1 file changed, 23 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index f114b2341dc5..4fe2ef477a88 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,8 @@
# 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"
configure_args="-DTDESKTOP_API_ID=209235
@@ -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
+}
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PR PATCH] [Updated] telegram-desktop: update to 4.8.3.
2023-06-10 15:15 [PR PATCH] Update/tdesktop/4.8.3 baalajimaestro
2023-06-10 15:16 ` [PR PATCH] [Updated] Update/tdesktop/4.8.3 baalajimaestro
@ 2023-06-10 15:36 ` baalajimaestro
2023-06-10 15:37 ` baalajimaestro
` (9 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: baalajimaestro @ 2023-06-10 15:36 UTC (permalink / raw)
To: ml
[-- 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: 7057 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 1b7c4acc608fc3e90438a6735557bb5f1e43293a 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
Signed-off-by: baalajimaestro <me@baalajimaestro.me>
---
srcpkgs/telegram-desktop/template | 35 +++++++++++++++++++++----------
1 file changed, 24 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index f114b2341dc5..ed8df21eabf9 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,8 @@
# 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"
configure_args="-DTDESKTOP_API_ID=209235
@@ -12,21 +13,27 @@ 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
+}
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PR PATCH] [Updated] telegram-desktop: update to 4.8.3.
2023-06-10 15:15 [PR PATCH] Update/tdesktop/4.8.3 baalajimaestro
2023-06-10 15:16 ` [PR PATCH] [Updated] Update/tdesktop/4.8.3 baalajimaestro
2023-06-10 15:36 ` [PR PATCH] [Updated] telegram-desktop: update to 4.8.3 baalajimaestro
@ 2023-06-10 15:37 ` baalajimaestro
2023-06-10 17:15 ` baalajimaestro
` (8 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: baalajimaestro @ 2023-06-10 15:37 UTC (permalink / raw)
To: ml
[-- 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: 7052 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 429c8b4dee5992a5e7f0b6c42f11e486c6774705 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
Signed-off-by: baalajimaestro <me@baalajimaestro.me>
---
srcpkgs/telegram-desktop/template | 33 +++++++++++++++++++++----------
1 file changed, 23 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index f114b2341dc5..8a1ed19c7614 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,8 @@
# 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"
configure_args="-DTDESKTOP_API_ID=209235
@@ -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
+}
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PR PATCH] [Updated] telegram-desktop: update to 4.8.3.
2023-06-10 15:15 [PR PATCH] Update/tdesktop/4.8.3 baalajimaestro
` (2 preceding siblings ...)
2023-06-10 15:37 ` baalajimaestro
@ 2023-06-10 17:15 ` baalajimaestro
2023-06-13 11:56 ` [PR REVIEW] " Duncaen
` (7 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: baalajimaestro @ 2023-06-10 17:15 UTC (permalink / raw)
To: ml
[-- 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
+}
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PR REVIEW] telegram-desktop: update to 4.8.3.
2023-06-10 15:15 [PR PATCH] Update/tdesktop/4.8.3 baalajimaestro
` (3 preceding siblings ...)
2023-06-10 17:15 ` baalajimaestro
@ 2023-06-13 11:56 ` Duncaen
2023-06-18 8:44 ` baalajimaestro
` (6 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Duncaen @ 2023-06-13 11:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 243 bytes --]
New review comment by Duncaen on void-packages repository
https://github.com/void-linux/void-packages/pull/44342#discussion_r1228005426
Comment:
This shouldn't be reordered just for the sake of reordering. Why is there clang in makedepends?
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PR REVIEW] telegram-desktop: update to 4.8.3.
2023-06-10 15:15 [PR PATCH] Update/tdesktop/4.8.3 baalajimaestro
` (4 preceding siblings ...)
2023-06-13 11:56 ` [PR REVIEW] " Duncaen
@ 2023-06-18 8:44 ` baalajimaestro
2023-06-22 10:53 ` Duncaen
` (5 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: baalajimaestro @ 2023-06-18 8:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 232 bytes --]
New review comment by baalajimaestro on void-packages repository
https://github.com/void-linux/void-packages/pull/44342#discussion_r1233230427
Comment:
The build runs on clang now, instead of gcc. Is there another way to do this?
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PR REVIEW] telegram-desktop: update to 4.8.3.
2023-06-10 15:15 [PR PATCH] Update/tdesktop/4.8.3 baalajimaestro
` (5 preceding siblings ...)
2023-06-18 8:44 ` baalajimaestro
@ 2023-06-22 10:53 ` Duncaen
2023-06-22 10:54 ` Duncaen
` (4 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Duncaen @ 2023-06-22 10:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 363 bytes --]
New review comment by Duncaen on void-packages repository
https://github.com/void-linux/void-packages/pull/44342#discussion_r1238357120
Comment:
Not sure how that would work, the cross builds would be broken if it actually executes `clang` since its in `makedepends` and not `hostmakedepends` so its installed for the target architecture and can't be executed.
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PR REVIEW] telegram-desktop: update to 4.8.3.
2023-06-10 15:15 [PR PATCH] Update/tdesktop/4.8.3 baalajimaestro
` (6 preceding siblings ...)
2023-06-22 10:53 ` Duncaen
@ 2023-06-22 10:54 ` Duncaen
2023-06-28 7:23 ` [PR PATCH] [Updated] " baalajimaestro
` (3 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Duncaen @ 2023-06-22 10:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 272 bytes --]
New review comment by Duncaen on void-packages repository
https://github.com/void-linux/void-packages/pull/44342#discussion_r1238357877
Comment:
So if its really required then it belongs in `hostmakedepends`, but since it seems like its not actually used, I'm not sure?
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PR PATCH] [Updated] telegram-desktop: update to 4.8.3.
2023-06-10 15:15 [PR PATCH] Update/tdesktop/4.8.3 baalajimaestro
` (7 preceding siblings ...)
2023-06-22 10:54 ` Duncaen
@ 2023-06-28 7:23 ` baalajimaestro
2023-07-18 13:43 ` [PR PATCH] [Updated] telegram-desktop: update to 4.8.4 baalajimaestro
` (2 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: baalajimaestro @ 2023-06-28 7:23 UTC (permalink / raw)
To: ml
[-- 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: 6377 bytes --]
From 5a90890719e8b0ac42c1de375cb3ba9f30925597 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 9a95d8fd033095173798b092f53f76625e2e49c3 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.4.
- Depends additionally on:
clang
boost-devel
fmt-devel
gobject-introspection
Signed-off-by: baalajimaestro <me@baalajimaestro.me>
---
srcpkgs/telegram-desktop/patches/cld3.patch | 14 --------------
srcpkgs/telegram-desktop/template | 12 ++++++------
2 files changed, 6 insertions(+), 20 deletions(-)
delete mode 100644 srcpkgs/telegram-desktop/patches/cld3.patch
diff --git a/srcpkgs/telegram-desktop/patches/cld3.patch b/srcpkgs/telegram-desktop/patches/cld3.patch
deleted file mode 100644
index 3e3367ecfa72..000000000000
--- a/srcpkgs/telegram-desktop/patches/cld3.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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 f114b2341dc5..22e46e4e95e1 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,18 +1,18 @@
# Template file for 'telegram-desktop'
pkgname=telegram-desktop
-version=4.8.1
-revision=3
+version=4.8.4
+revision=1
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
-DDESKTOP_APP_DISABLE_SPELLCHECK=$(vopt_if spellcheck 'false' 'true')
-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
-DQT_HOST_PATH=/usr"
-hostmakedepends="pkg-config qt6-base python3 extra-cmake-modules
+hostmakedepends="pkg-config qt6-base python3 clang extra-cmake-modules
qt6-wayland-tools wayland-devel protobuf"
-makedepends="alsa-lib-devel ffmpeg-devel libdbusmenu-glib-devel libopenal-devel
+makedepends="alsa-lib-devel boost-devel fmt-devel ffmpeg-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
@@ -25,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=96660bb151c035a80c5b32a8fe043cecb54e9fe450329cf612ecb752db68c06f
+checksum="4328296df07557786e1b9cf22f6675200dbdf29c75d2efeb635c6b7f3f951e8d"
build_options="spellcheck"
build_options_default="spellcheck"
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PR PATCH] [Updated] telegram-desktop: update to 4.8.4.
2023-06-10 15:15 [PR PATCH] Update/tdesktop/4.8.3 baalajimaestro
` (8 preceding siblings ...)
2023-06-28 7:23 ` [PR PATCH] [Updated] " baalajimaestro
@ 2023-07-18 13:43 ` baalajimaestro
2023-07-18 13:46 ` baalajimaestro
2023-07-21 12:04 ` [PR PATCH] [Merged]: " Johnnynator
11 siblings, 0 replies; 13+ messages in thread
From: baalajimaestro @ 2023-07-18 13:43 UTC (permalink / raw)
To: ml
[-- 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.4.
#### 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: 6377 bytes --]
From 4881a21b08543342c36f1bd2d085384b91676852 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 6f729c16bc8ff4a117391893d46c1c703e50c162 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.4.
- Depends additionally on:
clang
boost-devel
fmt-devel
gobject-introspection
Signed-off-by: baalajimaestro <me@baalajimaestro.me>
---
srcpkgs/telegram-desktop/patches/cld3.patch | 14 --------------
srcpkgs/telegram-desktop/template | 12 ++++++------
2 files changed, 6 insertions(+), 20 deletions(-)
delete mode 100644 srcpkgs/telegram-desktop/patches/cld3.patch
diff --git a/srcpkgs/telegram-desktop/patches/cld3.patch b/srcpkgs/telegram-desktop/patches/cld3.patch
deleted file mode 100644
index 3e3367ecfa72..000000000000
--- a/srcpkgs/telegram-desktop/patches/cld3.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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 9db9f80c1a53..22e46e4e95e1 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,18 +1,18 @@
# Template file for 'telegram-desktop'
pkgname=telegram-desktop
-version=4.8.1
-revision=4
+version=4.8.4
+revision=1
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
-DDESKTOP_APP_DISABLE_SPELLCHECK=$(vopt_if spellcheck 'false' 'true')
-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
-DQT_HOST_PATH=/usr"
-hostmakedepends="pkg-config qt6-base python3 extra-cmake-modules
+hostmakedepends="pkg-config qt6-base python3 clang extra-cmake-modules
qt6-wayland-tools wayland-devel protobuf"
-makedepends="alsa-lib-devel ffmpeg-devel libdbusmenu-glib-devel libopenal-devel
+makedepends="alsa-lib-devel boost-devel fmt-devel ffmpeg-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
@@ -25,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=96660bb151c035a80c5b32a8fe043cecb54e9fe450329cf612ecb752db68c06f
+checksum="4328296df07557786e1b9cf22f6675200dbdf29c75d2efeb635c6b7f3f951e8d"
build_options="spellcheck"
build_options_default="spellcheck"
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: telegram-desktop: update to 4.8.4.
2023-06-10 15:15 [PR PATCH] Update/tdesktop/4.8.3 baalajimaestro
` (9 preceding siblings ...)
2023-07-18 13:43 ` [PR PATCH] [Updated] telegram-desktop: update to 4.8.4 baalajimaestro
@ 2023-07-18 13:46 ` baalajimaestro
2023-07-21 12:04 ` [PR PATCH] [Merged]: " Johnnynator
11 siblings, 0 replies; 13+ messages in thread
From: baalajimaestro @ 2023-07-18 13:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 162 bytes --]
New comment by baalajimaestro on void-packages repository
https://github.com/void-linux/void-packages/pull/44342#issuecomment-1640261009
Comment:
@Johnnynator
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PR PATCH] [Merged]: telegram-desktop: update to 4.8.4.
2023-06-10 15:15 [PR PATCH] Update/tdesktop/4.8.3 baalajimaestro
` (10 preceding siblings ...)
2023-07-18 13:46 ` baalajimaestro
@ 2023-07-21 12:04 ` Johnnynator
11 siblings, 0 replies; 13+ messages in thread
From: Johnnynator @ 2023-07-21 12:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 331 bytes --]
There's a merged pull request on the void-packages repository
telegram-desktop: update to 4.8.4.
https://github.com/void-linux/void-packages/pull/44342
Description:
#### 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
^ permalink raw reply [flat|nested] 13+ messages in thread