gentoo resync : 29.12.2022

4 files changed, 32 insertions, 157 deletions

diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index b3905bbe31cb..0e60bfdf33a8 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -1,6 +1,7 @@
-AUX qtsvg-5.15.3-QTBUG-90744-minus-binarypatch.patch 4929 BLAKE2B 0df696c3422105308a1f8f36150c2fbdf0ca900839380808f27455cd36f443b9f45aed818ee93130c9d687d26079588a20cf3cc90dd8da9aeadc5e8902d60cca SHA512 5a2ee79c21dd32ccce18a784d57d7d6b17dff2c109a548a1482152fe96f524e87cd5d09a504e15d6b1435059c431606335a92f03f70c9f28a63e5786cb78412c
-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-everywhere-opensource-src-5.15.3.tar.xz 1886104 BLAKE2B feced6caaa2e2be089ffed77f32d3b0de899b8a97632234ca8aa9d1f34fc0ee94ecd44227bb7c40ec49f0a76b305dc29ad23498bff3c62f45054854ed632b1d1 SHA512 288ce98bb6dd746564c7ffbd0d8221d0816c62b7e33424cd21d945b40308292ec9a0b1e2b9cca6ce91d606c06813f05068cad590d827810383175bebfa8ab527
-EBUILD qtsvg-5.15.3.ebuild 840 BLAKE2B 5be8735e823010cd3857c82351276e98f5f0b700a7b97c0d914f9442e28143596795bc11afb91cdd2d19cb5e6a801cb7c415887d7340957db1144e7661953fe4 SHA512 2ca9e9d1afdb6ba9e96fbfefef41d1b953dc24ae9253f4e825303f4aa1c8e9a80d4c008787da81938e02f7bc0092e4f4e3da50e6306fb332c84bcb42737a0772
+DIST qtsvg-5.15.4-gentoo-kde-1.tar.xz 6804 BLAKE2B 30e43ecf736cc2f9067e82fc55d7253531684f256c8182ca14f3a9d211f836e782576d56ee31169951ce03423755c5382e4f865f55694b80ae4a3ec20de08483 SHA512 ee2cd718683a445ea21961b8b79e95132a0ced5ce370aed020c0c55ec4d7bf2b4c465cd0b16c2b0294591e78cc95a5941677f947a08ca8960bafac208ad05514
+DIST qtsvg-5.15.5-gentoo-kde-1.tar.xz 6796 BLAKE2B 03e80a083fef2b595d11e53cdf638082dd0a3da60a0c275d188bdf3967c0c7ceaf715e01917cd178d08714aa83827f1820c1c030253359b2018894ee805c2ff1 SHA512 31b7c804aa907aacad00debf318dd04700f16b437428ad9f5a1743dc1de3dc998b134a756395db6b439bee345d38569623a9baf1bb9f429ef068ffd7e1da593a
+DIST qtsvg-everywhere-opensource-src-5.15.4.tar.xz 1888900 BLAKE2B ceb055e09f877e826c36569ff41cceab69b8da9eebdb5b7851a582bb4389d16feb939257b8b102aef7229ca8c8777ac0f586d554a88606cb27d287de4a5f5246 SHA512 364400e17cdc659ff1a521f7bd171c5dfe537136f263cd5f64c6b5e27b0398d83ae0b5fe46e77847f3a2feccf0ea75f9591ff4b932d0250e5859272630b5a31c
+DIST qtsvg-everywhere-opensource-src-5.15.5.tar.xz 1888600 BLAKE2B 3bf675d3ac14f64c9afd096342ef4fb574c6b9d93f52b6cba3a5184b8f0f54204c90a133193685a4838236eecb72e5329eb2254c80948fa55a6a103d52256b0f SHA512 7938a84abca282f263f7840425863379ed9e0f9854ecfe38e5d1edacdaf39b2516e9e9b8b5dbcf52113785d8c4123ebea550f441abc000d01c07a20a6a742ac4
+EBUILD qtsvg-5.15.4.ebuild 508 BLAKE2B b8ff9b538c8348a5b25c09fe4063962c40cf6262274cbcbeaf5a27227556083e49ff6b134afabf968648ad85dffa0b31fbe1b109dd23e314b0c89354f31a514e SHA512 f6fb04786de78cc499fe09ce6fc28b088fafcae699736d8ba7ae47156ea2c4aafebbedafd027844961b4e721ab87cb59c4ef3ee3e1e2426de09615da601bbf73
+EBUILD qtsvg-5.15.5.ebuild 514 BLAKE2B aa20724fb6b6457e8a3b7839ef1e6f6b0e5477f8f97c7f096b168b192525094d23fa00814cb9606c0ae75e0bfe7a4c04daa2b9b3d3448c08bfb251426f90460f SHA512 f9e88adf324eb0407b813e8152f33e3e39e6f36622fc5cd5b971069a91c2048349f66b4b3b22b35b314117aaffbb5e6c7ee707eed359761d5bf96d7ad73f2bdd
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
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.4.ebuild
index 134214df28a4..9e5f77ee3f3a 100644
--- a/dev-qt/qtsvg/qtsvg-5.15.3.ebuild
+++ b/dev-qt/qtsvg/qtsvg-5.15.4.ebuild
@@ -9,8 +9,7 @@ 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"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
@@ -24,11 +23,3 @@ RDEPEND="
 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
-}
diff --git a/dev-qt/qtsvg/qtsvg-5.15.5.ebuild b/dev-qt/qtsvg/qtsvg-5.15.5.ebuild
new file mode 100644
index 000000000000..d7fd49fe4a7f
--- /dev/null
+++ b/dev-qt/qtsvg/qtsvg-5.15.5.ebuild
@@ -0,0 +1,25 @@
+# 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 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+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}* )
+"