1
0

Accepting request 1040890 from home:manfred-h:server:messaging

- Add 0005-qt6-fixes.patch
  * Fix the build on openSUSE 15.4

OBS-URL: https://build.opensuse.org/request/show/1040890
OBS-URL: https://build.opensuse.org/package/show/server:messaging/telegram-desktop?expand=0&rev=238
This commit is contained in:
Marcel Kuehlhorn 2022-12-07 19:04:42 +00:00 committed by Git OBS Bridge
parent 1ff234c30c
commit a80de2842e
3 changed files with 42 additions and 0 deletions

33
0005-qt6-fixes.patch Normal file
View File

@ -0,0 +1,33 @@
--- Telegram/lib_ui/ui/widgets/popup_menu.cpp.orig 2022-11-12 11:12:02.000000000 +0000
+++ Telegram/lib_ui/ui/widgets/popup_menu.cpp 2022-12-05 07:53:47.978014760 +0000
@@ -637,14 +637,14 @@ bool PopupMenu::eventFilter(QObject *o,
event->device(),
event->touchPoints(),
event->timestamp()));
-#elif QT_VERSION < QT_VERSION_CHECK(6, 3, 0) // Qt < 6.0.0
+#elif QT_VERSION < QT_VERSION_CHECK(6, 2, 2) // Qt < 6.0.0
e->setAccepted(
QApplicationPrivate::translateRawTouchEvent(
this,
event->pointingDevice(),
const_cast<QList<QEventPoint> &>(event->points()),
event->timestamp()));
-#else // Qt < 6.3.0
+#else // Qt < 6.2.0
e->setAccepted(
QApplicationPrivate::translateRawTouchEvent(this, event));
#endif
--- Telegram/SourceFiles/platform/linux/specific_linux.cpp.orig 2022-11-25 11:21:45.000000000 +0000
+++ Telegram/SourceFiles/platform/linux/specific_linux.cpp 2022-12-05 08:37:53.441428781 +0000
@@ -291,7 +291,11 @@ void LaunchGApplication() {
app->signal_startup().connect([=] {
QEventLoop loop;
+#if QT_VERSION < QT_VERSION_CHECK(6, 3, 0)
+ loop.exec();
+#else
loop.exec(QEventLoop::ApplicationExec);
+#endif
app->quit();
}, true);

View File

@ -30,6 +30,12 @@ Wed Dec 7 08:00:59 UTC 2022 - Paolo Stivanin <info@paolostivanin.com>
* Admins help improve filtering by reporting any false * Admins help improve filtering by reporting any false
positives in Recent Actions. positives in Recent Actions.
-------------------------------------------------------------------
Mon Dec 5 07:58:42 UTC 2022 - Manfred Hollstein <manfred.h@gmx.net>
- Add 0005-qt6-fixes.patch
* Fix the build on openSUSE 15.4
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 29 11:49:02 UTC 2022 - Илья Индиго <ilya@ilya.cf> Tue Nov 29 11:49:02 UTC 2022 - Илья Индиго <ilya@ilya.cf>

View File

@ -63,6 +63,8 @@ Patch4: 0004-use-dynamic-x-libraries.patch
# https://github.com/desktop-app/lib_base.git 3582bca53a1e195a31760978dc41f67ce44fc7e4 # https://github.com/desktop-app/lib_base.git 3582bca53a1e195a31760978dc41f67ce44fc7e4
# but tdesktop itself still falls short, and it looks to be something # but tdesktop itself still falls short, and it looks to be something
# that would affect all ILP32 platforms. # that would affect all ILP32 platforms.
# PATCH-FIX-OPENSUSE
Patch5: 0005-qt6-fixes.patch
ExcludeArch: %ix86 aarch64_ilp32 ppc riscv32 ExcludeArch: %ix86 aarch64_ilp32 ppc riscv32
BuildRequires: appstream-glib BuildRequires: appstream-glib
BuildRequires: chrpath BuildRequires: chrpath
@ -209,6 +211,7 @@ The service also provides APIs to independent developers.
%patch1 -p1 %patch1 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p0
mkdir ../Libraries mkdir ../Libraries
# If not TW, unpack rnnoise source # If not TW, unpack rnnoise source