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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BA8CB158F57 for ; Mon, 16 Aug 2021 20:48:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D982EE0CD0; Sun, 15 Aug 2021 18:58:00 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6995EE0CD0 for ; Sun, 15 Aug 2021 18:58:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9D2C53455F4 for ; Sun, 15 Aug 2021 18:57:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 21F507AF for ; Sun, 15 Aug 2021 18:57:58 +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: <1629053796.19f8c459f7a27534e261a378ca4828b0e6e1ab03.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.85.0-fix-plasma-scaling-w-int-scale-factors.patch kde-frameworks/plasma/plasma-5.85.0-r1.ebuild kde-frameworks/plasma/plasma-5.85.0.ebuild X-VCS-Directories: kde-frameworks/plasma/files/ kde-frameworks/plasma/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 19f8c459f7a27534e261a378ca4828b0e6e1ab03 X-VCS-Branch: master Date: Sun, 15 Aug 2021 18:57:58 +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: 692fb0f8-3865-4f4b-a63b-6623e7ae9b0b X-Archives-Hash: 22c388e1e5cfa5081749482b68934b0b commit: 19f8c459f7a27534e261a378ca4828b0e6e1ab03 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Aug 15 18:18:58 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Aug 15 18:56:36 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19f8c459 kde-frameworks/plasma: Fix Plasma (non-Qt) icon scaling ...with integer scale factors. See also: https://invent.kde.org/frameworks/plasma-framework/-/merge_requests/320 Upstream commit 837bb6975f6a0661d211107823b7587808fc3d4e Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> ....0-fix-plasma-scaling-w-int-scale-factors.patch | 44 ++++++++++++++++++++++ ...lasma-5.85.0.ebuild => plasma-5.85.0-r1.ebuild} | 2 + 2 files changed, 46 insertions(+) diff --git a/kde-frameworks/plasma/files/plasma-5.85.0-fix-plasma-scaling-w-int-scale-factors.patch b/kde-frameworks/plasma/files/plasma-5.85.0-fix-plasma-scaling-w-int-scale-factors.patch new file mode 100644 index 00000000000..9c0e9046496 --- /dev/null +++ b/kde-frameworks/plasma/files/plasma-5.85.0-fix-plasma-scaling-w-int-scale-factors.patch @@ -0,0 +1,44 @@ +From 837bb6975f6a0661d211107823b7587808fc3d4e Mon Sep 17 00:00:00 2001 +From: Nate Graham +Date: Sun, 15 Aug 2021 09:33:10 -0600 +Subject: [PATCH] Fix Plasma (non-Qt) icon scaling with integer scale factors + +An embarrassing error in 4edb830f53aac4833ece024df59441029b01fde6 +caused the function which returns an appropriate scale factor for icons +to both take and return integer values rather than floating point +values, preventing it from working properly with any scale factor other +than an integer scale factor (e.g. 200%). This commit fixes that issue. +--- + src/declarativeimports/core/units.cpp | 2 +- + src/declarativeimports/core/units.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/declarativeimports/core/units.cpp b/src/declarativeimports/core/units.cpp +index 6788ed952..fbcc6d888 100644 +--- a/src/declarativeimports/core/units.cpp ++++ b/src/declarativeimports/core/units.cpp +@@ -174,7 +174,7 @@ int Units::roundToIconSize(int size) + } + } + +-int Units::bestIconScaleForDevicePixelRatio(const int ratio) ++qreal Units::bestIconScaleForDevicePixelRatio(const qreal ratio) + { + if (ratio < 1.5) { + return 1; +diff --git a/src/declarativeimports/core/units.h b/src/declarativeimports/core/units.h +index c19cf0dd8..855738e7d 100644 +--- a/src/declarativeimports/core/units.h ++++ b/src/declarativeimports/core/units.h +@@ -271,7 +271,7 @@ private: + * Note that this function is only relevant when using Plasma scaling and + * when using Qt scaling, it always returns 1. + */ +- static int bestIconScaleForDevicePixelRatio(const int ratio); ++ static qreal bestIconScaleForDevicePixelRatio(const qreal ratio); + + /** + * @return The dpi-adjusted size for a given icon size +-- +GitLab + diff --git a/kde-frameworks/plasma/plasma-5.85.0.ebuild b/kde-frameworks/plasma/plasma-5.85.0-r1.ebuild similarity index 96% rename from kde-frameworks/plasma/plasma-5.85.0.ebuild rename to kde-frameworks/plasma/plasma-5.85.0-r1.ebuild index 48d5e24d902..92d12a32c09 100644 --- a/kde-frameworks/plasma/plasma-5.85.0.ebuild +++ b/kde-frameworks/plasma/plasma-5.85.0-r1.ebuild @@ -61,6 +61,8 @@ DEPEND="${RDEPEND} X? ( x11-base/xorg-proto ) " +PATCHES=( "${FILESDIR}"/${P}-fix-plasma-scaling-w-int-scale-factors.patch ) + src_configure() { local mycmakeargs=( $(cmake_use_find_package !gles2-only OpenGL)