[PR PATCH] [WIP] telegram-desktop: update to 4.3.1.

[PR PATCH] [WIP] telegram-desktop: update to 4.3.1.

[Eloitor]

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

There is a new pull request by Eloitor against master on the void-packages repository

https://github.com/Eloitor/void-packages telegram-desktop
https://github.com/void-linux/void-packages/pull/40406

[WIP] telegram-desktop: update to 4.3.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)

I got the error `Could NOT find Qt6Qml (missing: Qt6Qml_DIR)` maybe qt6-qml needs to be packaged...


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-telegram-desktop-40406.patch --]
[-- Type: text/x-diff, Size: 3520 bytes --]

From edd28384d4ea54c2f2dcc59148fb6cf83fbd1568 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Wed, 9 Nov 2022 07:36:46 +0100
Subject: [PATCH] telegram-desktop: update to 4.3.1.

---
 .../telegram-desktop/patches/0001-musl.patch  | 36 -------------------
 ...-gsl.patch => 0001-use-vendored-gsl.patch} |  0
 srcpkgs/telegram-desktop/template             |  6 ++--
 3 files changed, 3 insertions(+), 39 deletions(-)
 delete mode 100644 srcpkgs/telegram-desktop/patches/0001-musl.patch
 rename srcpkgs/telegram-desktop/patches/{0002-use-vendored-gsl.patch => 0001-use-vendored-gsl.patch} (100%)

diff --git a/srcpkgs/telegram-desktop/patches/0001-musl.patch b/srcpkgs/telegram-desktop/patches/0001-musl.patch
deleted file mode 100644
index d83dd3a513cf..000000000000
--- a/srcpkgs/telegram-desktop/patches/0001-musl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/Telegram/lib_base/base/platform/linux/base_info_linux.cpp	2021-09-04 16:25:46.055482788 +0430
-+++ b/Telegram/lib_base/base/platform/linux/base_info_linux.cpp	2021-09-04 16:31:21.268887787 +0430
-@@ -16,10 +16,6 @@
- #include <QtCore/QDate>
- #include <QtGui/QGuiApplication>
- 
--#ifdef Q_OS_LINUX
--#include <gnu/libc-version.h>
--#endif // Q_OS_LINUX
--
- namespace Platform {
- namespace {
- 
-@@ -109,22 +105,10 @@
- }
- 
- QString GetLibcName() {
--#ifdef Q_OS_LINUX
--	return "glibc";
--#endif // Q_OS_LINUX
--
- 	return QString();
- }
- 
- QString GetLibcVersion() {
--#ifdef Q_OS_LINUX
--	static const auto result = [&] {
--		const auto version = QString::fromLatin1(gnu_get_libc_version());
--		return QVersionNumber::fromString(version).isNull() ? QString() : version;
--	}();
--	return result;
--#endif // Q_OS_LINUX
--
- 	return QString();
- }
- 
diff --git a/srcpkgs/telegram-desktop/patches/0002-use-vendored-gsl.patch b/srcpkgs/telegram-desktop/patches/0001-use-vendored-gsl.patch
similarity index 100%
rename from srcpkgs/telegram-desktop/patches/0002-use-vendored-gsl.patch
rename to srcpkgs/telegram-desktop/patches/0001-use-vendored-gsl.patch
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 29b1456eaa9b..5c4c10dc4254 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=4.2.4
+version=4.3.1
 revision=1
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
@@ -19,7 +19,7 @@ makedepends="alsa-lib-devel ffmpeg-devel libdbusmenu-glib-devel libopenal-devel
  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)
- glibmm-devel tg_owt webkit2gtk-devel rnnoise-devel jemalloc-devel"
+ glibmm2.68-devel tg_owt webkit2gtk-devel rnnoise-devel jemalloc-devel"
 depends="qt6-imageformats ttf-opensans"
 short_desc="Telegram Desktop messaging app"
 maintainer="John <me@johnnynator.dev>"
@@ -27,7 +27,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=a8109fce9d55553efcbc7c3d9349869e1e267113f5badaf48cf4e0c25cd559d1
+checksum=3c1d8c09b72db5c9f5e2d3b467b451a6ba94c3ba8295b9880842a4e3496153dd
 
 build_options="spellcheck"
 build_options_default="spellcheck"

Re: [WIP] telegram-desktop: update to 4.3.1.

[AlexKurisu]

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

New comment by AlexKurisu on void-packages repository

https://github.com/void-linux/void-packages/pull/40406#issuecomment-1309610401

Comment:
Just add qt6-declarative-devel to makedepends, it provides Qt6Qml. Tested on local copy of telegram-desktop with patches - builds successfully

Re: [WIP] telegram-desktop: update to 4.3.1.

[AlexKurisu]

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

