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 76DFE158020 for ; Wed, 16 Nov 2022 19:17:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 945EDE069C; Wed, 16 Nov 2022 19:17:18 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id 6820FE069C for ; Wed, 16 Nov 2022 19:17:18 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9A44B340DBA for ; Wed, 16 Nov 2022 19:17:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F0672523 for ; Wed, 16 Nov 2022 19:17:15 +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: <1668626227.21924c5af81a11c29b75e6e9788abe669eba0781.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/files/, kde-frameworks/plasma/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-frameworks/plasma/files/plasma-5.100.0-fix-svg-fractional-scaling.patch kde-frameworks/plasma/plasma-5.100.0-r1.ebuild X-VCS-Directories: kde-frameworks/plasma/files/ kde-frameworks/plasma/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 21924c5af81a11c29b75e6e9788abe669eba0781 X-VCS-Branch: master Date: Wed, 16 Nov 2022 19:17:15 +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: 31384b25-013b-415b-8323-38ba27180940 X-Archives-Hash: eff1147953d0baed61fb83c13d4b7fe5 commit: 21924c5af81a11c29b75e6e9788abe669eba0781 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Nov 16 19:15:30 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Nov 16 19:17:07 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21924c5a kde-frameworks/plasma: Fix svgitem too big w/ fractional scaling on X11 See also: https://mail.kde.org/pipermail/release-team/2022-November/012874.html KDE-bug: https://bugs.kde.org/show_bug.cgi?id=461682 Upstream commit 159f9dbd6f9378c9d1943f83f13fce7c47e3d8b2 Signed-off-by: Andreas Sturmlechner gentoo.org> ...plasma-5.100.0-fix-svg-fractional-scaling.patch | 27 ++++++++ kde-frameworks/plasma/plasma-5.100.0-r1.ebuild | 74 ++++++++++++++++++++++ 2 files changed, 101 insertions(+) diff --git a/kde-frameworks/plasma/files/plasma-5.100.0-fix-svg-fractional-scaling.patch b/kde-frameworks/plasma/files/plasma-5.100.0-fix-svg-fractional-scaling.patch new file mode 100644 index 000000000000..490386b19e9d --- /dev/null +++ b/kde-frameworks/plasma/files/plasma-5.100.0-fix-svg-fractional-scaling.patch @@ -0,0 +1,27 @@ +From 159f9dbd6f9378c9d1943f83f13fce7c47e3d8b2 Mon Sep 17 00:00:00 2001 +From: Fushan Wen +Date: Tue, 15 Nov 2022 13:09:10 +0800 +Subject: [PATCH] svgitem: do not upscale svg when using fractional scaling + +BUG: 461682 +FIXED-IN: 5.101 +--- + src/declarativeimports/core/svgitem.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/declarativeimports/core/svgitem.cpp b/src/declarativeimports/core/svgitem.cpp +index b9ef54c09..7fbbe837e 100644 +--- a/src/declarativeimports/core/svgitem.cpp ++++ b/src/declarativeimports/core/svgitem.cpp +@@ -166,7 +166,7 @@ void SvgItem::updateDevicePixelRatio() + } else { + m_svg.data()->setDevicePixelRatio(qMax(1.0, std::ceil(qApp->devicePixelRatio()))); + } +- m_svg.data()->setScaleFactor(qMax(1.0, std::ceil(Units::instance().devicePixelRatio()))); ++ m_svg.data()->setScaleFactor(qMax(1.0, Units::instance().devicePixelRatio())); + } + } + +-- +GitLab + diff --git a/kde-frameworks/plasma/plasma-5.100.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.100.0-r1.ebuild new file mode 100644 index 000000000000..c63653933696 --- /dev/null +++ b/kde-frameworks/plasma/plasma-5.100.0-r1.ebuild @@ -0,0 +1,74 @@ +# 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.5 +VIRTUALX_REQUIRED="test" +inherit ecm frameworks.kde.org + +DESCRIPTION="Plasma framework" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~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[qml] + =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[X?] + =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}-fix-svg-fractional-scaling.patch" ) # KDE-bug 461682 + +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) + -DWITHOUT_X11=$(usex !X) + ) + + ecm_src_configure +}