SHA256
1
0
forked from pool/kf6-ksvg

Accepting request 1187138 from KDE:Frameworks

KDE Frameworks 6.4.0 (forwarded request 1186902 from krop)

OBS-URL: https://build.opensuse.org/request/show/1187138
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kf6-ksvg?expand=0&rev=7
This commit is contained in:
Ana Guerrero 2024-07-14 06:50:09 +00:00 committed by Git OBS Bridge
commit 51a7ce1607
7 changed files with 28 additions and 55 deletions

View File

@ -1,40 +0,0 @@
From 74f9f9cbd226407f8cde08c5cd5a711444e2775d Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Wed, 19 Jun 2024 09:11:56 +0000
Subject: [PATCH] Restore proper devicepixelratio when extracting from cache
like in base Svg, also in FrameSvg restore the proper devicepixelratio
when getting the image from the cache, as KImageCache doesn't save or
restore the information about it.
This fixes blur region mask sometimes wrong behind floating panels
BUG:488295
---
src/ksvg/framesvg.cpp | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/ksvg/framesvg.cpp b/src/ksvg/framesvg.cpp
index c1d22b1a..3b094abd 100644
--- a/src/ksvg/framesvg.cpp
+++ b/src/ksvg/framesvg.cpp
@@ -524,10 +524,16 @@ void FrameSvgPrivate::generateBackground(const QSharedPointer<FrameData> &frame)
QPixmap overlay;
if (q->isUsingRenderingCache()) {
frameCached = q->imageSet()->d->findInCache(QString::number(id), frame->cachedBackground, frame->lastModified) && !frame->cachedBackground.isNull();
+ if (frameCached) {
+ frame->cachedBackground.setDevicePixelRatio(q->devicePixelRatio());
+ }
if (overlayAvailable) {
const size_t overlayId = qHash(cacheId(frame.data(), frame->prefix % QLatin1String("overlay")));
overlayCached = q->imageSet()->d->findInCache(QString::number(overlayId), overlay, frame->lastModified) && !overlay.isNull();
+ if (overlayCached) {
+ overlay.setDevicePixelRatio(q->devicePixelRatio());
+ }
}
}
--
2.45.2

View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Tue Jul 9 09:41:57 UTC 2024 - Christophe Marin <christophe@krop.fr>
- Update to 6.4.0
* New feature release
* For more details please see:
* https://kde.org/announcements/frameworks/6/6.4.0
- Changes since 6.3.0:
* Fix masks of completely black mask frames
* Restore proper devicepixelratio when extracting from cache (kde#488295)
* Fix description in metainfo
* Remove explicit maintainer from metainfo
- Drop patch, merged upstream:
* 0001-Restore-proper-devicepixelratio-when-extracting-from.patch
-------------------------------------------------------------------
Wed Jun 19 20:38:02 UTC 2024 - Christophe Marin <christophe@krop.fr>

View File

@ -19,13 +19,13 @@
%define qt6_version 6.6.0
%define rname ksvg
# Full KF6 version (e.g. 6.3.0)
# Full KF6 version (e.g. 6.4.0)
%{!?_kf6_version: %global _kf6_version %{version}}
# Last major and minor KF6 version (e.g. 6.0)
%{!?_kf6_bugfix_version: %define _kf6_bugfix_version %(echo %{_kf6_version} | awk -F. '{print $1"."$2}')}
%bcond_without released
Name: kf6-ksvg
Version: 6.3.0
Version: 6.4.0
Release: 0
Summary: Components for handling SVGs
License: GPL-2.0-or-later
@ -35,10 +35,8 @@ Source: %{rname}-%{version}.tar.xz
Source1: %{rname}-%{version}.tar.xz.sig
Source2: frameworks.keyring
%endif
# PATCH-FIX-UPSTREAM
Patch0: 0001-Restore-proper-devicepixelratio-when-extracting-from.patch
# PATCH-FIX-OPENSUSE
Patch1: 0001-Revert-Support-for-fractional-scaling.patch
Patch0: 0001-Revert-Support-for-fractional-scaling.patch
BuildRequires: doxygen
BuildRequires: kf6-extra-cmake-modules >= %{_kf6_bugfix_version}
BuildRequires: cmake(KF6Archive) >= %{_kf6_bugfix_version}

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0054ed0c094c605a712bc9f8c8cc61c7e0d3eefe1ee50a93912bbd60a6cb07d7
size 83208

View File

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iHUEABYKAB0WIQSQqWisqEU3zCe5nq8sjfWHptSqwQUCZlnQdQAKCRAsjfWHptSq
waaUAQCgGrZLLc6/HHvEH/A7VO0kUdX97KMGucDdHUgfgc1cUAEA0K7/2gfNzx/s
cekokxaJSHnOnfkfEPYAZFA+rIie8gw=
=9E6E
-----END PGP SIGNATURE-----

3
ksvg-6.4.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3391c74fc31526e7ff2659622d00e93b5cd8667397611d5676062e4b32d86530
size 83368

7
ksvg-6.4.0.tar.xz.sig Normal file
View File

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
iHUEABYKAB0WIQSQqWisqEU3zCe5nq8sjfWHptSqwQUCZohS3QAKCRAsjfWHptSq
wbbNAP9z5EG3cfdHQVUuWnl+UMHaFrZZK9Fm39BdTuzeHDwgZgD/eXbcuJ7If2LQ
RD0AvG1HWoR+CsoFYQ3KMj2AWEk4JQ0=
=BMp2
-----END PGP SIGNATURE-----