Date: Mon, 20 Mar 2023 08:43:33 GMT From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: f91bfed74ce1 - main - net-im/ruqola: prepare for KDE Frameworks 5.104 Message-ID: <202303200843.32K8hXjE096617@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=f91bfed74ce126d392c730bdd6a55f8741bb9e17 commit f91bfed74ce126d392c730bdd6a55f8741bb9e17 Author: Tobias C. Berner <tcberner@FreeBSD.org> AuthorDate: 2023-03-20 08:41:12 +0000 Commit: Tobias C. Berner <tcberner@FreeBSD.org> CommitDate: 2023-03-20 08:43:11 +0000 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 --- net-im/ruqola/files/patch-CMakeLists.txt | 11 +++++++++++ ..._plugins_textplugin_sharetext_purposemenuwidget.cpp | 18 ++++++++++++++++++ 2 files changed, 29 insertions(+) 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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202303200843.32K8hXjE096617>