From d3ac89884f2ed7f3af42e35726c6964967673f6d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 30 Mar 2022 08:19:30 -0500 Subject: [PATCH] pull in upstream recommended fix --- ...e-heading-SVG-in-breeze-light-and-br.patch | 40 +++++++++++++++++++ kf5-plasma.spec | 6 ++- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 0029-Don-t-install-the-heading-SVG-in-breeze-light-and-br.patch diff --git a/0029-Don-t-install-the-heading-SVG-in-breeze-light-and-br.patch b/0029-Don-t-install-the-heading-SVG-in-breeze-light-and-br.patch new file mode 100644 index 0000000..d2a5437 --- /dev/null +++ b/0029-Don-t-install-the-heading-SVG-in-breeze-light-and-br.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 29/30] 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 +-) +-- +2.35.1 + diff --git a/kf5-plasma.spec b/kf5-plasma.spec index 6708d5a..91b5d80 100644 --- a/kf5-plasma.spec +++ b/kf5-plasma.spec @@ -2,7 +2,7 @@ Name: kf5-%{framework} Version: 5.92.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 3 framework is foundation to build a primary user interface License: GPLv2+ and LGPLv2+ and BSD @@ -22,6 +22,7 @@ Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-fra Source10: fedora-plasma-cache.sh.in ## upstream patches +Patch29: 0029-Don-t-install-the-heading-SVG-in-breeze-light-and-br.patch # filter qml provides %global __provides_exclude_from ^%{_kf5_qmldir}/.*\\.so$ @@ -172,6 +173,9 @@ sed -e "s|@@VERSION@@|%{version}|g" fedora-plasma-cache.sh.in > \ %changelog +* Wed Mar 30 2022 Rex Dieter - 5.92.0-2 +- pull in upstream recommended fix + * Thu Mar 10 2022 Rex Dieter - 5.92.0-1 - 5.92.0