Compare commits

...

1 Commits
c10 ... c10s

Author SHA1 Message Date
Jan Grulich
1ecd0f603e 6.10.1
Resolves: RHEL-109197
2025-11-25 10:24:36 +01:00
4 changed files with 10 additions and 46 deletions

1
.gitignore vendored
View File

@ -28,3 +28,4 @@
/qtsvg-everywhere-src-6.8.1.tar.xz
/qtsvg-everywhere-src-6.9.0.tar.xz
/qtsvg-everywhere-src-6.9.1.tar.xz
/qtsvg-everywhere-src-6.10.1.tar.xz

View File

@ -11,8 +11,8 @@
Summary: Qt6 - Support for rendering and displaying SVG
Name: qt6-%{qt_module}
Version: 6.9.1
Release: 2%{?dist}
Version: 6.10.1
Release: 1%{?dist}
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
Url: http://www.qt.io
@ -26,7 +26,7 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod
%endif
# Upstream patches
Patch50: qtsvg-dont-add-outlines-to-text-when-there-is-none.patch
# filter plugin provides
%global __provides_exclude_from ^%{_qt6_plugindir}/.*\\.so$
@ -127,18 +127,16 @@ popd
%dir %{_qt6_libdir}/cmake/Qt6Svg/
%dir %{_qt6_libdir}/cmake/Qt6SvgPrivate/
%dir %{_qt6_libdir}/cmake/Qt6SvgWidgets/
%dir %{_qt6_libdir}/cmake/Qt6SvgWidgetsPrivate/
%{_qt6_libdir}/cmake/Qt6Svg/*.cmake
%{_qt6_libdir}/cmake/Qt6SvgPrivate/*cmake
%{_qt6_libdir}/cmake/Qt6SvgWidgets/*.cmake
%{_qt6_libdir}/cmake/Qt6SvgWidgetsPrivate/*.cmake
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
%{_qt6_libdir}/qt6/modules/*.json
%{_qt6_libdir}/pkgconfig/*.pc
%if 0%{?examples}
# FIXME there don't seem to be any examples
%files examples
%{_qt6_examplesdir}/
%endif
%if 0%{?build_tests}
@ -147,6 +145,10 @@ popd
%endif
%changelog
* Mon Nov 24 2025 Jan Grulich <jgrulich@redhat.com> - 6.10.1-1
- 6.10.1
Resolves: RHEL-109197
* Mon Jun 23 2025 Jan Grulich <jgrulich@redhat.com> - 6.9.1-2
- Upstream backport: Don't add outlines to text when there is none
Resolves: RHEL-78552

View File

@ -1,39 +0,0 @@
From 07b3434f91c95d196f687c51e1a58a95a0b1ef2e Mon Sep 17 00:00:00 2001
From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Date: Wed, 28 May 2025 09:47:49 +0200
Subject: [PATCH] Don't add outlines to text when there is none
Qt SVG would indiscriminately add outlines to text. Since the pen
has Qt::NoBrush, the outline would not be visible with a normal
QPainter, but it did always trigger the QPainterPath code path which
is taken when the text uses features we don't support through the
native rasterizer backend.
In turn, this would cause all text to be unsearchable when printing
the SVG to a PDF. In addition, all text would be too thick in this
case because the PDF generator adds the outline even if the brush
is Qt::NoBrush.
Pick-to: 6.8
Fixes: QTBUG-123817
Change-Id: Icff637e65ea9f0c867a374fcbba3f6ad4a6756fc
Reviewed-by: Hatem ElKharashy <hatem.elkharashy@qt.io>
(cherry picked from commit 4d9bd9572f340fb9bc2f96f55ea6836386ac0b0d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 09918e3da44f80bff8bb13cd65984bd7e00c95e6)
---
diff --git a/src/svg/qsvggraphics.cpp b/src/svg/qsvggraphics.cpp
index 67879da..7d6fca9 100644
--- a/src/svg/qsvggraphics.cpp
+++ b/src/svg/qsvggraphics.cpp
@@ -446,7 +446,8 @@
range.start = paragraphs.back().size();
range.length = newText.size();
range.format.setFont(font);
- range.format.setTextOutline(p->pen());
+ if (p->pen().style() != Qt::NoPen && p->pen().brush() != Qt::NoBrush)
+ range.format.setTextOutline(p->pen());
range.format.setForeground(p->brush());
if (appendSpace) {

View File

@ -1 +1 @@
SHA512 (qtsvg-everywhere-src-6.9.1.tar.xz) = d36fe4921fb9d7968378e0e1f7131574642baba7eec9a492283c039fec64e307f0a4148bd7fed83ce7b3d92a1af3d9cb31917ced0f15a186262de8bb7fdc615e
SHA512 (qtsvg-everywhere-src-6.10.1.tar.xz) = 26d061a24e7196edf07c508ae12bf2d2f1f99cdb9a99ab993aefd0b9d135a6da00eef805f00cbdf022f7b3255f378bc491be1534f3837858078285d543bbe2c7