commit: a235d977cf0b2c0c8e0e4c8e60d5024f658444c8 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Nov 15 13:36:15 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Nov 15 13:46:30 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a235d977
kde-frameworks/kirigami: Fix loading desktop theme KDE-bug: https://bugs.kde.org/show_bug.cgi?id=491294 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...irigami-5.116.0-fix-loading-desktop-theme.patch | 76 ++++++++++++++++++++++ kde-frameworks/kirigami/kirigami-5.116.0-r2.ebuild | 54 +++++++++++++++ 2 files changed, 130 insertions(+) diff --git a/kde-frameworks/kirigami/files/kirigami-5.116.0-fix-loading-desktop-theme.patch b/kde-frameworks/kirigami/files/kirigami-5.116.0-fix-loading-desktop-theme.patch new file mode 100644 index 000000000000..fb22668fc371 --- /dev/null +++ b/kde-frameworks/kirigami/files/kirigami-5.116.0-fix-loading-desktop-theme.patch @@ -0,0 +1,76 @@ +From e8a1c49f7b83d0e06629a32c113eb9bd820e9969 Mon Sep 17 00:00:00 2001 +From: Ilya Fedin <[email protected]> +Date: Sat, 19 Oct 2024 22:15:56 +0400 +Subject: [PATCH 1/2] Fix presumable typos confusing background and foreground + colors + +CCBUG: 491294 +--- + src/styles/org.kde.desktop/Theme.qml | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/src/styles/org.kde.desktop/Theme.qml b/src/styles/org.kde.desktop/Theme.qml +index a6e83242..02c54f85 100644 +--- a/src/styles/org.kde.desktop/Theme.qml ++++ b/src/styles/org.kde.desktop/Theme.qml +@@ -19,7 +19,7 @@ Kirigami.BasicThemeDefinition { + highlightedTextColor: palette.highlightedText + backgroundColor: palette.window + alternateBackgroundColor: Qt.darker(palette.window, 1.05) +- activeTextColor: palette.highlight ++ activeTextColor: palette.highlightedText + activeBackgroundColor: palette.highlight + linkColor: "#2980B9" + linkBackgroundColor: "#2980B9" +@@ -52,15 +52,15 @@ Kirigami.BasicThemeDefinition { + selectionHoverColor: palette.highlight + selectionFocusColor: palette.highlight + +- tooltipTextColor: palette.base +- tooltipBackgroundColor: palette.text +- tooltipAlternateBackgroundColor: Qt.darker(palette.text, 1.05) ++ tooltipTextColor: palette.text ++ tooltipBackgroundColor: palette.base ++ tooltipAlternateBackgroundColor: palette.alternateBase + tooltipHoverColor: palette.highlight + tooltipFocusColor: palette.highlight + +- complementaryTextColor: palette.base +- complementaryBackgroundColor: palette.text +- complementaryAlternateBackgroundColor: Qt.darker(palette.text, 1.05) ++ complementaryTextColor: palette.text ++ complementaryBackgroundColor: palette.base ++ complementaryAlternateBackgroundColor: palette.alternateBase + complementaryHoverColor: palette.highlight + complementaryFocusColor: palette.highlight + +-- +2.47.0 + + +From 7767fdbf15828d00d68b06c35f8d4805de678add Mon Sep 17 00:00:00 2001 +From: Ilya Fedin <[email protected]> +Date: Sat, 19 Oct 2024 22:17:23 +0400 +Subject: [PATCH 2/2] Fix loading desktop theme + +BUG: 491294 +--- + src/styles/org.kde.desktop/Theme.qml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/styles/org.kde.desktop/Theme.qml b/src/styles/org.kde.desktop/Theme.qml +index 02c54f85..4a34b1e5 100644 +--- a/src/styles/org.kde.desktop/Theme.qml ++++ b/src/styles/org.kde.desktop/Theme.qml +@@ -70,7 +70,7 @@ Kirigami.BasicThemeDefinition { + headerHoverColor: palette.highlight + headerFocusColor: palette.highlight + +- property font defaultFont: fontMetrics.font ++ defaultFont: fontMetrics.font + + property list<QtObject> children: [ + TextMetrics { +-- +2.47.0 + diff --git a/kde-frameworks/kirigami/kirigami-5.116.0-r2.ebuild b/kde-frameworks/kirigami/kirigami-5.116.0-r2.ebuild new file mode 100644 index 000000000000..5f755953ba58 --- /dev/null +++ b/kde-frameworks/kirigami/kirigami-5.116.0-r2.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_EXAMPLES="false" +ECM_QTHELP="false" +ECM_TEST="true" +KDE_ORG_TAR_PN="${PN}2" +QTMIN=5.15.9 +inherit ecm frameworks.kde.org toolchain-funcs + +DESCRIPTION="Lightweight user interface framework for mobile and convergent applications" +HOMEPAGE="https://community.kde.org/Kirigami"; + +LICENSE="LGPL-2+" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="openmp" + +# requires package to already be installed +RESTRICT="test" + +DEPEND=" + >=dev-qt/qtconcurrent-${QTMIN}:5 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 +" +RDEPEND="${DEPEND} + >=dev-qt/qtgraphicaleffects-${QTMIN}:5 +" +BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5" + +PATCHES=( "${FILESDIR}/${P}-fix-loading-desktop-theme.patch" ) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_configure() { + local mycmakeargs=( + -DBUILD_EXAMPLES=OFF + $(cmake_use_find_package openmp OpenMP) + ) + + ecm_src_configure +}
