From 3e627c1432765cb6a32877e73f985e8bfb5102ce Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 14 Jul 2022 13:40:00 +0100 Subject: gentoo auto-resync : 14:07:2022 - 13:40:00 --- kde-apps/kitinerary/Manifest | 3 +- .../files/kitinerary-22.04.3-zxing-cpp-1.4.0.patch | 68 ++++++++++++++++++++++ kde-apps/kitinerary/kitinerary-22.04.3-r1.ebuild | 53 +++++++++++++++++ kde-apps/kitinerary/kitinerary-22.04.3.ebuild | 51 ---------------- 4 files changed, 123 insertions(+), 52 deletions(-) create mode 100644 kde-apps/kitinerary/files/kitinerary-22.04.3-zxing-cpp-1.4.0.patch create mode 100644 kde-apps/kitinerary/kitinerary-22.04.3-r1.ebuild delete mode 100644 kde-apps/kitinerary/kitinerary-22.04.3.ebuild (limited to 'kde-apps/kitinerary') diff --git a/kde-apps/kitinerary/Manifest b/kde-apps/kitinerary/Manifest index 6e23323c879e..e2db311f0956 100644 --- a/kde-apps/kitinerary/Manifest +++ b/kde-apps/kitinerary/Manifest @@ -1,5 +1,6 @@ +AUX kitinerary-22.04.3-zxing-cpp-1.4.0.patch 2462 BLAKE2B a2010dadb224c7c50f28a14aa4197db6dc7298768f929d9d773358308f04e76bd3bf3c52f7a2383712dc5000488070f0abee09068c790505e6c7c735ae527842 SHA512 5fbf56603b346a44de87de04fbc332db120398e4d43c3828657667b804626b6272e0e63d26dce2ba6130477f23d3b587fe0555976989ba0e1b95c58ce558ef32 DIST kitinerary-21.12.3.tar.xz 1860556 BLAKE2B 86e0d690f6dc865ac9af5866a89bf75afb7ea6b5440487755eecc7c2961f914ac39a1aa47c2d12333961f8e42c47840184f7812ea1fdfd94b61ab283d41b410b SHA512 8c02158a2ee18815e0d7e51c82d318a3a37c9269ef9e51e66af1bf2b4c93fb97597f5ee7ed2eaa8dda8c85207256286a8dd5904031b87a7474b53ae28853e3e5 DIST kitinerary-22.04.3.tar.xz 1530056 BLAKE2B e5439361dfe7e027c3faa160a83947d3d13ac900e4ec6fc8d110a057c5879856d9d91e6127f7b78a18218e55a7140a7469ad68507f0e6f104a4ccdc8e5557a6c SHA512 c3ce7c2890023df35f11566cf8dcc43381b0a8b282dfe39057bf3de74dbd485532253636d9e0903520e851b5ea29133cc5a984ca0451b0d3ab7acdd4a97a3094 EBUILD kitinerary-21.12.3.ebuild 1220 BLAKE2B 3870601287a20f2ff6f9396af162fe06cd4105bc1f951f0d06fd6c4f954f660ca63ffcb1ca02c29a52c41615ef6cc3d20eff89ed76ee06a03b8118e6a88fffc6 SHA512 bd1b0912678036310aa1bb3dbc7ceceec399efc3cb1967e05f9b4f53b99c22259b85fc3f1cf3f03b1567b809a140902a35a372916cd3f6b27cba2765f56e2d95 -EBUILD kitinerary-22.04.3.ebuild 1228 BLAKE2B dc828c3016b8ecc3a5fdb019d6d513b5ac94641922eb71a1832c59c83f593fe7bbf236deefff6ea81a711f2938c58ff44b1d2841ba11d830399c8a6e418b1ac8 SHA512 a3a252584616f9da621f5c1e961960663717d15fa9c3753e784cffbaaf88dca9403dcdd8124c0434b9b0294a38aaadbb36b7a839ce866e02e44191d09dd33d6b +EBUILD kitinerary-22.04.3-r1.ebuild 1284 BLAKE2B b9ae48a6126855b5e0f594bef14ae4f5ad12feb05342c37f672a2ae0afacdce5b8a46a859ff5d9ae01ea4e2a9fe5cb5b4dd131d738cf63d9f4fcc40cdc984744 SHA512 82062e57c6a2d96002adcd015fd965677182713dbb171bb813ec4219fd0ce9207421782ae8bf65e14d14d27c812ca2629c78d1d9ccfdd5608a011280af9e6da1 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 new file mode 100644 index 000000000000..a208d2bfaed7 --- /dev/null +++ b/kde-apps/kitinerary/files/kitinerary-22.04.3-zxing-cpp-1.4.0.patch @@ -0,0 +1,68 @@ +From bf83f8bd974925aec07a2e8dbfd50ad39995b428 Mon Sep 17 00:00:00 2001 +From: Volker Krause +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 + + #ifdef HAVE_ZXING ++#define ZX_USE_UTF8 1 + #ifdef ZXING_USE_READBARCODE + #include + #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 new file mode 100644 index 000000000000..75600a759039 --- /dev/null +++ b/kde-apps/kitinerary/kitinerary-22.04.3-r1.ebuild @@ -0,0 +1,53 @@ +# 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 +} diff --git a/kde-apps/kitinerary/kitinerary-22.04.3.ebuild b/kde-apps/kitinerary/kitinerary-22.04.3.ebuild deleted file mode 100644 index 9bdd9db4d9d9..000000000000 --- a/kde-apps/kitinerary/kitinerary-22.04.3.ebuild +++ /dev/null @@ -1,51 +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" - -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 -} -- cgit v1.2.3