From nobody Tue Feb 08 18:27:07 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 7993919A113C; Tue, 8 Feb 2022 18:27:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JtWgv2m5Lz3jgN; Tue, 8 Feb 2022 18:27:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644344827; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MO8HY0WLPBeC17KwMorOi5FySJpue4C+nt4wWXV61kk=; b=AQ/Qs2CXQDHSvIIBvotBwZIt6jmk5bnskC3aGJc7mlBZlMltNDx5CIbh+vhZSFDuTmTGbY OgAksGvwKMVlszxZ8gtZBS5HikcBaaxx4ntn+9zt3CwJ5yULWTlFuVuMQPFqMHJefKQUcw KBj83CSRLGD7XfH2/k1z0Apxa294/kOPifqrDPjMHXwQOwn1UKV3tpfo9ozvgbiUYFvH9B K+N5Ij0YM11lk6nH3kNlc78SEgyK9YpXBpEpKKUpBTqg9uSfu97yvXoOXEVtwx6gszthP3 1pcdnVPFEL5GEdPmqhErwYef6Bx4bhrs7YQBL11L7h4AHRb7rLKuG2aUr06Adw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3F63A1E05F; Tue, 8 Feb 2022 18:27:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 218IR7DS075803; Tue, 8 Feb 2022 18:27:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 218IR7JQ075802; Tue, 8 Feb 2022 18:27:07 GMT (envelope-from git) Date: Tue, 8 Feb 2022 18:27:07 GMT Message-Id: <202202081827.218IR7JQ075802@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 38b03554e69a - main - x11-wm/kwinft: drop Plasma 5.23 workaround after 12994bed8f5e List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 38b03554e69af00d97fdb800d126e149cece91af Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644344827; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MO8HY0WLPBeC17KwMorOi5FySJpue4C+nt4wWXV61kk=; b=EZCL0A4eZn5goifkij4RyV+lx+yoocIlF7kDollRc+dzOQpEoT4XFxJj+yLr70tu0m7Gl0 PzeO+mv1LCnuncKuXyWtU9S3IUNMDYK6hFCfNEPLUB9awQ6uUmTPtPIT+AlpBmyhAJBwt9 zV0EafXGaPW/8QkiD05XKxUE3x9AYjHKk++jx89H7D02IFcmZYmPGDYyNrVKJJkeWXB2Zb adPomovj3q92zn6qT/G6dfRs0X+IKFEtd8wQ8ZpRe8A8VZOe/Hf/9ic8tu1MQiCG7ljmdI A+xJ6O5FdVgNUADcGc2SPP7lcKNnNv7AbLiBlVhwrSbAF1i5jlhRYFszYT1cDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644344827; a=rsa-sha256; cv=none; b=UBFA5WPM3EQyTTxDOTvbOU1ztZBqgkXkKdV278lRe0ncXAhzpN1zCxywO9ZDZUqDSPDu1w 5X+PjWm5f1YVsA05bN0C5ENjjrrv55MGfo44o6n5Fwg/fbkhlH0JNYcuj1kJ7FS3ErYWYt KCPzeyvsI6dNAFoA75q8rEdCI5VbhZE28NwpEkkBV0dij9AkhLytxHG8hVPUrNYuWmngWY VlNfPEF1ElDdDGT6A+XhN0QwQdA4jj05XIQcQsny4EY4ecEpVLalNRQy03XVY9aadECxED uIC+gkhITTAOm2CLG2zlChgkxH+ZJiflMYLEjSBDDs4gyHAh3o1tQOil2tmuSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=38b03554e69af00d97fdb800d126e149cece91af commit 38b03554e69af00d97fdb800d126e149cece91af Author: Jan Beich AuthorDate: 2022-02-08 17:35:31 +0000 Commit: Jan Beich CommitDate: 2022-02-08 18:26:55 +0000 x11-wm/kwinft: drop Plasma 5.23 workaround after 12994bed8f5e --- x11-wm/kwinft/files/patch-plasma-5.23 | 301 ---------------------------------- 1 file changed, 301 deletions(-) diff --git a/x11-wm/kwinft/files/patch-plasma-5.23 b/x11-wm/kwinft/files/patch-plasma-5.23 deleted file mode 100644 index ab82453a9d36..000000000000 --- a/x11-wm/kwinft/files/patch-plasma-5.23 +++ /dev/null @@ -1,301 +0,0 @@ -Revert until x11-wm/plasma5-kdecoration is updated to 5.24 -https://gitlab.com/kwinft/kwinft/-/commit/0368384f4942 -https://gitlab.com/kwinft/kwinft/-/commit/2d9277aa47f7 -https://gitlab.com/kwinft/kwinft/-/commit/67fd993c8ba6 - -CMake Error at CMakeLists.txt:115 (find_package): - Could not find a configuration file for package "KDecoration2" that is - compatible with requested version "5.23.90". - - The following configuration files were considered but not accepted: - - /usr/local/lib/cmake/KDecoration2/KDecoration2Config.cmake, version: 5.23.5 - ---- CMakeLists.txt.orig 2022-02-03 10:38:21 UTC -+++ CMakeLists.txt -@@ -112,7 +112,7 @@ set_package_properties(KF5Kirigami2 PROPERTIES - TYPE RUNTIME - ) - --find_package(KDecoration2 ${PROJECT_VERSION} CONFIG REQUIRED) -+find_package(KDecoration2 5.18.0 CONFIG REQUIRED) - - find_package(KScreenLocker CONFIG REQUIRED) - set_package_properties(KScreenLocker PROPERTIES ---- kcmkwin/kwindecoration/decorationmodel.cpp.orig 2022-02-03 10:38:21 UTC -+++ kcmkwin/kwindecoration/decorationmodel.cpp -@@ -19,10 +19,10 @@ - */ - #include "decorationmodel.h" - // KDecoration2 --#include - #include --#include -+#include - // KDE -+#include - #include - #include - // Qt -@@ -55,18 +55,18 @@ QVariant DecorationsModel::data(const QModelIndex &ind - if (!index.isValid() || index.column() != 0 || index.row() < 0 || index.row() >= int(m_plugins.size())) { - return QVariant(); - } -- const KDecoration2::DecorationThemeMetaData &d = m_plugins.at(index.row()); -+ const Data &d = m_plugins.at(index.row()); - switch (role) { - case Qt::DisplayRole: -- return d.visibleName(); -+ return d.visibleName; - case PluginNameRole: -- return d.pluginId(); -+ return d.pluginName; - case ThemeNameRole: -- return d.themeName(); -+ return d.themeName; - case ConfigurationRole: -- return d.hasConfiguration(); -+ return d.configuration; - case RecommendedBorderSizeRole: -- return Utils::borderSizeToString(d.borderSize()); -+ return Utils::borderSizeToString(d.recommendedBorderSize); - } - return QVariant(); - } -@@ -132,13 +132,17 @@ void DecorationsModel::init() - { - beginResetModel(); - m_plugins.clear(); -- const auto plugins = KPluginMetaData::findPlugins(s_pluginName); -+ const auto plugins = KPluginLoader::findPlugins(s_pluginName); - for (const auto &info : plugins) { -- QScopedPointer themeFinder( -- KPluginFactory::instantiatePlugin(info).plugin); -- KDecoration2::DecorationThemeMetaData data; -- const auto decoSettingsMap = info.rawData().value("org.kde.kdecoration2").toObject().toVariantMap(); -- if (themeFinder) { -+ KPluginLoader loader(info.fileName()); -+ KPluginFactory *factory = loader.factory(); -+ if (!factory) { -+ continue; -+ } -+ auto metadata = loader.metaData().value(QStringLiteral("MetaData")).toObject().value(s_pluginName); -+ Data data; -+ if (!metadata.isUndefined()) { -+ const auto decoSettingsMap = metadata.toObject().toVariantMap(); - const QString &kns = findKNewStuff(decoSettingsMap); - if (!kns.isEmpty() && !m_knsProviders.contains(kns)) { - m_knsProviders.append(kns); -@@ -149,20 +153,35 @@ void DecorationsModel::init() - // We cannot list the themes - continue; - } -- const auto themesList = themeFinder->themes(); -- for (const KDecoration2::DecorationThemeMetaData &data : themesList) { -- m_plugins.emplace_back(data); -+ QScopedPointer themeFinder(factory->create(keyword)); -+ if (themeFinder.isNull()) { -+ continue; - } -+ QVariant themes = themeFinder->property("themes"); -+ if (!themes.isValid()) { -+ continue; -+ } -+ const auto themesMap = themes.toMap(); -+ for (auto it = themesMap.begin(); it != themesMap.end(); ++it) { -+ Data d; -+ d.pluginName = info.pluginId(); -+ d.themeName = it.value().toString(); -+ d.visibleName = it.key(); -+ QMetaObject::invokeMethod(themeFinder.data(), "hasConfiguration", -+ Q_RETURN_ARG(bool, d.configuration), -+ Q_ARG(QString, d.themeName)); -+ m_plugins.emplace_back(std::move(d)); -+ } - - // it's a theme engine, we don't want to show this entry - continue; - } -+ data.configuration = isConfigureable(decoSettingsMap); -+ data.recommendedBorderSize = recommendedBorderSize(decoSettingsMap); - } -- data.setHasConfiguration(isConfigureable(decoSettingsMap)); -- data.setBorderSize(recommendedBorderSize(decoSettingsMap)); -- data.setVisibleName(info.name().isEmpty() ? info.pluginId() : info.name()); -- data.setPluginId(info.pluginId()); -- data.setThemeName(data.visibleName()); -+ data.pluginName = info.pluginId(); -+ data.visibleName = info.name().isEmpty() ? info.pluginId() : info.name(); -+ data.themeName = data.visibleName; - - m_plugins.emplace_back(std::move(data)); - } -@@ -171,9 +190,11 @@ void DecorationsModel::init() - - QModelIndex DecorationsModel::findDecoration(const QString &pluginName, const QString &themeName) const - { -- auto it = std::find_if(m_plugins.cbegin(), m_plugins.cend(), [pluginName, themeName](const KDecoration2::DecorationThemeMetaData &d) { -- return d.pluginId() == pluginName && d.themeName() == themeName; -- }); -+ auto it = std::find_if(m_plugins.cbegin(), m_plugins.cend(), -+ [pluginName, themeName](const Data &d) { -+ return d.pluginName == pluginName && d.themeName == themeName; -+ } -+ ); - if (it == m_plugins.cend()) { - return QModelIndex(); - } ---- kcmkwin/kwindecoration/decorationmodel.h.orig 2022-02-03 10:38:21 UTC -+++ kcmkwin/kwindecoration/decorationmodel.h -@@ -22,7 +22,6 @@ - - #include "utils.h" - --#include - #include - - namespace KDecoration2 -@@ -60,7 +59,14 @@ public Q_SLOTS: - void init(); - - private: -- std::vector m_plugins; -+ struct Data { -+ QString pluginName; -+ QString themeName; -+ QString visibleName; -+ bool configuration = false; -+ KDecoration2::BorderSize recommendedBorderSize = KDecoration2::BorderSize::Normal; -+ }; -+ std::vector m_plugins; - QStringList m_knsProviders; - }; - ---- plugins/kdecorations/aurorae/src/aurorae.cpp.orig 2022-02-03 10:38:21 UTC -+++ plugins/kdecorations/aurorae/src/aurorae.cpp -@@ -60,11 +60,10 @@ along with this program. If not, see (); -- registerPlugin(); -- registerPlugin(); -+ registerPlugin(QStringLiteral("themes")); -+ registerPlugin(QStringLiteral("kcmodule")); - ) - -- - namespace Aurorae - { - -@@ -610,33 +609,28 @@ KDecoration2::DecoratedClient *Decoration::clientPoint - return client().data(); - } - --ThemeProvider::ThemeProvider(QObject *parent, const KPluginMetaData &data, const QVariantList &args) -- : KDecoration2::DecorationThemeProvider(parent, data, args) -- , m_data(data) -+ThemeFinder::ThemeFinder(QObject *parent, const QVariantList &args) -+ : QObject(parent) - { -+ Q_UNUSED(args) - init(); - } - --void ThemeProvider::init() -+void ThemeFinder::init() - { - findAllQmlThemes(); - findAllSvgThemes(); - } - --void ThemeProvider::findAllQmlThemes() -+void ThemeFinder::findAllQmlThemes() - { - const auto offers = KPackage::PackageLoader::self()->findPackages(QStringLiteral("KWin/Decoration"), s_qmlPackageFolder); - for (const auto &offer : offers) { -- KDecoration2::DecorationThemeMetaData data; -- data.setPluginId(m_data.pluginId()); -- data.setThemeName(offer.pluginId()); -- data.setVisibleName(offer.name()); -- data.setHasConfiguration(hasConfiguration(offer.pluginId())); -- m_themes.append(data); -+ m_themes.insert(offer.name(), offer.pluginId()); - } - } - --void ThemeProvider::findAllSvgThemes() -+void ThemeFinder::findAllSvgThemes() - { - QStringList themes; - const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("aurorae/themes/"), QStandardPaths::LocateDirectory); -@@ -664,19 +658,14 @@ void ThemeProvider::findAllSvgThemes() - name = packageName; - } - -- KDecoration2::DecorationThemeMetaData data; -- data.setPluginId(m_data.pluginId()); -- data.setThemeName(QLatin1String("__aurorae__svg__") + packageName); -- data.setVisibleName(name); -- data.setHasConfiguration(hasConfiguration(data.themeName())); -- m_themes.append(data); -+ m_themes.insert(name, QString(QLatin1String("__aurorae__svg__") + packageName)); - } - } - - static const QString s_configUiPath = QStringLiteral("kwin/decorations/%1/contents/ui/config.ui"); - static const QString s_configXmlPath = QStringLiteral("kwin/decorations/%1/contents/config/main.xml"); - --bool ThemeProvider::hasConfiguration(const QString &theme) -+bool ThemeFinder::hasConfiguration(const QString &theme) const - { - if (theme.startsWith(QLatin1String("__aurorae__svg__"))) { - return true; ---- plugins/kdecorations/aurorae/src/aurorae.h.orig 2022-02-03 10:38:21 UTC -+++ plugins/kdecorations/aurorae/src/aurorae.h -@@ -18,12 +18,10 @@ along with this program. If not, see - #include --#include --#include - #include - #include -+#include - - class QQmlComponent; - class QQmlContext; -@@ -91,24 +89,25 @@ Q_SIGNALS: (private) - QElapsedTimer m_doubleClickTimer; - }; - --class ThemeProvider : public KDecoration2::DecorationThemeProvider -+class ThemeFinder : public QObject - { - Q_OBJECT -+ Q_PROPERTY(QVariantMap themes READ themes) - public: -- explicit ThemeProvider(QObject *parent, const KPluginMetaData &data, const QVariantList &args); -+ explicit ThemeFinder(QObject *parent = nullptr, const QVariantList &args = QVariantList()); - -- QList themes() const override -- { -+ QVariantMap themes() const { - return m_themes; - } - -+public Q_SLOTS: -+ bool hasConfiguration(const QString &theme) const; -+ - private: - void init(); - void findAllQmlThemes(); - void findAllSvgThemes(); -- bool hasConfiguration(const QString &theme); -- QList m_themes; -- const KPluginMetaData m_data; -+ QVariantMap m_themes; - }; - - class ConfigurationModule : public KCModule