commit: 3806891057609468bd530c645fe4a75466e78f1c Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Dec 17 21:58:08 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Dec 17 23:48:41 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38068910
kde-plasma/kdeplasma-addons: Fix temperature size with short panels Regression in 5.17.4. KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=415187 Package-Manager: Portage-2.3.82, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...ons-5.17.4-weather-applet-size-regression.patch | 37 +++++++++++++ .../kdeplasma-addons-5.17.4-r1.ebuild | 63 ++++++++++++++++++++++ 2 files changed, 100 insertions(+) diff --git a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.17.4-weather-applet-size-regression.patch b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.17.4-weather-applet-size-regression.patch new file mode 100644 index 00000000000..58a1316171e --- /dev/null +++ b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.17.4-weather-applet-size-regression.patch @@ -0,0 +1,37 @@ +From 865ae05e8fe280a177fcd6dcf5f847327de36a00 Mon Sep 17 00:00:00 2001 +From: Nate Graham <[email protected]> +Date: Sun, 15 Dec 2019 14:04:29 +0100 +Subject: [applets/weather] Fix regression in temperature size with short + panels + +BUG: 415187 +FIXED-IN: 5.17.5 +--- + applets/weather/package/contents/ui/IconAndTextItem.qml | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/applets/weather/package/contents/ui/IconAndTextItem.qml b/applets/weather/package/contents/ui/IconAndTextItem.qml +index 7042bf8..dc270e4 100644 +--- a/applets/weather/package/contents/ui/IconAndTextItem.qml ++++ b/applets/weather/package/contents/ui/IconAndTextItem.qml +@@ -86,9 +86,15 @@ GridLayout { + leftMargin: units.smallSpacing + rightMargin: units.smallSpacing + } +- // This magic value of 0.7 is taken from the digital clock, so that the +- // text sizes are identical +- height: Math.min (parent.height * 0.7, 3 * theme.defaultFont.pixelSize) ++ // These magic values are taken from the digital clock, so that the ++ // text sizes here are identical with various clock text sizes ++ height: { ++ var textHeightScaleFactor = 0.7; ++ if (parent.height <= 26) { ++ textHeightScaleFactor = 0.9; ++ } ++ return Math.min (parent.height * textHeightScaleFactor, 3 * theme.defaultFont.pixelSize); ++ } + visible: false + + // pattern to reserve some constant space TODO: improve and take formatting/i18n into account +-- +cgit v1.1 diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.17.4-r1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.17.4-r1.ebuild new file mode 100644 index 00000000000..4aefd7d8ea4 --- /dev/null +++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.17.4-r1.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +KFMIN=5.64.0 +PVCUT=$(ver_cut 1-3) +QTMIN=5.12.3 +inherit ecm kde.org + +DESCRIPTION="Extra Plasma applets and engines" +LICENSE="GPL-2 LGPL-2" +SLOT="5" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="share webengine" + +DEPEND=" + >=kde-frameworks/karchive-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcmutils-${KFMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kdeclarative-${KFMIN}:5 + >=kde-frameworks/kholidays-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/knewstuff-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/kpackage-${KFMIN}:5 + >=kde-frameworks/kross-${KFMIN}:5 + >=kde-frameworks/krunner-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/kunitconversion-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-frameworks/plasma-${KFMIN}:5 + >=kde-frameworks/sonnet-${KFMIN}:5 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + share? ( >=kde-frameworks/purpose-${KFMIN}:5 ) + webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 ) +" +RDEPEND="${DEPEND} + >=kde-plasma/plasma-workspace-${PVCUT}:5 + >=dev-qt/qtquickcontrols-${QTMIN}:5 + >=dev-qt/qtquickcontrols2-${QTMIN}:5 +" + +PATCHES=( "${FILESDIR}"/${P}-weather-applet-size-regression.patch ) + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package share KF5Purpose) + $(cmake_use_find_package webengine Qt5WebEngine) + ) + + ecm_src_configure +}
