[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/, kde-frameworks/plasma/files/

[Andreas Sturmlechner]

commit:     5f691dec3ba9a61e6fee433098a838b322eea33b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  6 06:59:31 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug  6 07:18:49 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f691dec

kde-frameworks/plasma: drop 5.92.0-r2

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-frameworks/plasma/Manifest                     |   1 -
 ...lasma-5.92.0-breeze-light-dark-visual-fix.patch |  40 --------
 .../files/plasma-5.92.0-fix-blurry-buttons.patch   | 110 ---------------------
 kde-frameworks/plasma/plasma-5.92.0-r2.ebuild      |  78 ---------------
 4 files changed, 229 deletions(-)

diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index be5373dcd5d0..dff45506cb78 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,2 +1 @@
-DIST plasma-framework-5.92.0.tar.xz 3145504 BLAKE2B 4c9c4a6c585fae629d94666d312af9a2dc74242d59f93cf6b63e206f7b4656982e1969cee7e1543b5c32b4f0815d602cfa8d0b56c3416f92bd5d2d2048ee6ef4 SHA512 6efbb9f03ec11804b12cda209dc665468cf6f56ecf712a136a5cf1ea2cb1deb1d427896770b12c18094a2d7f0ef69da9dcbe52b16ae2126e8382ade74d8ce54c
 DIST plasma-framework-5.96.0.tar.xz 3145380 BLAKE2B a9190358fc454dfba03d8f5881b52e21e7e209f471823d4d4ead54818103436775f09df7f1dd42ade4d4b5b2df448f5cb1bb682ea77d32c57cdfe7c39ecab238 SHA512 9361948197c69ab8b2a1b943c1e9a2e44443588cd3bb4073eaa9ac6a4575bb4c1e6a257eb2fda6333df13eb568e09ed26a88d128fdafbe517bca705b8a8f2a5b

diff --git a/kde-frameworks/plasma/files/plasma-5.92.0-breeze-light-dark-visual-fix.patch b/kde-frameworks/plasma/files/plasma-5.92.0-breeze-light-dark-visual-fix.patch
deleted file mode 100644
index 04992bcb129d..000000000000
--- a/kde-frameworks/plasma/files/plasma-5.92.0-breeze-light-dark-visual-fix.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 7352045b388f4b0ef553706bd219457e5018ce4e Mon Sep 17 00:00:00 2001
-From: Marco Martin <notmart@×××××.com>
-Date: Mon, 28 Mar 2022 21:20:16 +0000
-Subject: [PATCH] Don't install the heading SVG in breeze-light and breeze-dark
- Plasma themes
-
-Installing that file there was an acky workaround that got broken by 2cccf230.
----
- src/desktoptheme/breeze-dark/CMakeLists.txt  | 5 +----
- src/desktoptheme/breeze-light/CMakeLists.txt | 4 ----
- 2 files changed, 1 insertion(+), 8 deletions(-)
-
-diff --git a/src/desktoptheme/breeze-dark/CMakeLists.txt b/src/desktoptheme/breeze-dark/CMakeLists.txt
-index 8f2078e4d..7f8f99062 100644
---- a/src/desktoptheme/breeze-dark/CMakeLists.txt
-+++ b/src/desktoptheme/breeze-dark/CMakeLists.txt
-@@ -8,7 +8,4 @@ install(
-     FILES colors "${CMAKE_CURRENT_BINARY_DIR}/metadata.desktop"
-     DESTINATION ${PLASMA_DATA_INSTALL_DIR}/desktoptheme/breeze-dark
- )
--install(
--    FILES ${PROJECT_BINARY_DIR}/src/desktoptheme/breeze/default.gzipped/widgets/plasmoidheading.svgz
--    DESTINATION ${PLASMA_DATA_INSTALL_DIR}/desktoptheme/breeze-dark/widgets
--)
-+
-diff --git a/src/desktoptheme/breeze-light/CMakeLists.txt b/src/desktoptheme/breeze-light/CMakeLists.txt
-index 678033cec..6688a603b 100644
---- a/src/desktoptheme/breeze-light/CMakeLists.txt
-+++ b/src/desktoptheme/breeze-light/CMakeLists.txt
-@@ -8,7 +8,3 @@ install(
-     FILES colors "${CMAKE_CURRENT_BINARY_DIR}/metadata.desktop"
-     DESTINATION ${PLASMA_DATA_INSTALL_DIR}/desktoptheme/breeze-light
- )
--install(
--    FILES ${PROJECT_BINARY_DIR}/src/desktoptheme/breeze/default.gzipped/widgets/plasmoidheading.svgz
--    DESTINATION ${PLASMA_DATA_INSTALL_DIR}/desktoptheme/breeze-light/widgets
--)
--- 
-GitLab
-

diff --git a/kde-frameworks/plasma/files/plasma-5.92.0-fix-blurry-buttons.patch b/kde-frameworks/plasma/files/plasma-5.92.0-fix-blurry-buttons.patch
deleted file mode 100644
index 0286039ddb7b..000000000000
--- a/kde-frameworks/plasma/files/plasma-5.92.0-fix-blurry-buttons.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From bd1ba6e539a326585a24fc21d0e27ef2c59e8731 Mon Sep 17 00:00:00 2001
-From: Noah Davis <noahadvs@×××××.com>
-Date: Wed, 6 Apr 2022 15:08:53 -0400
-Subject: [PATCH] PC3 toggle controls: fix odd heights misaligning indicators
-
-BUG: 447977
----
- src/declarativeimports/plasmacomponents3/CheckBox.qml       | 2 +-
- src/declarativeimports/plasmacomponents3/CheckDelegate.qml  | 2 +-
- src/declarativeimports/plasmacomponents3/MenuItem.qml       | 2 +-
- src/declarativeimports/plasmacomponents3/RadioButton.qml    | 2 +-
- src/declarativeimports/plasmacomponents3/RadioDelegate.qml  | 2 +-
- src/declarativeimports/plasmacomponents3/Switch.qml         | 2 +-
- src/declarativeimports/plasmacomponents3/SwitchDelegate.qml | 2 +-
- 7 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/src/declarativeimports/plasmacomponents3/CheckBox.qml b/src/declarativeimports/plasmacomponents3/CheckBox.qml
-index 1da39da24..fed972566 100644
---- a/src/declarativeimports/plasmacomponents3/CheckBox.qml
-+++ b/src/declarativeimports/plasmacomponents3/CheckBox.qml
-@@ -35,7 +35,7 @@ T.CheckBox {
- 
-     indicator: CheckIndicator {
-         x: !control.mirrored ? control.leftPadding : control.width - width - control.rightPadding
--        y: control.topPadding + (control.availableHeight - height) / 2
-+        y: control.topPadding + Math.round((control.availableHeight - height) / 2)
-         control: control
-     }
- 
-diff --git a/src/declarativeimports/plasmacomponents3/CheckDelegate.qml b/src/declarativeimports/plasmacomponents3/CheckDelegate.qml
-index ef965becd..9d241467b 100644
---- a/src/declarativeimports/plasmacomponents3/CheckDelegate.qml
-+++ b/src/declarativeimports/plasmacomponents3/CheckDelegate.qml
-@@ -47,7 +47,7 @@ T.CheckDelegate {
- 
-     indicator: CheckIndicator {
-         x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding
--        y: control.topPadding + (control.availableHeight - height) / 2
-+        y: control.topPadding + Math.round((control.availableHeight - height) / 2)
- 
-         control: control
-     }
-diff --git a/src/declarativeimports/plasmacomponents3/MenuItem.qml b/src/declarativeimports/plasmacomponents3/MenuItem.qml
-index 16f2a5e36..964c5930d 100644
---- a/src/declarativeimports/plasmacomponents3/MenuItem.qml
-+++ b/src/declarativeimports/plasmacomponents3/MenuItem.qml
-@@ -81,7 +81,7 @@ T.MenuItem {
- 
-     indicator: Loader {
-         x: controlRoot.mirrored ? controlRoot.width - width - controlRoot.rightPadding : controlRoot.leftPadding
--        y: controlRoot.topPadding + (controlRoot.availableHeight - height) / 2
-+        y: controlRoot.topPadding + Math.round((controlRoot.availableHeight - height) / 2)
- 
-         visible: controlRoot.checkable
-         sourceComponent: controlRoot.autoExclusive ? radioComponent : checkComponent
-diff --git a/src/declarativeimports/plasmacomponents3/RadioButton.qml b/src/declarativeimports/plasmacomponents3/RadioButton.qml
-index 7eeee3f9b..0b7a19894 100644
---- a/src/declarativeimports/plasmacomponents3/RadioButton.qml
-+++ b/src/declarativeimports/plasmacomponents3/RadioButton.qml
-@@ -32,7 +32,7 @@ T.RadioButton {
- 
-     indicator: RadioIndicator {
-         x: !control.mirrored ? control.leftPadding : control.width - width - control.rightPadding
--        y: control.topPadding + (control.availableHeight - height) / 2
-+        y: control.topPadding + Math.round((control.availableHeight - height) / 2)
-         control: control
-     }
- 
-diff --git a/src/declarativeimports/plasmacomponents3/RadioDelegate.qml b/src/declarativeimports/plasmacomponents3/RadioDelegate.qml
-index e25f28cc3..a915a4eac 100644
---- a/src/declarativeimports/plasmacomponents3/RadioDelegate.qml
-+++ b/src/declarativeimports/plasmacomponents3/RadioDelegate.qml
-@@ -47,7 +47,7 @@ T.RadioDelegate {
- 
-     indicator: RadioIndicator {
-         x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding
--        y: control.topPadding + (control.availableHeight - height) / 2
-+        y: control.topPadding + Math.round((control.availableHeight - height) / 2)
- 
-         control: control
-     }
-diff --git a/src/declarativeimports/plasmacomponents3/Switch.qml b/src/declarativeimports/plasmacomponents3/Switch.qml
-index 32ef1274b..98de41388 100644
---- a/src/declarativeimports/plasmacomponents3/Switch.qml
-+++ b/src/declarativeimports/plasmacomponents3/Switch.qml
-@@ -32,7 +32,7 @@ T.Switch {
- 
-     indicator: SwitchIndicator {
-         x: !control.mirrored ? control.leftPadding : control.width - width - control.rightPadding
--        y: control.topPadding + (control.availableHeight - height) / 2
-+        y: control.topPadding + Math.round((control.availableHeight - height) / 2)
-         control: control
-     }
- 
-diff --git a/src/declarativeimports/plasmacomponents3/SwitchDelegate.qml b/src/declarativeimports/plasmacomponents3/SwitchDelegate.qml
-index e6adf9a6e..0f3db70de 100644
---- a/src/declarativeimports/plasmacomponents3/SwitchDelegate.qml
-+++ b/src/declarativeimports/plasmacomponents3/SwitchDelegate.qml
-@@ -45,7 +45,7 @@ T.SwitchDelegate {
- 
-     indicator: SwitchIndicator {
-         x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding
--        y: control.topPadding + (control.availableHeight - height) / 2
-+        y: control.topPadding + Math.round((control.availableHeight - height) / 2)
- 
-         control: control
-     }
--- 
-GitLab
-

diff --git a/kde-frameworks/plasma/plasma-5.92.0-r2.ebuild b/kde-frameworks/plasma/plasma-5.92.0-r2.ebuild
deleted file mode 100644
index f048636a97a6..000000000000
--- a/kde-frameworks/plasma/plasma-5.92.0-r2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_NAME="${PN}-framework"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Plasma framework"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="gles2-only man wayland X"
-
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X=]
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kactivities-${PVCUT}*:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kdeclarative-${PVCUT}*:5
-	=kde-frameworks/kglobalaccel-${PVCUT}*:5
-	=kde-frameworks/kguiaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kirigami-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-	=kde-frameworks/kpackage-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	!gles2-only? ( media-libs/libglvnd[X?] )
-	wayland? (
-		=kde-frameworks/kwayland-${PVCUT}*:5
-		media-libs/libglvnd
-	)
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-		x11-libs/libxcb
-	)
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-breeze-light-dark-visual-fix.patch"
-	"${FILESDIR}/${P}-fix-blurry-buttons.patch" # KDE-bug 447977
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package !gles2-only OpenGL)
-		$(cmake_use_find_package man KF5DocTools)
-		$(cmake_use_find_package wayland EGL)
-		$(cmake_use_find_package wayland KF5Wayland)
-		$(cmake_use_find_package X X11)
-		$(cmake_use_find_package X XCB)
-	)
-
-	ecm_src_configure
-}