From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtsvg/, dev-qt/qtsvg/files/
Date: Sat, 18 Jun 2022 17:25:23 +0000 (UTC) [thread overview]
Message-ID: <1655573045.55303e769a0f13eff00107901c1098dde77be2c7.asturm@gentoo> (raw)
commit: 55303e769a0f13eff00107901c1098dde77be2c7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 18 15:53:25 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 18 17:24:05 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55303e76
dev-qt/qtsvg: Drop 5.15.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtsvg/Manifest | 3 -
...tsvg-5.15.3-QTBUG-90744-minus-binarypatch.patch | 142 ---------------------
dev-qt/qtsvg/qtsvg-5.15.3.ebuild | 34 -----
3 files changed, 179 deletions(-)
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index b6f31437092c..d072181dee1b 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -1,5 +1,2 @@
-DIST qtsvg-5.15.3-QTBUG-90744.tar.xz 632 BLAKE2B e7f2f52dc546f9520ac2311b417b86d697ab20f8d02318fce76d46b35efcaf3dccdab5377d65c01af3a193df478083733c466e3a778325e73184f84830080686 SHA512 1681a2e0395d97b30b49b981e342b7e647108ba19b1472f34239136e1b946da67afaac3454533139a55a0f5f0a5fd167596a2ca7b26e4c018fa41a91dd94cd7b
-DIST qtsvg-5.15.3-gentoo-kde-1.tar.xz 7384 BLAKE2B 25d0b5216ab6c0fc8758a55138000b641d2ca57a64095c1117c1d5da59cca3dda890fe2b0b8589d5be0ac19e73f3a329af5710dfa163a25609f068d673f830b5 SHA512 4b512bb8ea1ee6e38b28ad52a34a1f2b6a6a7ac72c341b8faacb599f6cd770924ae7a473052c59783653a734e8061d0167633954a6d3d9ae2ed33e0a65adeb44
DIST qtsvg-5.15.4-gentoo-kde-1.tar.xz 6804 BLAKE2B 30e43ecf736cc2f9067e82fc55d7253531684f256c8182ca14f3a9d211f836e782576d56ee31169951ce03423755c5382e4f865f55694b80ae4a3ec20de08483 SHA512 ee2cd718683a445ea21961b8b79e95132a0ced5ce370aed020c0c55ec4d7bf2b4c465cd0b16c2b0294591e78cc95a5941677f947a08ca8960bafac208ad05514
-DIST qtsvg-everywhere-opensource-src-5.15.3.tar.xz 1886104 BLAKE2B feced6caaa2e2be089ffed77f32d3b0de899b8a97632234ca8aa9d1f34fc0ee94ecd44227bb7c40ec49f0a76b305dc29ad23498bff3c62f45054854ed632b1d1 SHA512 288ce98bb6dd746564c7ffbd0d8221d0816c62b7e33424cd21d945b40308292ec9a0b1e2b9cca6ce91d606c06813f05068cad590d827810383175bebfa8ab527
DIST qtsvg-everywhere-opensource-src-5.15.4.tar.xz 1888900 BLAKE2B ceb055e09f877e826c36569ff41cceab69b8da9eebdb5b7851a582bb4389d16feb939257b8b102aef7229ca8c8777ac0f586d554a88606cb27d287de4a5f5246 SHA512 364400e17cdc659ff1a521f7bd171c5dfe537136f263cd5f64c6b5e27b0398d83ae0b5fe46e77847f3a2feccf0ea75f9591ff4b932d0250e5859272630b5a31c
diff --git a/dev-qt/qtsvg/files/qtsvg-5.15.3-QTBUG-90744-minus-binarypatch.patch b/dev-qt/qtsvg/files/qtsvg-5.15.3-QTBUG-90744-minus-binarypatch.patch
deleted file mode 100644
index 1cdd5fd5ffcc..000000000000
--- a/dev-qt/qtsvg/files/qtsvg-5.15.3-QTBUG-90744-minus-binarypatch.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From cfc616978b52a396b2ef6900546f7fc086d7cab3 Mon Sep 17 00:00:00 2001
-From: Eirik Aavitsland <eirik.aavitsland@qt.io>
-Date: Thu, 8 Apr 2021 13:19:52 +0200
-Subject: [PATCH 3/9] Make image handler accept UTF-16/UTF-32 encoded SVGs
-
-The canRead() header checks assumed 8 bit encoding.
-
-Pick-to: 6.1 6.0 5.15
-Fixes: QTBUG-90744
-Change-Id: Ibe934fe9ed31b89ee0fbfc4562aa66ab1b359225
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-(cherry picked from commit 45fb1f07eaa984af40fca9f12b8f3d27f7b0e9ac)
----
- .../imageformats/svg/qsvgiohandler.cpp | 37 +++++++++++-------
- tests/auto/qsvgplugin/simple_Utf16BE.svg | Bin 0 -> 228 bytes
- tests/auto/qsvgplugin/simple_Utf16LE.svg | Bin 0 -> 228 bytes
- tests/auto/qsvgplugin/simple_Utf32BE.svg | Bin 0 -> 456 bytes
- tests/auto/qsvgplugin/simple_Utf32LE.svg | Bin 0 -> 456 bytes
- tests/auto/qsvgplugin/simple_Utf8.svg | 3 ++
- tests/auto/qsvgplugin/tst_qsvgplugin.cpp | 32 +++++++++++++++
- 7 files changed, 57 insertions(+), 15 deletions(-)
- create mode 100644 tests/auto/qsvgplugin/simple_Utf16BE.svg
- create mode 100644 tests/auto/qsvgplugin/simple_Utf16LE.svg
- create mode 100644 tests/auto/qsvgplugin/simple_Utf32BE.svg
- create mode 100644 tests/auto/qsvgplugin/simple_Utf32LE.svg
- create mode 100644 tests/auto/qsvgplugin/simple_Utf8.svg
-
-diff --git a/src/plugins/imageformats/svg/qsvgiohandler.cpp b/src/plugins/imageformats/svg/qsvgiohandler.cpp
-index bd39b2a..4136aaf 100644
---- a/src/plugins/imageformats/svg/qsvgiohandler.cpp
-+++ b/src/plugins/imageformats/svg/qsvgiohandler.cpp
-@@ -118,6 +118,24 @@ QSvgIOHandler::~QSvgIOHandler()
- delete d;
- }
-
-+static bool isPossiblySvg(QIODevice *device, bool *isCompressed = nullptr)
-+{
-+ constexpr int bufSize = 64;
-+ char buf[bufSize];
-+ const qint64 readLen = device->peek(buf, bufSize);
-+ if (readLen < 8)
-+ return false;
-+# ifndef QT_NO_COMPRESS
-+ if (quint8(buf[0]) == 0x1f && quint8(buf[1]) == 0x8b) {
-+ if (isCompressed)
-+ *isCompressed = true;
-+ return true;
-+ }
-+# endif
-+ QTextStream str(QByteArray::fromRawData(buf, readLen));
-+ QByteArray ba = str.read(16).trimmed().toLatin1();
-+ return ba.startsWith("<?xml") || ba.startsWith("<svg") || ba.startsWith("<!--") || ba.startsWith("<!DOCTYPE svg");
-+}
-
- bool QSvgIOHandler::canRead() const
- {
-@@ -126,15 +144,9 @@ bool QSvgIOHandler::canRead() const
- if (d->loaded && !d->readDone)
- return true; // Will happen if we have been asked for the size
-
-- QByteArray buf = device()->peek(16);
--#ifndef QT_NO_COMPRESS
-- if (buf.startsWith("\x1f\x8b")) {
-- setFormat("svgz");
-- return true;
-- } else
--#endif
-- if (buf.contains("<?xml") || buf.contains("<svg") || buf.contains("<!--") || buf.contains("<!DOCTYPE svg")) {
-- setFormat("svg");
-+ bool isCompressed = false;
-+ if (isPossiblySvg(device(), &isCompressed)) {
-+ setFormat(isCompressed ? "svgz" : "svg");
- return true;
- }
- return false;
-@@ -260,12 +272,7 @@ bool QSvgIOHandler::supportsOption(ImageOption option) const
-
- bool QSvgIOHandler::canRead(QIODevice *device)
- {
-- QByteArray buf = device->peek(16);
-- return
--#ifndef QT_NO_COMPRESS
-- buf.startsWith("\x1f\x8b") ||
--#endif
-- buf.contains("<?xml") || buf.contains("<svg") || buf.contains("<!--") || buf.contains("<!DOCTYPE svg");
-+ return isPossiblySvg(device);
- }
-
- QT_END_NAMESPACE
-diff --git a/tests/auto/qsvgplugin/tst_qsvgplugin.cpp b/tests/auto/qsvgplugin/tst_qsvgplugin.cpp
-index e1f84f3..73bbe8b 100644
---- a/tests/auto/qsvgplugin/tst_qsvgplugin.cpp
-+++ b/tests/auto/qsvgplugin/tst_qsvgplugin.cpp
-@@ -61,6 +61,8 @@ private slots:
- void checkSize_data();
- void checkSize();
- void checkImageInclude();
-+ void encodings_data();
-+ void encodings();
- };
-
-
-@@ -145,6 +147,36 @@ void tst_QSvgPlugin::checkImageInclude()
- logMessages.clear();
- }
-
-+void tst_QSvgPlugin::encodings_data()
-+{
-+ QTest::addColumn<QString>("filename");
-+
-+ QTest::newRow("utf-8") << QFINDTESTDATA("simple_Utf8.svg");
-+ QTest::newRow("utf-16LE") << QFINDTESTDATA("simple_Utf16LE.svg");
-+ QTest::newRow("utf-16BE") << QFINDTESTDATA("simple_Utf16BE.svg");
-+ QTest::newRow("utf-32LE") << QFINDTESTDATA("simple_Utf32LE.svg");
-+ QTest::newRow("utf-32BE") << QFINDTESTDATA("simple_Utf32BE.svg");
-+}
-+
-+void tst_QSvgPlugin::encodings()
-+{
-+ QFETCH(QString, filename);
-+
-+ {
-+ QFile file(filename);
-+ file.open(QIODevice::ReadOnly);
-+ QVERIFY(QSvgIOHandler::canRead(&file));
-+ }
-+
-+ QFile file(filename);
-+ file.open(QIODevice::ReadOnly);
-+ QSvgIOHandler plugin;
-+ plugin.setDevice(&file);
-+ QVERIFY(plugin.canRead());
-+ QImage img;
-+ QVERIFY(plugin.read(&img));
-+ QCOMPARE(img.size(), QSize(50, 50));
-+}
-
- QTEST_MAIN(tst_QSvgPlugin)
- #include "tst_qsvgplugin.moc"
---
-2.35.1
-
diff --git a/dev-qt/qtsvg/qtsvg-5.15.3.ebuild b/dev-qt/qtsvg/qtsvg-5.15.3.ebuild
deleted file mode 100644
index 134214df28a4..000000000000
--- a/dev-qt/qtsvg/qtsvg-5.15.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-inherit qt5-build
-
-DESCRIPTION="SVG rendering library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
- SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${P}-QTBUG-90744.tar.xz"
-fi
-
-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}-QTBUG-90744-minus-binarypatch.patch )
-
-src_unpack() {
- default
- # contains binary patch, so it is applied manually instead
- rm "${WORKDIR}"/${P}-gentoo-kde-1/0003-Make-image-handler-accept-UTF-16-UTF-32-encoded-SVGs.patch || die
-}
next reply other threads:[~2022-06-18 17:25 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-18 17:25 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-03-21 11:04 [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtsvg/, dev-qt/qtsvg/files/ Andreas Sturmlechner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1655573045.55303e769a0f13eff00107901c1098dde77be2c7.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox