net-im/ruqola: prepare for KDE Frameworks 5.104

Backports of upstream commits
- a3513afa21
- fc56ae9a55

PR:		270117
This commit is contained in:
Tobias C. Berner 2023-03-20 09:41:12 +01:00
parent 55c08bfbb7
commit f91bfed74c
2 changed files with 29 additions and 0 deletions

View file

@ -0,0 +1,11 @@
--- CMakeLists.txt.orig 2023-01-31 13:04:44 UTC
+++ CMakeLists.txt
@@ -156,7 +156,7 @@ ecm_set_disabled_deprecation_versions(QT 5.15.2
include_directories(${CMAKE_CURRENT_BINARY_DIR})
ecm_set_disabled_deprecation_versions(QT 5.15.2
- KF 6.0.0
+ KF 5.104.0
)
if (OPTION_BUILD_PYTHON_BINDINGS)
remove_definitions(-DQT_STRICT_ITERATORS)

View file

@ -0,0 +1,18 @@
--- src/plugins/textplugin/sharetext/purposemenuwidget.cpp.orig 2023-01-31 13:04:44 UTC
+++ src/plugins/textplugin/sharetext/purposemenuwidget.cpp
@@ -5,10 +5,15 @@
*/
#include "purposemenuwidget.h"
+#include "purpose_version.h"
#include <KLocalizedString>
#include <KMessageBox>
#include <Purpose/AlternativesModel>
+#if PURPOSE_VERSION < QT_VERSION_CHECK(5, 104, 0)
#include <PurposeWidgets/Menu>
+#else
+#include <Purpose/Menu>
+#endif
#include <QJsonArray>
#include <QTemporaryFile>
#include <QUrl>