[gentoo-commits] repo/gentoo:master commit in: kde-apps/kitinerary/files/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/kitinerary/files/

[Andreas Sturmlechner]

commit:     a54ea567400f7359ef75e92415c47a6be0e76d44
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Nov 15 15:29:17 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 16 09:09:11 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a54ea567

kde-apps/kitinerary: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13664
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/kitinerary-19.08.2-poppler-0.82.patch    | 127 ---------------------
 1 file changed, 127 deletions(-)

diff --git a/kde-apps/kitinerary/files/kitinerary-19.08.2-poppler-0.82.patch b/kde-apps/kitinerary/files/kitinerary-19.08.2-poppler-0.82.patch
deleted file mode 100644
index be2152dafef..00000000000
--- a/kde-apps/kitinerary/files/kitinerary-19.08.2-poppler-0.82.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From 0f8b2babcc69c490ae6548bda7ceeb1ffd27a9e3 Mon Sep 17 00:00:00 2001
-From: Volker Krause <vkrause@kde.org>
-Date: Sun, 29 Sep 2019 12:51:57 +0200
-Subject: Fix compatibility with Poppler 0.82
-
----
- CMakeLists.txt                       | 17 ++++++-----------
- src/config-kitinerary.h.cmake        |  1 +
- src/pdf/pdfextractoroutputdevice.cpp |  2 +-
- src/pdf/pdfextractoroutputdevice_p.h |  3 ++-
- src/pdf/popplertypes_p.h             | 30 ++++++++++++++++++++++++++++++
- 5 files changed, 40 insertions(+), 13 deletions(-)
- create mode 100644 src/pdf/popplertypes_p.h
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cb222d9..1d66d3b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -62,17 +62,12 @@ if(TARGET Poppler::Core)
-     if (${Poppler_VERSION} VERSION_GREATER 0.68)
-         set(HAVE_POPPLER_0_69 ON)
-     endif()
--    set(CMAKE_REQUIRED_LIBRARIES Poppler::Core Qt5::Core)
--    check_cxx_source_compiles("
--    #include <goo/GooString.h>
--    #include <QString>
--    int main()
--    {
--        GooString s;
--        QString val = QString::fromUtf8(s.c_str());
--        return 0;
--    }
--    " HAVE_POPPLER_0_72)
-+    if (${Poppler_VERSION} VERSION_GREATER 0.71)
-+        set(HAVE_POPPLER_0_72 ON)
-+    endif()
-+    if (${Poppler_VERSION} VERSION_GREATER 0.81)
-+        set(HAVE_POPPLER_0_82 ON)
-+    endif()
- endif()
- 
- if (TARGET ZXing::Core)
-diff --git a/src/config-kitinerary.h.cmake b/src/config-kitinerary.h.cmake
-index b0bda20..6d3b156 100644
---- a/src/config-kitinerary.h.cmake
-+++ b/src/config-kitinerary.h.cmake
-@@ -24,6 +24,7 @@
- #cmakedefine HAVE_POPPLER_0_58
- #cmakedefine HAVE_POPPLER_0_69
- #cmakedefine HAVE_POPPLER_0_72
-+#cmakedefine HAVE_POPPLER_0_82
- 
- #cmakedefine HAVE_ZXING
- 
-diff --git a/src/pdf/pdfextractoroutputdevice.cpp b/src/pdf/pdfextractoroutputdevice.cpp
-index 2a06c82..0027cad 100644
---- a/src/pdf/pdfextractoroutputdevice.cpp
-+++ b/src/pdf/pdfextractoroutputdevice.cpp
-@@ -30,7 +30,7 @@ PdfExtractorOutputDevice::PdfExtractorOutputDevice()
- {
- }
- 
--void PdfExtractorOutputDevice::drawImage(GfxState* state, Object* ref, Stream* str, int width, int height, GfxImageColorMap* colorMap, bool interpolate, int* maskColors, bool inlineImg)
-+void PdfExtractorOutputDevice::drawImage(GfxState* state, Object* ref, Stream* str, int width, int height, GfxImageColorMap* colorMap, bool interpolate, PopplerMaskColors* maskColors, bool inlineImg)
- {
-     Q_UNUSED(str);
-     Q_UNUSED(interpolate);
-diff --git a/src/pdf/pdfextractoroutputdevice_p.h b/src/pdf/pdfextractoroutputdevice_p.h
-index 9241f9f..5d448d3 100644
---- a/src/pdf/pdfextractoroutputdevice_p.h
-+++ b/src/pdf/pdfextractoroutputdevice_p.h
-@@ -21,6 +21,7 @@
- #include <config-kitinerary.h>
- 
- #include "pdfvectorpicture_p.h"
-+#include "popplertypes_p.h"
- 
- #ifdef HAVE_POPPLER
- #include <TextOutputDev.h>
-@@ -43,7 +44,7 @@ public:
-     void finalize();
- 
-     bool needNonText() override { return true; }
--    void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, int *maskColors, bool inlineImg) override;
-+    void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, PopplerMaskColors *maskColors, bool inlineImg) override;
- 
-     // operations used to detect vector barcodes
-     void saveState(GfxState *state) override;
-diff --git a/src/pdf/popplertypes_p.h b/src/pdf/popplertypes_p.h
-new file mode 100644
-index 0000000..f9d844a
---- /dev/null
-+++ b/src/pdf/popplertypes_p.h
-@@ -0,0 +1,30 @@
-+/*
-+    Copyright (C) 2019 Volker Krause <vkrause@kde.org>
-+
-+    This program is free software; you can redistribute it and/or modify it
-+    under the terms of the GNU Library General Public License as published by
-+    the Free Software Foundation; either version 2 of the License, or (at your
-+    option) any later version.
-+
-+    This program is distributed in the hope that it will be useful, but WITHOUT
-+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-+    License for more details.
-+
-+    You should have received a copy of the GNU General Public License
-+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-+*/
-+
-+#ifndef KITINERARY_POPPLERTYPES_P_H
-+#define KITINERARY_POPPLERTYPES_P_H
-+
-+#include <config-kitinerary.h>
-+
-+#ifdef HAVE_POPPLER_0_82
-+using PopplerMaskColors = const int;
-+#else
-+using PopplerMaskColors = int;
-+#endif
-+
-+#endif // KITINERARY_POPPLERTYPES_P_H
-+
--- 
-cgit v1.1
-

