Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/, kde-frameworks/plasma/files/
Date: Wed, 30 Mar 2022 14:41:08
Message-Id: 1648651131.bf1180f1150f7f3fe2da126e07f292afea7c927e.asturm@gentoo
1 commit: bf1180f1150f7f3fe2da126e07f292afea7c927e
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 30 14:32:09 2022 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 30 14:38:51 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf1180f1
7
8 kde-frameworks/plasma: Visual regression fix
9
10 See also:
11 https://mail.kde.org/pipermail/distributions/2022-March/001212.html
12
13 Package-Manager: Portage-3.0.30, Repoman-3.0.3
14 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
15
16 ...lasma-5.92.0-breeze-light-dark-visual-fix.patch | 40 ++++++++++++
17 kde-frameworks/plasma/plasma-5.92.0-r1.ebuild | 75 ++++++++++++++++++++++
18 2 files changed, 115 insertions(+)
19
20 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
21 new file mode 100644
22 index 000000000000..04992bcb129d
23 --- /dev/null
24 +++ b/kde-frameworks/plasma/files/plasma-5.92.0-breeze-light-dark-visual-fix.patch
25 @@ -0,0 +1,40 @@
26 +From 7352045b388f4b0ef553706bd219457e5018ce4e Mon Sep 17 00:00:00 2001
27 +From: Marco Martin <notmart@×××××.com>
28 +Date: Mon, 28 Mar 2022 21:20:16 +0000
29 +Subject: [PATCH] Don't install the heading SVG in breeze-light and breeze-dark
30 + Plasma themes
31 +
32 +Installing that file there was an acky workaround that got broken by 2cccf230.
33 +---
34 + src/desktoptheme/breeze-dark/CMakeLists.txt | 5 +----
35 + src/desktoptheme/breeze-light/CMakeLists.txt | 4 ----
36 + 2 files changed, 1 insertion(+), 8 deletions(-)
37 +
38 +diff --git a/src/desktoptheme/breeze-dark/CMakeLists.txt b/src/desktoptheme/breeze-dark/CMakeLists.txt
39 +index 8f2078e4d..7f8f99062 100644
40 +--- a/src/desktoptheme/breeze-dark/CMakeLists.txt
41 ++++ b/src/desktoptheme/breeze-dark/CMakeLists.txt
42 +@@ -8,7 +8,4 @@ install(
43 + FILES colors "${CMAKE_CURRENT_BINARY_DIR}/metadata.desktop"
44 + DESTINATION ${PLASMA_DATA_INSTALL_DIR}/desktoptheme/breeze-dark
45 + )
46 +-install(
47 +- FILES ${PROJECT_BINARY_DIR}/src/desktoptheme/breeze/default.gzipped/widgets/plasmoidheading.svgz
48 +- DESTINATION ${PLASMA_DATA_INSTALL_DIR}/desktoptheme/breeze-dark/widgets
49 +-)
50 ++
51 +diff --git a/src/desktoptheme/breeze-light/CMakeLists.txt b/src/desktoptheme/breeze-light/CMakeLists.txt
52 +index 678033cec..6688a603b 100644
53 +--- a/src/desktoptheme/breeze-light/CMakeLists.txt
54 ++++ b/src/desktoptheme/breeze-light/CMakeLists.txt
55 +@@ -8,7 +8,3 @@ install(
56 + FILES colors "${CMAKE_CURRENT_BINARY_DIR}/metadata.desktop"
57 + DESTINATION ${PLASMA_DATA_INSTALL_DIR}/desktoptheme/breeze-light
58 + )
59 +-install(
60 +- FILES ${PROJECT_BINARY_DIR}/src/desktoptheme/breeze/default.gzipped/widgets/plasmoidheading.svgz
61 +- DESTINATION ${PLASMA_DATA_INSTALL_DIR}/desktoptheme/breeze-light/widgets
62 +-)
63 +--
64 +GitLab
65 +
66
67 diff --git a/kde-frameworks/plasma/plasma-5.92.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.92.0-r1.ebuild
68 new file mode 100644
69 index 000000000000..3e5fa1db605e
70 --- /dev/null
71 +++ b/kde-frameworks/plasma/plasma-5.92.0-r1.ebuild
72 @@ -0,0 +1,75 @@
73 +# Copyright 1999-2022 Gentoo Authors
74 +# Distributed under the terms of the GNU General Public License v2
75 +
76 +EAPI=8
77 +
78 +KDE_ORG_NAME="${PN}-framework"
79 +PVCUT=$(ver_cut 1-2)
80 +QTMIN=5.15.2
81 +VIRTUALX_REQUIRED="test"
82 +inherit ecm kde.org
83 +
84 +DESCRIPTION="Plasma framework"
85 +
86 +LICENSE="LGPL-2+"
87 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
88 +IUSE="gles2-only man wayland X"
89 +
90 +RESTRICT="test"
91 +
92 +RDEPEND="
93 + >=dev-qt/qtdbus-${QTMIN}:5
94 + >=dev-qt/qtdeclarative-${QTMIN}:5
95 + >=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X=]
96 + >=dev-qt/qtquickcontrols-${QTMIN}:5
97 + >=dev-qt/qtsql-${QTMIN}:5
98 + >=dev-qt/qtsvg-${QTMIN}:5
99 + >=dev-qt/qtwidgets-${QTMIN}:5
100 + =kde-frameworks/kactivities-${PVCUT}*:5
101 + =kde-frameworks/karchive-${PVCUT}*:5
102 + =kde-frameworks/kconfig-${PVCUT}*:5
103 + =kde-frameworks/kconfigwidgets-${PVCUT}*:5
104 + =kde-frameworks/kcoreaddons-${PVCUT}*:5
105 + =kde-frameworks/kdeclarative-${PVCUT}*:5
106 + =kde-frameworks/kglobalaccel-${PVCUT}*:5
107 + =kde-frameworks/kguiaddons-${PVCUT}*:5
108 + =kde-frameworks/ki18n-${PVCUT}*:5
109 + =kde-frameworks/kiconthemes-${PVCUT}*:5
110 + =kde-frameworks/kio-${PVCUT}*:5
111 + =kde-frameworks/kirigami-${PVCUT}*:5
112 + =kde-frameworks/knotifications-${PVCUT}*:5
113 + =kde-frameworks/kpackage-${PVCUT}*:5
114 + =kde-frameworks/kservice-${PVCUT}*:5
115 + =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
116 + =kde-frameworks/kwindowsystem-${PVCUT}*:5
117 + =kde-frameworks/kxmlgui-${PVCUT}*:5
118 + !gles2-only? ( media-libs/libglvnd[X?] )
119 + wayland? (
120 + =kde-frameworks/kwayland-${PVCUT}*:5
121 + media-libs/libglvnd
122 + )
123 + X? (
124 + >=dev-qt/qtx11extras-${QTMIN}:5
125 + x11-libs/libX11
126 + x11-libs/libxcb
127 + )
128 +"
129 +DEPEND="${RDEPEND}
130 + X? ( x11-base/xorg-proto )
131 +"
132 +BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
133 +
134 +PATCHES=( "${FILESDIR}/${P}-breeze-light-dark-visual-fix.patch" )
135 +
136 +src_configure() {
137 + local mycmakeargs=(
138 + $(cmake_use_find_package !gles2-only OpenGL)
139 + $(cmake_use_find_package man KF5DocTools)
140 + $(cmake_use_find_package wayland EGL)
141 + $(cmake_use_find_package wayland KF5Wayland)
142 + $(cmake_use_find_package X X11)
143 + $(cmake_use_find_package X XCB)
144 + )
145 +
146 + ecm_src_configure
147 +}