gentoo auto-resync : 03:12:2022 - 14:59:58

3 files changed, 0 insertions, 124 deletions

diff --git a/kde-apps/kitinerary/Manifest b/kde-apps/kitinerary/Manifest
index 960ca9d5d58a..9a140694bab8 100644
--- a/kde-apps/kitinerary/Manifest
+++ b/kde-apps/kitinerary/Manifest
@@ -1,6 +1,3 @@
-AUX kitinerary-22.04.3-zxing-cpp-1.4.0.patch 2462 BLAKE2B a2010dadb224c7c50f28a14aa4197db6dc7298768f929d9d773358308f04e76bd3bf3c52f7a2383712dc5000488070f0abee09068c790505e6c7c735ae527842 SHA512 5fbf56603b346a44de87de04fbc332db120398e4d43c3828657667b804626b6272e0e63d26dce2ba6130477f23d3b587fe0555976989ba0e1b95c58ce558ef32
-DIST kitinerary-22.04.3.tar.xz 1530056 BLAKE2B e5439361dfe7e027c3faa160a83947d3d13ac900e4ec6fc8d110a057c5879856d9d91e6127f7b78a18218e55a7140a7469ad68507f0e6f104a4ccdc8e5557a6c SHA512 c3ce7c2890023df35f11566cf8dcc43381b0a8b282dfe39057bf3de74dbd485532253636d9e0903520e851b5ea29133cc5a984ca0451b0d3ab7acdd4a97a3094
 DIST kitinerary-22.08.3.tar.xz 1698008 BLAKE2B 432c42475c01b0fc9a44bcea09449c7e392deaabb815c579e3e2ab4f3981b611d79c8bc530cdd3198bea8abf2b26c120e02259eb813cc76a9ef122a7c7839861 SHA512 fe2028fc4a7953cf95129ef787548afe0cda8bc8c6f58971a359a3494ca50d21bb18f5d9962852ac8bb2d1fd3a0c2627f2a720cfd38a5b987d377c8750f3bdf0
-EBUILD kitinerary-22.04.3-r1.ebuild 1281 BLAKE2B 63f488a4af4d2ba6ccde818035fc3193735deee2a391ae8600aabb69a554e9dcd89093cad092932c87903bebd46df85e73e10b385bc22b575d1a3edfd33d48a1 SHA512 273c413aa05f813a26f914d004a9d67ac994c12afc22e22b7aa344aa781f33c708ef2d835610ce932208be45b5532a7ec87b90aecf362ba327131782566fb8fb
 EBUILD kitinerary-22.08.3.ebuild 1144 BLAKE2B 8804456c4379dc21e2c86788511877d763b26e748a36d3465e58cf273c944423b65a89386ecfd6a2c6e5fab219fc4be90cfd502bbfe9d943be749a3f250b5ec8 SHA512 6b5bb30a0efbc5a3652774d298dea0174ef8134c9f0b7683890f81e1eee6b3bac859cc6c7bf5574bd40101f8afed1eb7799468613c987d42930182e91b4c24b3
 MISC metadata.xml 454 BLAKE2B 47c8910a8a5d54d2ae4242734dd99c24bfc2aa9a753dc4732433717975dada407d62f2487f6ac57724087e73a622dd9056ab0487183cd411b971200d40736dc4 SHA512 e23256862ef83d5b99bfe3bfd1bedab7b1c1a50cb204e5aa1d431a17afb1450e0caf6460c804dc1f907f3ce9089d51d4742192e668a01408a7b4d2b332b6c00f
