download.lst | 4 -
external/zxing/0001-add-ZXVersion-h.patch | 21 +++++
external/zxing/0001-android-Fix-build-with-NDK-26.patch | 64 ----------------
external/zxing/README | 4 -
external/zxing/StaticLibrary_zxing.mk | 6 -
external/zxing/UnpackedTarball_zxing.mk | 4 -
6 files changed, 29 insertions(+), 74 deletions(-)
New commits:
commit 0ecedeea71d926f0aa3b2f121e6e896311e6250e
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sat Dec 9 14:54:20 2023 +0900
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Sat Dec 23 09:52:25 2023 +0100
zxing-cpp: upgrade to release 2.2.1
* remove 0001-android-Fix-build-with-NDK-26.patch, which was merged
upstream.
* remove DecodeHints from static lib, which according to upstream is not
needed:
https://github.com/zxing-cpp/zxing-cpp/issues/685#issuecomment-1853375179
* add a version header for client code
generate/update via:
* mkdir build && cd build && cmake ..
* mv core/ZXVersion.h ../core/src/
Release Notes:
https://github.com/zxing-cpp/zxing-cpp/releases/tag/v2.2.1
Change-Id: Ic4811d4724970c984dd9ed3d59b5204c18aafc6d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160528
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
diff --git a/download.lst b/download.lst
index 6191a35ab4bd..d381fca12ef6 100644
--- a/download.lst
+++ b/download.lst
@@ -655,8 +655,8 @@ ZXCVBN_C_TARBALL := zxcvbn-c-2.5.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-ZXING_SHA256SUM :=
6d54e403592ec7a143791c6526c1baafddf4c0897bb49b1af72b70a0f0c4a3fe
-ZXING_TARBALL := zxing-cpp-2.1.0.tar.gz
+ZXING_SHA256SUM :=
02078ae15f19f9d423a441f205b1d1bee32349ddda7467e2c84e8f08876f8635
+ZXING_TARBALL := zxing-cpp-2.2.1.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git a/external/zxing/0001-add-ZXVersion-h.patch
b/external/zxing/0001-add-ZXVersion-h.patch
new file mode 100644
index 000000000000..88b779e2cfd7
--- /dev/null
+++ b/external/zxing/0001-add-ZXVersion-h.patch
@@ -0,0 +1,21 @@
+--- /dev/null 2023-12-10 14:00:18.140142051 +0100
++++ a/core/src/ZXVersion.h 2023-12-22 21:38:22.466302568 +0100
+@@ -0,0 +1,18 @@
++/*
++* Copyright 2019 Nu-book Inc.
++* Copyright 2023 Axel Waggershauser
++*/
++// SPDX-License-Identifier: Apache-2.0
++
++#pragma once
++
++// Version numbering
++#define ZXING_VERSION_MAJOR 2
++#define ZXING_VERSION_MINOR 2
++#define ZXING_VERSION_PATCH 1
++
++namespace ZXing {
++
++constexpr const char* ZXING_VERSION_STR = "2.2.1";
++
++}
diff --git a/external/zxing/0001-android-Fix-build-with-NDK-26.patch
b/external/zxing/0001-android-Fix-build-with-NDK-26.patch
deleted file mode 100644
index ad1269b4165c..000000000000
--- a/external/zxing/0001-android-Fix-build-with-NDK-26.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 295b193b0105e68bb24747aefbff2653df892b4c Mon Sep 17 00:00:00 2001
-From: Michael Weghorn <m.wegh...@posteo.de>
-Date: Mon, 27 Nov 2023 14:28:34 +0100
-Subject: [PATCH] android: Fix build with NDK 26
-
-While the workarounds added in
-
- commit df0b9213017a136bf7253ea1d4aba5677c52d45c
- Author: axxel <awag...@gmail.com>
- Date: Thu Dec 15 20:43:48 2022 +0100
-
- android: work around limitations of c++-20 support in NDK
-
-may be necessary for NDK 25, they are no longer for NDK 26,
-and even break the build with NDK 26:
-
- C/C++: .../zxing-cpp/core/src/Generator.h:103:7: error: reference to
'default_sentinel_t' is ambiguous
- C/C++: std::default_sentinel_t end() { return {}; }
- C/C++: ^
- C/C++:
.../Android/Sdk/ndk/26.1.10909125/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/c++/v1/__iterator/default_sentinel.h:23:8:
note: candidate found by name lookup is 'std::__ndk1::default_sentinel_t'
- C/C++: struct default_sentinel_t { };
- C/C++: ^
- C/C++: .../zxing-cpp/core/src/Generator.h:15:9: note: candidate found by
name lookup is 'std::default_sentinel_t'
- C/C++: struct default_sentinel_t {};
- C/C++: ^
- C/C++: 2 errors generated.
-
-Restrict the workaround to NDK version < 26 to fix this.
-
-Fixes: #673
----
- core/src/Generator.h | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/core/src/Generator.h b/core/src/Generator.h
-index 7a1fd179..a5083e9d 100644
---- a/core/src/Generator.h
-+++ b/core/src/Generator.h
-@@ -5,8 +5,12 @@
-
- #pragma once
-
--#ifdef __cpp_impl_coroutine
- #ifdef __ANDROID__
-+#include <android/ndk-version.h>
-+#endif
-+
-+#ifdef __cpp_impl_coroutine
-+#if defined __ANDROID__ && __NDK_MAJOR__ < 26
- // NDK 25.1.8937393 can compile this code with c++20 but needs a few tweaks:
- #include <experimental/coroutine>
- namespace std {
-@@ -25,7 +29,7 @@ namespace std {
- // this code is based on
https://en.cppreference.com/w/cpp/coroutine/coroutine_handle#Example
- // but modified trying to prevent accidental copying of generated objects
-
--#ifdef __ANDROID__
-+#if defined __ANDROID__ && __NDK_MAJOR__ < 26
- template <class T>
- #else
- template <std::movable T>
---
-2.42.0
-
diff --git a/external/zxing/README b/external/zxing/README
index 1ca49cbc00a6..cc60be0ed3ef 100644
--- a/external/zxing/README
+++ b/external/zxing/README
@@ -1,3 +1,3 @@
-Qr code generation library availaible from
[https://github.com/nu-book/zxing-cpp]
+Qr code generation library availaible from
[https://github.com/zxing-cpp/zxing-cpp].
-Qr code generator to make a QR code out of a provided link or text in
LibreOffice.
\ No newline at end of file
+Qr code generator to make a QR code out of a provided link or text in
LibreOffice.
diff --git a/external/zxing/StaticLibrary_zxing.mk
b/external/zxing/StaticLibrary_zxing.mk
index f9d031e35541..56d49accd075 100644
--- a/external/zxing/StaticLibrary_zxing.mk
+++ b/external/zxing/StaticLibrary_zxing.mk
@@ -41,7 +41,6 @@ $(eval $(call
gb_StaticLibrary_add_generated_exception_objects,zxing,\
UnpackedTarball/zxing/core/src/CharacterSet \
UnpackedTarball/zxing/core/src/ConcentricFinder \
UnpackedTarball/zxing/core/src/Content \
- UnpackedTarball/zxing/core/src/DecodeHints \
UnpackedTarball/zxing/core/src/datamatrix/DMBitLayout \
UnpackedTarball/zxing/core/src/datamatrix/DMDataBlock \
UnpackedTarball/zxing/core/src/datamatrix/DMDecoder \
@@ -58,6 +57,7 @@ $(eval $(call
gb_StaticLibrary_add_generated_exception_objects,zxing,\
UnpackedTarball/zxing/core/src/GlobalHistogramBinarizer \
UnpackedTarball/zxing/core/src/GridSampler \
UnpackedTarball/zxing/core/src/GTIN \
+ UnpackedTarball/zxing/core/src/HRI \
UnpackedTarball/zxing/core/src/HybridBinarizer \
UnpackedTarball/zxing/core/src/maxicode/MCBitMatrixParser \
UnpackedTarball/zxing/core/src/maxicode/MCDecoder \
@@ -117,10 +117,10 @@ $(eval $(call
gb_StaticLibrary_add_generated_exception_objects,zxing,\
UnpackedTarball/zxing/core/src/qrcode/QRWriter \
UnpackedTarball/zxing/core/src/qrcode/QRVersion \
UnpackedTarball/zxing/core/src/ReadBarcode \
- UnpackedTarball/zxing/core/src/Result \
- UnpackedTarball/zxing/core/src/ResultPoint \
UnpackedTarball/zxing/core/src/ReedSolomonDecoder \
UnpackedTarball/zxing/core/src/ReedSolomonEncoder \
+ UnpackedTarball/zxing/core/src/Result \
+ UnpackedTarball/zxing/core/src/ResultPoint \
UnpackedTarball/zxing/core/src/TextDecoder \
UnpackedTarball/zxing/core/src/TextEncoder \
UnpackedTarball/zxing/core/src/TextUtfEncoding \
diff --git a/external/zxing/UnpackedTarball_zxing.mk
b/external/zxing/UnpackedTarball_zxing.mk
index 0a81505463c0..08a7943818be 100644
--- a/external/zxing/UnpackedTarball_zxing.mk
+++ b/external/zxing/UnpackedTarball_zxing.mk
@@ -13,10 +13,8 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,zxing,$(ZXING_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,zxing,1))
-# patch 0001-android-Fix-build-with-NDK-26.patch is backport of
-# upstream commit
https://github.com/zxing-cpp/zxing-cpp/commit/295b193b0105e68bb24747aefbff2653df892b4c
$(eval $(call gb_UnpackedTarball_add_patches,zxing, \
- external/zxing/0001-android-Fix-build-with-NDK-26.patch \
+ external/zxing/0001-add-ZXVersion-h.patch \
))
# vim: set noet sw=4 ts=4:
