From nobody Fri Jun 28 16:27:29 2024 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 4W9gns4zrLz5NqVZ; Fri, 28 Jun 2024 16:27:29 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W9gns3kvvz4Zw9; Fri, 28 Jun 2024 16:27:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719592049; 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=tSHIcZCiuu2jBQLAE+GCJNoKpEy7JiPBXzrAD3qOzYo=; b=Wn2Att0e2sVpnOLMO59OUQyGp0BEUZCQsFStM7PgdeJPjxJDBXRzqIiD/8lN3BhaFAllrz 1N/D0lQZZ70KbSalHYaX1OY7t51sM+5GBfthXStHZ2yUhllq7gFEnvfYAGGkTXF2enkPpv rXsh4Q8yq0KY+bEPGJ8qlS/ACRTAE8mk8AUjSLyCUnvImulMMYfpcgxMi+/SlGTf6jG5P/ Rdlux9ZWgq6fhSiVjSioFcvMI+m0KxrCAgFZEA3FOLZ/GT2FrPEBZv0eCw8j3RP7qpb2ea seTavj02Sb7bEuLyY4pYMxsD/grqEynxldK4XQeevKED2+5ynMf+7nNJ0Zohuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719592049; a=rsa-sha256; cv=none; b=cxhLaMlwmBjr+2SWWNcuc5bLCM7r0JJjxSzQoPOOA6tb2fzHu6fijHxszrmdg5BwkCOaa4 xpxTA4Fp6UK8NmDvt9GRdLrGFr9acfEQoeDKYGQudqmTZDVbFwjLXVHjZlUDFwynRXdsb5 GYTSSqbc5x5Y6DWiDzdog4ylxOsm5S3bKIQi3I3phr/Y+pEQbez7pVLTnRCOgg8WsCv/dD iAeWQRF1PuzditIPt4y1iEpSD+cDlpup63vpuEvld8UPZBGTeD+xiIEsBABXy1uyEEmHbN T4pO5VrY3kkPVGT6CYdvowTR8HY1gFxwNLXSZuiKwfEQGPIU7mdGoIpNWO4Jfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719592049; 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=tSHIcZCiuu2jBQLAE+GCJNoKpEy7JiPBXzrAD3qOzYo=; b=WirmMZIApv7qJPaj+kD9Q2gQDpNSdrqsfUa9dRQdeYsqGg7bpQc7Y2kI4HwoQy1vXBh6DD LPJ33l1Sb+QQ7JS0TO0I1Wctf+gN8x4eHhKl5PHwiV8zkDysx6L4+N+F9nLn4QjeLBlFQH ZJTQERcm1igCDGeNNF8NWZ/gHZhHmcbWcdhcjWyU49RCb/EfixrCsqU5FkuZj/kXjlkjkB UTF+IgWvx4TP5apSeO0rwNlE8gwNETvqnluc7YKE8QIe+mCi9Jq8Wmu+vNdAlBSw6zjNGR 5B75ht6sxVpu67AMm4wBPKiTN4180OVvFPEOjwtL6pxIGzDY4fJ9T1BkEV+xog== 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 4W9gns3LY7z12yc; Fri, 28 Jun 2024 16:27:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45SGRTmY000514; Fri, 28 Jun 2024 16:27:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45SGRT3o000511; Fri, 28 Jun 2024 16:27:29 GMT (envelope-from git) Date: Fri, 28 Jun 2024 16:27:29 GMT Message-Id: <202406281627.45SGRT3o000511@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: 3a9a604e88b3 - main - KDE: remove patches required to add support for Plasma 6.0 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3a9a604e88b3f50e9add98319c7205b70ddff21b Auto-Submitted: auto-generated The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=3a9a604e88b3f50e9add98319c7205b70ddff21b commit 3a9a604e88b3f50e9add98319c7205b70ddff21b Author: Tobias C. Berner AuthorDate: 2024-06-28 15:23:56 +0000 Commit: Tobias C. Berner 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 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::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