diff --git a/kde-apps/kitinerary/files/kitinerary-22.04.3-zxing-cpp-1.4.0.patch b/kde-apps/kitinerary/files/kitinerary-22.04.3-zxing-cpp-1.4.0.patch
deleted file mode 100644
index a208d2bfaed7..000000000000
--- a/kde-apps/kitinerary/files/kitinerary-22.04.3-zxing-cpp-1.4.0.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From bf83f8bd974925aec07a2e8dbfd50ad39995b428 Mon Sep 17 00:00:00 2001
-From: Volker Krause <vkrause@kde.org>
-Date: Fri, 8 Jul 2022 16:04:19 +0200
-Subject: [PATCH] Support ZXing 1.4.0
-
-The previous code crashes (if it builds at all) with ZXing 1.4.0, so
-distributions updating to 1.4.0 would need to apply this patch on top
-of 22.04.3 as well.
-
-(cherry picked from commit e60195421aa159462353892ed32bf46ac8c57d19)
----
- src/lib/barcodedecoder.cpp | 26 ++++++++++++++++++++++++++
- 1 file changed, 26 insertions(+)
-
-diff --git a/src/lib/barcodedecoder.cpp b/src/lib/barcodedecoder.cpp
-index b38140a..40e0c64 100644
---- a/src/lib/barcodedecoder.cpp
-+++ b/src/lib/barcodedecoder.cpp
-@@ -15,6 +15,7 @@
- #include <QString>
- 
- #ifdef HAVE_ZXING
-+#define ZX_USE_UTF8 1
- #ifdef ZXING_USE_READBARCODE
- #include <ZXing/ReadBarcode.h>
- #else
-@@ -244,6 +245,30 @@ void BarcodeDecoder::decodeZxing(const QImage &img, BarcodeDecoder::BarcodeTypes
- #endif
- 
-     if (res.isValid()) {
-+#if ZXING_VERSION >= QT_VERSION_CHECK(1, 4, 0)
-+        // detect content type
-+        std::string zxUtf8Text;
-+        if (res.contentType() == ZXing::ContentType::Text) {
-+            result.contentType = Result::Any;
-+            zxUtf8Text = res.text();
-+            // check if the text is ASCII-only (in which case we allow access as byte array as well)
-+            if (std::any_of(zxUtf8Text.begin(), zxUtf8Text.end(), [](unsigned char c) { return c > 0x7F; })) {
-+                result.contentType &= ~Result::ByteArray;
-+            }
-+        } else {
-+            result.contentType = Result::ByteArray;
-+        }
-+
-+        // decode content
-+        if (result.contentType & Result::ByteArray) {
-+            QByteArray b;
-+            b.resize(res.bytes().size());
-+            std::copy(res.bytes().begin(), res.bytes().end(), b.begin());
-+            result.content = b;
-+        } else {
-+            result.content = QString::fromStdString(zxUtf8Text);
-+        }
-+#else
-         // detect content type
-         result.contentType = Result::Any;
-         if (std::any_of(res.text().begin(), res.text().end(), [](const auto c) { return c > 255; })) {
-@@ -262,6 +287,7 @@ void BarcodeDecoder::decodeZxing(const QImage &img, BarcodeDecoder::BarcodeTypes
-         } else {
-             result.content = QString::fromStdWString(res.text());
-         }
-+#endif
-         result.positive |= formatToType(res.format());
-     } else {
-         result.negative |= format;
--- 
-2.35.1
-
diff --git a/kde-apps/kitinerary/kitinerary-22.04.3-r1.ebuild b/kde-apps/kitinerary/kitinerary-22.04.3-r1.ebuild
deleted file mode 100644
index 3f638e04cee0..000000000000
--- a/kde-apps/kitinerary/kitinerary-22.04.3-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.92.0
-QTMIN=5.15.4
-VIRTUALX_REQUIRED="test"
-inherit ecm gear.kde.org
-
-DESCRIPTION="Data Model and Extraction System for Travel Reservation information"
-HOMEPAGE="https://apps.kde.org/kontact/"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="+barcode pdf"
-
-REQUIRED_USE="test? ( pdf )"
-
-DEPEND="
-	dev-libs/libphonenumber
-	dev-libs/libxml2:2
-	dev-libs/openssl:=
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kpkpass-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	sys-libs/zlib
-	barcode? ( >=media-libs/zxing-cpp-1.1.0:= )
-	pdf? ( app-text/poppler:=[qt5] )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="x11-misc/shared-mime-info"
-
-PATCHES=( "${FILESDIR}/${P}-zxing-cpp-1.4.0.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		# sci-geosciences/osmctools; TODO: useful at all?
-		-DCMAKE_DISABLE_FIND_PACKAGE_OsmTools=ON
-		$(cmake_use_find_package barcode ZXing)
-		$(cmake_use_find_package pdf Poppler)
-	)
-	ecm_src_configure
-}