From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F219415808B for ; Wed, 30 Mar 2022 14:41:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5EEA1E08BB; Wed, 30 Mar 2022 14:41:07 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 04D00E08AD for ; Wed, 30 Mar 2022 14:41:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5AF373412CF for ; Wed, 30 Mar 2022 14:41:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 797B52E0 for ; Wed, 30 Mar 2022 14:41:01 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1648651131.bf1180f1150f7f3fe2da126e07f292afea7c927e.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/, kde-frameworks/plasma/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-frameworks/plasma/files/plasma-5.92.0-breeze-light-dark-visual-fix.patch kde-frameworks/plasma/plasma-5.92.0-r1.ebuild X-VCS-Directories: kde-frameworks/plasma/ kde-frameworks/plasma/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: bf1180f1150f7f3fe2da126e07f292afea7c927e X-VCS-Branch: master Date: Wed, 30 Mar 2022 14:41:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f0c10331-d375-4d91-85c6-c26923c801b3 X-Archives-Hash: 25bdfe8a7a9ff0d120782f8d22f5770d commit: bf1180f1150f7f3fe2da126e07f292afea7c927e Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Mar 30 14:32:09 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Mar 30 14:38:51 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf1180f1 kde-frameworks/plasma: Visual regression fix See also: https://mail.kde.org/pipermail/distributions/2022-March/001212.html Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> ...lasma-5.92.0-breeze-light-dark-visual-fix.patch | 40 ++++++++++++ kde-frameworks/plasma/plasma-5.92.0-r1.ebuild | 75 ++++++++++++++++++++++ 2 files changed, 115 insertions(+) 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 new file mode 100644 index 000000000000..04992bcb129d --- /dev/null +++ b/kde-frameworks/plasma/files/plasma-5.92.0-breeze-light-dark-visual-fix.patch @@ -0,0 +1,40 @@ +From 7352045b388f4b0ef553706bd219457e5018ce4e Mon Sep 17 00:00:00 2001 +From: Marco Martin +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/plasma-5.92.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.92.0-r1.ebuild new file mode 100644 index 000000000000..3e5fa1db605e --- /dev/null +++ b/kde-frameworks/plasma/plasma-5.92.0-r1.ebuild @@ -0,0 +1,75 @@ +# 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" ) + +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 +}