diff options
| author | Tobias C. Berner <tcberner@FreeBSD.org> | 2023-03-20 08:41:12 +0000 |
|---|---|---|
| committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2023-03-20 08:43:11 +0000 |
| commit | f91bfed74ce126d392c730bdd6a55f8741bb9e17 (patch) | |
| tree | 5bb443278d767b16f78810357ac36216bdd27c81 | |
| parent | 55c08bfbb77e1bebd6594b8c38914b431a913a44 (diff) | |
| download | ports-f91bfed74ce126d392c730bdd6a55f8741bb9e17.tar.gz ports-f91bfed74ce126d392c730bdd6a55f8741bb9e17.zip | |
net-im/ruqola: prepare for KDE Frameworks 5.104
Backports of upstream commits
- https://invent.kde.org/network/ruqola/-/commit/a3513afa211e681a3de2c642c8e56d2a10944bd8
- https://invent.kde.org/network/ruqola/-/commit/fc56ae9a55f68051fffa808b1b36e4483098db5c
PR: 270117
| -rw-r--r-- | net-im/ruqola/files/patch-CMakeLists.txt | 11 | ||||
| -rw-r--r-- | net-im/ruqola/files/patch-src_plugins_textplugin_sharetext_purposemenuwidget.cpp | 18 |
2 files changed, 29 insertions, 0 deletions
diff --git a/net-im/ruqola/files/patch-CMakeLists.txt b/net-im/ruqola/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..dc6c5b0ceec0 --- /dev/null +++ b/net-im/ruqola/files/patch-CMakeLists.txt @@ -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) diff --git a/net-im/ruqola/files/patch-src_plugins_textplugin_sharetext_purposemenuwidget.cpp b/net-im/ruqola/files/patch-src_plugins_textplugin_sharetext_purposemenuwidget.cpp new file mode 100644 index 000000000000..579492b0f740 --- /dev/null +++ b/net-im/ruqola/files/patch-src_plugins_textplugin_sharetext_purposemenuwidget.cpp @@ -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> |