commit: 0311fd2de453d668cd5b5b8bc08f0e7a1cb31268
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 13 07:36:03 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 13 08:42:08 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0311fd2d
dev-qt/qtsvg: drop 5.15.9
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtsvg/Manifest | 2 -
.../files/qtsvg-5.15.9-fix-ub-ossfuzz-22618.patch | 59 ----------------------
dev-qt/qtsvg/qtsvg-5.15.9-r1.ebuild | 27 ----------
3 files changed, 88 deletions(-)
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index de856c1f1af5..c41057f35c86 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -1,5 +1,3 @@
DIST qtsvg-5.15.10-gentoo-kde-1.tar.xz 5012 BLAKE2B
2eaab709cf165108b6f18ffd88ee7333ebbbca94500fcd426e155c4ef85670b565ed5db6a89c31e542118a4f048bb347375964e9056badd3c7ad5cabe3367d3e
SHA512
2d3168540cfbb51302a3824f936c1c33a01864793a5eb56287dd0b13bd2ed3b23df3049d295fa5ecd94d453deed67542f5bcccc6071570a802cf04c1caef6138
-DIST qtsvg-5.15.9-gentoo-kde-1.tar.xz 4368 BLAKE2B
d2758227d565d9043022e22d0eaa34cdd4b851435e331c30af8c4b2b232a068d5bd222389588dd01ab872611d34da0be90f4921377de63e7b5477c0d74bb5090
SHA512
2b99a16e277795431ea7953119efe70a9bcf084b2cd1e63003d4ba032067eeaaacac47239788a5860c1d5960af738df7bda4a317b484f3f64e1cd1e3aa31b749
DIST qtsvg-everywhere-opensource-src-5.15.10.tar.xz 1889960 BLAKE2B
14ee7bbf0914e47d8fc39790ce597fca0085e6018d33878752e707a9ece567bb139bc2f1e689840d6641aa6db958240a4f97fab69e7200385ddb2ee53abc5f04
SHA512
6de19c1dd6584f95bc3abbd391495bbdc13f15cc677a0c9e7afa2a0beffef8f8128eab5ccda741ed95af4553203b9daf1fc0327197912945e7211aeace33c6e7
-DIST qtsvg-everywhere-opensource-src-5.15.9.tar.xz 1889044 BLAKE2B
0163c88701d510ab99a1d0d91f98fced612e428fdb04573aba5e819cb7a713d283e1cae94f0e31a7016d14a1f61f202a417453f63768ebdfa185772abcf0cf71
SHA512
e091c059492662fad713d1f99bfa5e21a8f8e77e24b067d176a6e732b420a22e3777fa99a880c6f992a19b2e5b16c01f131da875d9e08e6a515108b468192fe5
DIST qtsvg-everywhere-src-6.5.1.tar.xz 1728900 BLAKE2B
9003463afefb97fea05dcac2b9a56f31c3e5a64a76e4a3b4b04bccfe73c691f48a4c8696aeda7359d113c6fd7c8ec7c0bc094d092f3db2338e0ca136792b7705
SHA512
4df0e02aa9b21091eb71a536befc52d8e7bd5f6d9fa757fcf0ac2f11e44d3f84b44d73551e44bd6a1045891bc9c0ed471820a94b8f014b3a82cccf32b10ac437
diff --git a/dev-qt/qtsvg/files/qtsvg-5.15.9-fix-ub-ossfuzz-22618.patch
b/dev-qt/qtsvg/files/qtsvg-5.15.9-fix-ub-ossfuzz-22618.patch
deleted file mode 100644
index adc43d7c3fba..000000000000
--- a/dev-qt/qtsvg/files/qtsvg-5.15.9-fix-ub-ossfuzz-22618.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 837b5163e17edbd3a9f098e9a1ab73febab419b4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Robert=20L=C3=B6hning?= <robert.loehn...@qt.io>
-Date: Mon, 24 Apr 2023 15:27:17 +0200
-Subject: [PATCH] QSvgFont: Initialize used member, remove unused
-
-Credit to OSS-Fuzz
-
-[ChangeLog][QtSvg] Fixed undefined behavior from using uninitialized
-variable.
-
-Pick-to: 6.5 6.2 5.15
-Coverity-Id: 22618
-Change-Id: Id52277bb0e2845f4d342e187dbb8093e9276b70c
-Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfe...@qt.io>
-(cherry picked from commit ff22c3ccf8ccf813fdcfda23f7740ba73ba5ce0a)
----
- src/svg/qsvgfont_p.h | 5 ++---
- src/svg/qsvghandler.cpp | 2 +-
- 2 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/src/svg/qsvgfont_p.h b/src/svg/qsvgfont_p.h
-index fd0a3fab..fcffbe85 100644
---- a/src/svg/qsvgfont_p.h
-+++ b/src/svg/qsvgfont_p.h
-@@ -74,6 +74,7 @@ public:
- class Q_SVG_PRIVATE_EXPORT QSvgFont : public QSvgRefCounted
- {
- public:
-+ static constexpr qreal DEFAULT_UNITS_PER_EM = 1000;
- QSvgFont(qreal horizAdvX);
-
- void setFamilyName(const QString &name);
-@@ -86,9 +87,7 @@ public:
- void draw(QPainter *p, const QPointF &point, const QString &str, qreal
pixelSize, Qt::Alignment alignment) const;
- public:
- QString m_familyName;
-- qreal m_unitsPerEm;
-- qreal m_ascent;
-- qreal m_descent;
-+ qreal m_unitsPerEm = DEFAULT_UNITS_PER_EM;
- qreal m_horizAdvX;
- QHash<QChar, QSvgGlyph> m_glyphs;
- };
-diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp
-index 8dda5632..222b6d89 100644
---- a/src/svg/qsvghandler.cpp
-+++ b/src/svg/qsvghandler.cpp
-@@ -2671,7 +2671,7 @@ static bool parseFontFaceNode(QSvgStyleProperty *parent,
-
- qreal unitsPerEm = toDouble(unitsPerEmStr);
- if (!unitsPerEm)
-- unitsPerEm = 1000;
-+ unitsPerEm = QSvgFont::DEFAULT_UNITS_PER_EM;
-
- if (!name.isEmpty())
- font->setFamilyName(name);
---
-GitLab
-
diff --git a/dev-qt/qtsvg/qtsvg-5.15.9-r1.ebuild
b/dev-qt/qtsvg/qtsvg-5.15.9-r1.ebuild
deleted file mode 100644
index dc7913ed59bd..000000000000
--- a/dev-qt/qtsvg/qtsvg-5.15.9-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} != *9999* ]]; then
- QT5_KDEPATCHSET_REV=1
- KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-inherit qt5-build
-
-DESCRIPTION="SVG rendering library for the Qt5 framework"
-
-IUSE=""
-
-RDEPEND="
- =dev-qt/qtcore-${QT5_PV}*
- =dev-qt/qtgui-${QT5_PV}*
- =dev-qt/qtwidgets-${QT5_PV}*
- sys-libs/zlib:=
-"
-DEPEND="${RDEPEND}
- test? ( =dev-qt/qtxml-${QT5_PV}* )
-"
-
-PATCHES=( "${FILESDIR}/${P}-fix-ub-ossfuzz-22618.patch" )
