git: 3a9a604e88b3 - main - KDE: remove patches required to add support for Plasma 6.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 28 Jun 2024 16:27:29 UTC
The branch main has been updated by tcberner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=3a9a604e88b3f50e9add98319c7205b70ddff21b
commit 3a9a604e88b3f50e9add98319c7205b70ddff21b
Author: Tobias C. Berner <tcberner@FreeBSD.org>
AuthorDate: 2024-06-28 15:23:56 +0000
Commit: Tobias C. Berner <tcberner@FreeBSD.org>
CommitDate: 2024-06-28 16:26:33 +0000
KDE: remove patches required to add support for Plasma 6.0
They are no longer needed after acd77861e62460839d395782cbc7a3924668b36e
Reported by: jbeich
---
x11-toolkits/como/files/patch-plasma-6.0 | 19 ------
x11-wm/theseus-ship/files/patch-plasma-6.0 | 93 ------------------------------
x11/kdisplay/files/patch-plasma-6.0 | 23 --------
3 files changed, 135 deletions(-)
diff --git a/x11-toolkits/como/files/patch-plasma-6.0 b/x11-toolkits/como/files/patch-plasma-6.0
deleted file mode 100644
index 1ea9c03af3c1..000000000000
--- a/x11-toolkits/como/files/patch-plasma-6.0
+++ /dev/null
@@ -1,19 +0,0 @@
-Drop after x11-wm/plasma6-kdecoration >= 6.1.0
-
-https://github.com/winft/como/commit/3155adace1ce
-https://invent.kde.org/plasma/kdecoration/-/commit/4612e0f003a3
-
-como/win/deco/settings.h:113:59: error: no member named 'Spacer' in 'KDecoration2::DecorationButtonType'
- s_buttonNames[KDecoration2::DecorationButtonType::Spacer] = QChar('_');
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^
-
---- como/win/deco/settings.h.orig 2024-06-19 18:07:57 UTC
-+++ como/win/deco/settings.h
-@@ -110,7 +110,6 @@ class settings : public QObject, public KDecoration2::
- s_buttonNames[KDecoration2::DecorationButtonType::KeepAbove] = QChar('F');
- s_buttonNames[KDecoration2::DecorationButtonType::KeepBelow] = QChar('B');
- s_buttonNames[KDecoration2::DecorationButtonType::Shade] = QChar('L');
-- s_buttonNames[KDecoration2::DecorationButtonType::Spacer] = QChar('_');
- }
-
- QString buttonsToString(QVector<KDecoration2::DecorationButtonType> const& buttons) const
diff --git a/x11-wm/theseus-ship/files/patch-plasma-6.0 b/x11-wm/theseus-ship/files/patch-plasma-6.0
deleted file mode 100644
index 8206d9b2e98f..000000000000
--- a/x11-wm/theseus-ship/files/patch-plasma-6.0
+++ /dev/null
@@ -1,93 +0,0 @@
-Drop after x11/plasma6-libplasma >= 6.1.0 update
-Drop after x11-wm/plasma6-kdecoration >= 6.1.0
-
-CMake Warning at CMakeLists.txt:59 (find_package):
- Could not find a configuration file for package "Plasma" that is compatible
- with requested version "6.1".
-
- The following configuration files were considered but not accepted:
-
- /usr/local/lib/cmake/Plasma/PlasmaConfig.cmake, version: 6.0.4
-
-CMake Error at CMakeLists.txt:68 (find_package):
- Could not find a configuration file for package "KDecoration2" that is
- compatible with requested version "6.1".
-
- The following configuration files were considered but not accepted:
-
- /usr/local/lib/cmake/KDecoration2/KDecoration2Config.cmake, version: 6.0.4
-
-kcms/decoration/declarative-plugin/buttonsmodel.cpp:72:32: error: no member named 'Spacer' in 'KDecoration2::DecorationButtonType'
- case DecorationButtonType::Spacer:
- ~~~~~~~~~~~~~~~~~~~~~~^
-kcms/decoration/declarative-plugin/buttonsmodel.cpp:72:32: error: no member named 'Spacer' in 'KDecoration2::DecorationButtonType'
- case DecorationButtonType::Spacer:
- ~~~~~~~~~~~~~~~~~~~~~~^
-kcms/decoration/utils.cpp:46:42: error: no member named 'Spacer' in 'KDecoration2::DecorationButtonType'
- {KDecoration2::DecorationButtonType::Spacer, QChar('_')},
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^
-
---- CMakeLists.txt.orig 2024-06-19 18:47:54 UTC
-+++ CMakeLists.txt
-@@ -56,7 +56,7 @@ set_package_properties(KF6Kirigami PROPERTIES
- TYPE RUNTIME
- )
-
--find_package(Plasma ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}
-+find_package(Plasma ${CMAKE_PROJECT_VERSION_MAJOR}
- CONFIG
- )
- set_package_properties(Plasma PROPERTIES
-@@ -65,7 +65,7 @@ set_package_properties(Plasma PROPERTIES
- TYPE RUNTIME
- )
-
--find_package(KDecoration2 ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}
-+find_package(KDecoration2 ${CMAKE_PROJECT_VERSION_MAJOR}
- CONFIG REQUIRED
- )
-
---- kcms/decoration/declarative-plugin/previewbutton.cpp.orig 2024-06-19 18:47:54 UTC
-+++ kcms/decoration/declarative-plugin/previewbutton.cpp
-@@ -121,12 +121,7 @@ void PreviewButtonItem::paint(QPainter* painter)
- }
-
- const QRect rect(0, 0, width(), height());
-- if (type() == KDecoration2::DecorationButtonType::Spacer) {
-- static const QIcon icon = QIcon::fromTheme(QStringLiteral("distribute-horizontal"));
-- icon.paint(painter, rect);
-- } else {
- m_button->paint(painter, rect);
-- }
-
- painter->setCompositionMode(QPainter::CompositionMode_SourceAtop);
- painter->fillRect(rect, m_color);
---- kcms/decoration/declarative-plugin/buttonsmodel.cpp.orig 2024-06-19 18:47:54 UTC
-+++ kcms/decoration/declarative-plugin/buttonsmodel.cpp
-@@ -32,7 +32,6 @@ ButtonsModel::ButtonsModel(QObject* parent)
- DecorationButtonType::ContextHelp,
- DecorationButtonType::KeepBelow,
- DecorationButtonType::KeepAbove,
-- DecorationButtonType::Spacer,
- }),
- parent)
- {
-@@ -69,8 +68,6 @@ static QString buttonToName(DecorationButtonType type)
- return i18n("Keep below other windows");
- case DecorationButtonType::KeepAbove:
- return i18n("Keep above other windows");
-- case DecorationButtonType::Spacer:
-- return i18n("Spacer");
- default:
- return QString();
- }
---- kcms/decoration/utils.cpp.orig 2024-06-19 18:47:54 UTC
-+++ kcms/decoration/utils.cpp
-@@ -43,7 +43,6 @@ const QHash<KDecoration2::DecorationButtonType, QChar>
- {KDecoration2::DecorationButtonType::KeepAbove, QChar('F')},
- {KDecoration2::DecorationButtonType::KeepBelow, QChar('B')},
- {KDecoration2::DecorationButtonType::Shade, QChar('L')},
-- {KDecoration2::DecorationButtonType::Spacer, QChar('_')},
- };
- }
-
diff --git a/x11/kdisplay/files/patch-plasma-6.0 b/x11/kdisplay/files/patch-plasma-6.0
deleted file mode 100644
index 80f61b599085..000000000000
--- a/x11/kdisplay/files/patch-plasma-6.0
+++ /dev/null
@@ -1,23 +0,0 @@
-Drop after x11/plasma6-libplasma >= 6.1.0 update
-
-CMake Error at CMakeLists.txt:38 (find_package):
- Could not find a configuration file for package "Plasma" that is compatible
- with requested version "6.1".
-
- The following configuration files were considered but not accepted:
-
- /usr/local/lib/cmake/Plasma/PlasmaConfig.cmake, version: 6.0.4
-
---- CMakeLists.txt.orig 2024-06-19 20:33:52 UTC
-+++ CMakeLists.txt
-@@ -35,8 +35,8 @@ find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENT
- XmlGui
- )
-
--find_package(Plasma ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} REQUIRED)
--find_package(PlasmaQuick ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} REQUIRED)
-+find_package(Plasma ${PROJECT_VERSION_MAJOR} REQUIRED)
-+find_package(PlasmaQuick ${PROJECT_VERSION_MAJOR} REQUIRED)
-
- find_package(LayerShellQt)
- set_package_properties(LayerShellQt PROPERTIES