New comment by AlexKurisu on void-packages repository

https://github.com/void-linux/void-packages/pull/40406#issuecomment-1309610401

Comment:
Just add `qt6-declarative-devel` to `makedepends`, it provides `Qt6Qml`. Tested on local copy of `telegram-desktop` with patches, builds successfully

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

[Eloitor]

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

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

https://github.com/Eloitor/void-packages telegram-desktop
https://github.com/void-linux/void-packages/pull/40406

[WIP] telegram-desktop: update to 4.3.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)

I got the error `Could NOT find Qt6Qml (missing: Qt6Qml_DIR)` maybe `qt6-qml` needs to be packaged...


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-telegram-desktop-40406.patch --]
[-- Type: text/x-diff, Size: 3528 bytes --]

From 01854c3dab41e38197e4fa27d9d7c21e0fd178f4 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloitor@disroot.org>
Date: Wed, 9 Nov 2022 07:36:46 +0100
Subject: [PATCH] telegram-desktop: update to 4.3.1.

---
 .../telegram-desktop/patches/0001-musl.patch  | 36 -------------------
 ...-gsl.patch => 0001-use-vendored-gsl.patch} |  0
 srcpkgs/telegram-desktop/template             |  6 ++--
 3 files changed, 3 insertions(+), 39 deletions(-)
 delete mode 100644 srcpkgs/telegram-desktop/patches/0001-musl.patch
 rename srcpkgs/telegram-desktop/patches/{0002-use-vendored-gsl.patch => 0001-use-vendored-gsl.patch} (100%)

diff --git a/srcpkgs/telegram-desktop/patches/0001-musl.patch b/srcpkgs/telegram-desktop/patches/0001-musl.patch
deleted file mode 100644
index d83dd3a513cf..000000000000
--- a/srcpkgs/telegram-desktop/patches/0001-musl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/Telegram/lib_base/base/platform/linux/base_info_linux.cpp	2021-09-04 16:25:46.055482788 +0430
-+++ b/Telegram/lib_base/base/platform/linux/base_info_linux.cpp	2021-09-04 16:31:21.268887787 +0430
-@@ -16,10 +16,6 @@
- #include <QtCore/QDate>
- #include <QtGui/QGuiApplication>
- 
--#ifdef Q_OS_LINUX
--#include <gnu/libc-version.h>
--#endif // Q_OS_LINUX
--
- namespace Platform {
- namespace {
- 
-@@ -109,22 +105,10 @@
- }
- 
- QString GetLibcName() {
--#ifdef Q_OS_LINUX
--	return "glibc";
--#endif // Q_OS_LINUX
--
- 	return QString();
- }
- 
- QString GetLibcVersion() {
--#ifdef Q_OS_LINUX
--	static const auto result = [&] {
--		const auto version = QString::fromLatin1(gnu_get_libc_version());
--		return QVersionNumber::fromString(version).isNull() ? QString() : version;
--	}();
--	return result;
--#endif // Q_OS_LINUX
--
- 	return QString();
- }
- 
diff --git a/srcpkgs/telegram-desktop/patches/0002-use-vendored-gsl.patch b/srcpkgs/telegram-desktop/patches/0001-use-vendored-gsl.patch
similarity index 100%
rename from srcpkgs/telegram-desktop/patches/0002-use-vendored-gsl.patch
rename to srcpkgs/telegram-desktop/patches/0001-use-vendored-gsl.patch
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 61c86e3678e9..42a0ac05a1c9 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=4.2.4
+version=4.3.1
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -18,7 +18,7 @@ makedepends="alsa-lib-devel ffmpeg-devel libdbusmenu-glib-devel libopenal-devel
  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)
- glibmm-devel tg_owt webkit2gtk-devel rnnoise-devel jemalloc-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>"
@@ -26,7 +26,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=a8109fce9d55553efcbc7c3d9349869e1e267113f5badaf48cf4e0c25cd559d1
+checksum=3c1d8c09b72db5c9f5e2d3b467b451a6ba94c3ba8295b9880842a4e3496153dd
 
 build_options="spellcheck"
 build_options_default="spellcheck"

Re: telegram-desktop: update to 4.3.1.

[Eloitor]

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

New comment by Eloitor on void-packages repository

https://github.com/void-linux/void-packages/pull/40406#issuecomment-1310063327

Comment:
thank you

Re: [PR PATCH] [Merged]: telegram-desktop: update to 4.3.1.

[Johnnynator]

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

There's a merged pull request on the void-packages repository

telegram-desktop: update to 4.3.1.
https://github.com/void-linux/void-packages/pull/40406

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **yes**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)

I got the error `Could NOT find Qt6Qml (missing: Qt6Qml_DIR)` maybe `qt6-qml` needs to be packaged...