Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package telegram-desktop for
openSUSE:Factory checked in at 2025-04-11 23:22:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/telegram-desktop (Old)
and /work/SRC/openSUSE:Factory/.telegram-desktop.new.1907 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "telegram-desktop"
Fri Apr 11 23:22:29 2025 rev:134 rq:1268616 version:5.13.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/telegram-desktop/telegram-desktop.changes
2025-03-27 22:31:54.223618799 +0100
+++
/work/SRC/openSUSE:Factory/.telegram-desktop.new.1907/telegram-desktop.changes
2025-04-11 23:22:31.405513108 +0200
@@ -1,0 +2,8 @@
+Fri Apr 11 07:08:18 UTC 2025 - Christophe Marin <[email protected]>
+
+- Added 0001-Fix-build-with-Qt-6.9.patch (boo#1241069).
+- Use system libdispatch.
+- Removed build dependency on KF5Wayland, it is only needed
+ if the DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION option is enabled.
+
+-------------------------------------------------------------------
New:
----
0001-Fix-build-with-Qt-6.9.patch
BETA DEBUG BEGIN:
New:
- Added 0001-Fix-build-with-Qt-6.9.patch (boo#1241069).
- Use system libdispatch.
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ telegram-desktop.spec ++++++
--- /var/tmp/diff_new_pack.1Wu1wC/_old 2025-04-11 23:22:32.669566058 +0200
+++ /var/tmp/diff_new_pack.1Wu1wC/_new 2025-04-11 23:22:32.669566058 +0200
@@ -36,6 +36,8 @@
Patch1: 0001-dynamic-link-x.patch
Patch2: 0002-tg_owt-h264-dlopen.patch
Patch3: 0003-tg_owt-pipewire-1.4.patch
+# PATCH-FIX-UPSTREAM -- https://github.com/desktop-app/lib_base/pull/268
+Patch4: 0001-Fix-build-with-Qt-6.9.patch
BuildRequires: appstream-glib
BuildRequires: chrpath
BuildRequires: clang
@@ -52,6 +54,7 @@
BuildRequires: glibc-devel
BuildRequires: libboost_program_options-devel
BuildRequires: libboost_regex-devel
+BuildRequires: libdispatch-devel
BuildRequires: libjpeg-devel
BuildRequires: liblz4-devel
BuildRequires: ninja
@@ -66,7 +69,6 @@
BuildRequires: xxhash-devel
BuildRequires: xz
BuildRequires: yasm
-BuildRequires: cmake(KF5Wayland)
BuildRequires: cmake(Qt6Concurrent)
BuildRequires: cmake(Qt6Core)
BuildRequires: cmake(Qt6DBus)
@@ -154,7 +156,7 @@
%prep
%setup -q -n tdesktop-%{version}-full -b1 -b2 -b3
-%autopatch -p1 1
+%autopatch -p1 1 4
mkdir -p %{_builddir}/Libraries/ada
mkdir -p %{_builddir}/Libraries/tg_owt
++++++ 0001-Fix-build-with-Qt-6.9.patch ++++++
>From bab67be7b40ebf42acf4514f0ef63e4d77ce4dff Mon Sep 17 00:00:00 2001
From: Antonio Rojas <[email protected]>
Date: Sat, 1 Mar 2025 01:20:04 +0100
Subject: [PATCH] Fix build with Qt 6.9
---
.../base/platform/linux/base_linux_xdp_utilities.cpp | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/Telegram/lib_base/base/platform/linux/base_linux_xdp_utilities.cpp
b/Telegram/lib_base/base/platform/linux/base_linux_xdp_utilities.cpp
index 8aca67c..80626af 100644
--- a/Telegram/lib_base/base/platform/linux/base_linux_xdp_utilities.cpp
+++ b/Telegram/lib_base/base/platform/linux/base_linux_xdp_utilities.cpp
@@ -16,7 +16,11 @@
#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
#include <qpa/qplatformintegration.h>
#include <private/qguiapplication_p.h>
+#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
+#include <private/qdesktopunixservices_p.h>
+#else
#include <private/qgenericunixservices_p.h>
+#endif // Qt >= 6.9.0
#endif // Qt >= 6.5.0
#include <sstream>
@@ -39,7 +43,11 @@ std::string ParentWindowID(QWindow *window) {
}
#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
+ if (const auto services = dynamic_cast<QDesktopUnixServices*>(
+#else
if (const auto services = dynamic_cast<QGenericUnixServices*>(
+#endif // Qt >= 6.9.0
QGuiApplicationPrivate::platformIntegration()->services())) {
return services->portalWindowIdentifier(window).toStdString();
}
--
2.49.0