[gentoo-commits] repo/gentoo:master commit in: kde-apps/kitinerary/files/

[Andreas Sturmlechner]

commit:     8f9569353a1d6d73136d976fe52acce486fb019c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  3 10:49:39 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec  3 10:50:48 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f956935

kde-apps/kitinerary: Drop obsolete patch

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/kitinerary-22.04.3-zxing-cpp-1.4.0.patch | 68 ----------------------
 1 file changed, 68 deletions(-)

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
-

[gentoo-commits] repo/gentoo:master commit in: kde-apps/kitinerary/files/

[Andreas Sturmlechner]

commit:     f8432fe79e9bcb2f1d1549afc52eb286530bdbd5
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Jul 25 19:12:23 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jul 25 19:25:16 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8432fe7

kde-apps/kitinerary: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/32038
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/kitinerary-22.12.0-gcc13.patch           | 24 ----------------------
 1 file changed, 24 deletions(-)

diff --git a/kde-apps/kitinerary/files/kitinerary-22.12.0-gcc13.patch b/kde-apps/kitinerary/files/kitinerary-22.12.0-gcc13.patch
deleted file mode 100644
index 09c88c8b5250..000000000000
--- a/kde-apps/kitinerary/files/kitinerary-22.12.0-gcc13.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://invent.kde.org/pim/kitinerary/-/commit/0ef772c3e0ff8f049f299ad14b3c65327e4fe69e
-
-From: Sam James <sam@gentoo.org>
-Date: Sun, 11 Dec 2022 13:29:11 +0000
-Subject: [PATCH] asn1: Fix build with GCC 13 (add missing <cstdint> include)
-
-GCC 13 (as usual for new compiler releases) shuffles around some
-internal includes and so <cstdint> is no longer transitively included.
-
-Explicitly include <cstdint> for uint8_t.
-
-Bug: https://bugs.gentoo.org/885423
---- a/src/lib/asn1/bitvectorview.h
-+++ b/src/lib/asn1/bitvectorview.h
-@@ -8,6 +8,7 @@
- 
- #include <bitset>
- #include <cassert>
-+#include <cstdint>
- #include <string_view>
- #include <type_traits>
- 
--- 
-GitLab