From 83f78c4c4dcf872a655b6b52dd23dd5e51fb37d2fc80d366ecd8b57647514dba Mon Sep 17 00:00:00 2001 From: Marcel Kuehlhorn Date: Fri, 4 Feb 2022 13:11:50 +0000 Subject: [PATCH] Accepting request 951472 from home:nuklly:branches:server:messaging - Add 0003-add-qt5-widgets-include.patch * Fix Qt5Widgets private header include issue. OBS-URL: https://build.opensuse.org/request/show/951472 OBS-URL: https://build.opensuse.org/package/show/server:messaging/telegram-desktop?expand=0&rev=214 --- 0003-add-qt5-widgets-include.patch | 20 ++++++++++++++++++++ telegram-desktop.changes | 6 ++++++ telegram-desktop.spec | 3 +++ 3 files changed, 29 insertions(+) create mode 100644 0003-add-qt5-widgets-include.patch diff --git a/0003-add-qt5-widgets-include.patch b/0003-add-qt5-widgets-include.patch new file mode 100644 index 0000000..f4fe2b6 --- /dev/null +++ b/0003-add-qt5-widgets-include.patch @@ -0,0 +1,20 @@ +diff --git a/cmake/external/qt/CMakeLists.txt b/cmake/external/qt/CMakeLists.txt +index a4b15d3..fbd9630 100644 +--- a/cmake/external/qt/CMakeLists.txt ++++ b/cmake/external/qt/CMakeLists.txt +@@ -27,6 +27,7 @@ if (DESKTOP_APP_USE_PACKAGED) + INTERFACE + ${Qt5Core_PRIVATE_INCLUDE_DIRS} + ${Qt5Gui_PRIVATE_INCLUDE_DIRS} ++ ${Qt5Widgets_PRIVATE_INCLUDE_DIRS} + ) + + if (Qt5DBus_FOUND) +@@ -65,6 +66,7 @@ INTERFACE + ${qt_loc}/include/QtGui/${qt_version} + ${qt_loc}/include/QtCore/${qt_version}/QtCore + ${qt_loc}/include/QtGui/${qt_version}/QtGui ++ ${qt_loc}/include/QtWidgets/${qt_version}/QtWidgets + ) + + if (Qt5DBus_FOUND) diff --git a/telegram-desktop.changes b/telegram-desktop.changes index 68f178c..1e908c2 100644 --- a/telegram-desktop.changes +++ b/telegram-desktop.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 4 02:57:59 UTC 2022 - Xu Zhao + +- Add 0003-add-qt5-widgets-include.patch + * Fix Qt5Widgets private header include issue. + ------------------------------------------------------------------- Thu Feb 3 03:40:16 UTC 2022 - Xu Zhao diff --git a/telegram-desktop.spec b/telegram-desktop.spec index f3b0516..d240b1d 100644 --- a/telegram-desktop.spec +++ b/telegram-desktop.spec @@ -43,6 +43,8 @@ Patch1: 0001-use-bundled-ranged-exptected-gsl.patch # PATCH-FIX-OPENSUSE Patch2: 0002-tg_owt-fix-name-confliction.patch # PATCH-FIX-OPENSUSE +Patch3: 0003-add-qt5-widgets-include.patch +# PATCH-FIX-OPENSUSE Patch4: 0004-use-dynamic-x-libraries.patch # PATCH-FIX-OPENSUSE Patch5: 0005-add-wayland-include-path.patch @@ -160,6 +162,7 @@ The service also provides APIs to independent developers. %prep %setup -q -n tdesktop-%{version}-full %patch1 -p1 +%patch3 -p1 %patch4 -p1 %patch5 -p1