bin/find-unneeded-includes | 4 ++--
cui/source/dialogs/QrCodeGenDialog.cxx | 2 +-
download.lst | 4 ++--
external/zxing/0001-add-ZXVersion-h.patch | 8 ++++----
external/zxing/StaticLibrary_zxing.mk | 11 ++++++++---
external/zxing/UnpackedTarball_zxing.mk | 3 ---
external/zxing/inc/pch/precompiled_zxing.hxx | 5 +++--
external/zxing/include.patch.0 | 10 ----------
8 files changed, 20 insertions(+), 27 deletions(-)
New commits:
commit fc5e50519ef76ad74408410b45c312997faa1dab
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Thu Jan 2 10:32:34 2025 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Thu Jan 2 14:21:00 2025 +0100
zxing-cpp: Upgrade to 2.3.0
Downloaded from
https://github.com/zxing-cpp/zxing-cpp/archive/refs/tags/v2.3.0.tar.gz
Change-Id: I79a9d63cfafb44d733231b78bc19a45b43baa6b7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179604
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
Tested-by: Jenkins
diff --git a/cui/source/dialogs/QrCodeGenDialog.cxx
b/cui/source/dialogs/QrCodeGenDialog.cxx
index 938800692b6d..f5161458f4c5 100644
--- a/cui/source/dialogs/QrCodeGenDialog.cxx
+++ b/cui/source/dialogs/QrCodeGenDialog.cxx
@@ -19,7 +19,7 @@
#include <vcl/svapp.hxx>
#if ENABLE_ZXING
-#include <ZXVersion.h>
+#include <Version.h>
#include <rtl/strbuf.hxx>
#ifdef __GNUC__
diff --git a/download.lst b/download.lst
index a98fff073773..ab9ad6661a27 100644
--- a/download.lst
+++ b/download.lst
@@ -685,8 +685,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 :=
02078ae15f19f9d423a441f205b1d1bee32349ddda7467e2c84e8f08876f8635
-ZXING_TARBALL := zxing-cpp-2.2.1.tar.gz
+ZXING_SHA256SUM :=
64e4139103fdbc57752698ee15b5f0b0f7af9a0331ecbdc492047e0772c417ba
+ZXING_TARBALL := zxing-cpp-2.3.0.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
index 88b779e2cfd7..8dc13af3d5a4 100644
--- a/external/zxing/0001-add-ZXVersion-h.patch
+++ b/external/zxing/0001-add-ZXVersion-h.patch
@@ -1,5 +1,5 @@
--- /dev/null 2023-12-10 14:00:18.140142051 +0100
-+++ a/core/src/ZXVersion.h 2023-12-22 21:38:22.466302568 +0100
++++ a/core/src/Version.h 2023-12-22 21:38:22.466302568 +0100
@@ -0,0 +1,18 @@
+/*
+* Copyright 2019 Nu-book Inc.
@@ -11,11 +11,11 @@
+
+// Version numbering
+#define ZXING_VERSION_MAJOR 2
-+#define ZXING_VERSION_MINOR 2
-+#define ZXING_VERSION_PATCH 1
++#define ZXING_VERSION_MINOR 3
++#define ZXING_VERSION_PATCH 0
+
+namespace ZXing {
+
-+constexpr const char* ZXING_VERSION_STR = "2.2.1";
++constexpr const char* ZXING_VERSION_STR = "2.3.0";
+
+}
diff --git a/external/zxing/StaticLibrary_zxing.mk
b/external/zxing/StaticLibrary_zxing.mk
index 07858dd68b03..44eb0de84194 100644
--- a/external/zxing/StaticLibrary_zxing.mk
+++ b/external/zxing/StaticLibrary_zxing.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_StaticLibrary_set_include,zxing,\
# The list below is created with
# find workdir/UnpackedTarball/zxing/core/ -name "*.cpp" ! -name
'*DecodeHints.cpp' | LC_COLLATE=C sort | sed -e 's/^/ /' -e 's/$/ \/' -e
's/workdir\///' -e 's/\.cpp//'
$(eval $(call gb_StaticLibrary_add_generated_exception_objects,zxing,\
+ UnpackedTarball/zxing/core/src/Barcode \
UnpackedTarball/zxing/core/src/BarcodeFormat \
UnpackedTarball/zxing/core/src/BinaryBitmap \
UnpackedTarball/zxing/core/src/BitArray \
@@ -37,6 +38,7 @@ $(eval $(call
gb_StaticLibrary_add_generated_exception_objects,zxing,\
UnpackedTarball/zxing/core/src/ConcentricFinder \
UnpackedTarball/zxing/core/src/Content \
UnpackedTarball/zxing/core/src/ECI \
+ UnpackedTarball/zxing/core/src/Error \
UnpackedTarball/zxing/core/src/GTIN \
UnpackedTarball/zxing/core/src/GenericGF \
UnpackedTarball/zxing/core/src/GenericGFPoly \
@@ -50,14 +52,15 @@ $(eval $(call
gb_StaticLibrary_add_generated_exception_objects,zxing,\
UnpackedTarball/zxing/core/src/ReadBarcode \
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 \
UnpackedTarball/zxing/core/src/Utf \
UnpackedTarball/zxing/core/src/WhiteRectDetector \
- UnpackedTarball/zxing/core/src/ZXBigInteger \
+ UnpackedTarball/zxing/core/src/WriteBarcode \
+ UnpackedTarball/zxing/core/src/ZXingC \
+ UnpackedTarball/zxing/core/src/ZXingCpp \
UnpackedTarball/zxing/core/src/aztec/AZDecoder \
UnpackedTarball/zxing/core/src/aztec/AZDetector \
UnpackedTarball/zxing/core/src/aztec/AZEncoder \
@@ -87,9 +90,11 @@ $(eval $(call
gb_StaticLibrary_add_generated_exception_objects,zxing,\
UnpackedTarball/zxing/core/src/oned/ODCode39Writer \
UnpackedTarball/zxing/core/src/oned/ODCode93Reader \
UnpackedTarball/zxing/core/src/oned/ODCode93Writer \
+ UnpackedTarball/zxing/core/src/oned/ODDXFilmEdgeReader \
UnpackedTarball/zxing/core/src/oned/ODDataBarCommon \
UnpackedTarball/zxing/core/src/oned/ODDataBarExpandedBitDecoder \
UnpackedTarball/zxing/core/src/oned/ODDataBarExpandedReader \
+ UnpackedTarball/zxing/core/src/oned/ODDataBarLimitedReader \
UnpackedTarball/zxing/core/src/oned/ODDataBarReader \
UnpackedTarball/zxing/core/src/oned/ODEAN13Writer \
UnpackedTarball/zxing/core/src/oned/ODEAN8Writer \
@@ -97,7 +102,6 @@ $(eval $(call
gb_StaticLibrary_add_generated_exception_objects,zxing,\
UnpackedTarball/zxing/core/src/oned/ODITFWriter \
UnpackedTarball/zxing/core/src/oned/ODMultiUPCEANReader \
UnpackedTarball/zxing/core/src/oned/ODReader \
- UnpackedTarball/zxing/core/src/oned/ODRowReader \
UnpackedTarball/zxing/core/src/oned/ODUPCAWriter \
UnpackedTarball/zxing/core/src/oned/ODUPCEANCommon \
UnpackedTarball/zxing/core/src/oned/ODUPCEWriter \
@@ -116,6 +120,7 @@ $(eval $(call
gb_StaticLibrary_add_generated_exception_objects,zxing,\
UnpackedTarball/zxing/core/src/pdf417/PDFReader \
UnpackedTarball/zxing/core/src/pdf417/PDFScanningDecoder \
UnpackedTarball/zxing/core/src/pdf417/PDFWriter \
+ UnpackedTarball/zxing/core/src/pdf417/ZXBigInteger \
UnpackedTarball/zxing/core/src/qrcode/QRBitMatrixParser \
UnpackedTarball/zxing/core/src/qrcode/QRCodecMode \
UnpackedTarball/zxing/core/src/qrcode/QRDataBlock \
diff --git a/external/zxing/UnpackedTarball_zxing.mk
b/external/zxing/UnpackedTarball_zxing.mk
index 1d15a1c10781..08a7943818be 100644
--- a/external/zxing/UnpackedTarball_zxing.mk
+++ b/external/zxing/UnpackedTarball_zxing.mk
@@ -13,11 +13,8 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,zxing,$(ZXING_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,zxing,1))
-# * external/zxing/include.patch.0 sent upstream as
-# <https://github.com/zxing-cpp/zxing-cpp/pull/864> "Missing include (for
std::nullptr_t)":
$(eval $(call gb_UnpackedTarball_add_patches,zxing, \
external/zxing/0001-add-ZXVersion-h.patch \
- external/zxing/include.patch.0 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/zxing/inc/pch/precompiled_zxing.hxx
b/external/zxing/inc/pch/precompiled_zxing.hxx
index a414646f118b..4ab1b7042889 100644
--- a/external/zxing/inc/pch/precompiled_zxing.hxx
+++ b/external/zxing/inc/pch/precompiled_zxing.hxx
@@ -13,7 +13,7 @@
manual changes will be rewritten by the next run of update_pch.sh (which
presumably
also fixes all possible problems, so it's usually better to use it).
- Generated on 2023-07-09 00:00:16 using:
+ Generated on 2025-01-02 12:16:27 using:
./bin/update_pch external/zxing zxing --cutoff=1 --exclude:system
--include:module --include:local
If after updating build fails, use the following command to locate
conflicting headers:
@@ -32,9 +32,9 @@
#include <cstdint>
#include <cstdlib>
#include <cstring>
+#include <exception>
#include <fstream>
#include <functional>
-#include <initializer_list>
#include <iomanip>
#include <iterator>
#include <limits>
@@ -47,6 +47,7 @@
#include <sstream>
#include <stdexcept>
#include <string>
+#include <string_view>
#include <unordered_set>
#include <utility>
#include <vector>
diff --git a/external/zxing/include.patch.0 b/external/zxing/include.patch.0
deleted file mode 100644
index 77dad56b66a5..000000000000
--- a/external/zxing/include.patch.0
+++ /dev/null
@@ -1,10 +0,0 @@
---- core/src/ZXNullable.h
-+++ core/src/ZXNullable.h
-@@ -5,6 +5,7 @@
-
- #pragma once
-
-+#include <cstddef>
- #include <stdexcept>
- #include <utility>
-
commit 1a9572e5057dfce1dfd65ac3478255df6eb19e62
Author: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
AuthorDate: Tue Dec 24 18:08:36 2024 +0100
Commit: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
CommitDate: Thu Jan 2 14:20:48 2025 +0100
Sort bin/find-unneeded-includes results
not naturally, but numerically
so a hit in line 101 will be listed after the hit in line 99
not after the one in line 10
Change-Id: Ic5b3da80df20a3aeda7b1a71c8d6380371ed3ee8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179320
Reviewed-by: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
Tested-by: Jenkins
diff --git a/bin/find-unneeded-includes b/bin/find-unneeded-includes
index e93d62f38b8b..ec0a620c9090 100755
--- a/bin/find-unneeded-includes
+++ b/bin/find-unneeded-includes
@@ -410,10 +410,10 @@ def processIWYUOutput(iwyuOutput, moduleRules, fileName,
noexclude, checknamespa
subprocess.run(["git", "grep", "-n",
"namespace.*[^a-zA-Z]"+nameSpace+" *;", fileName])
if removefwdd:
- for remove in sorted(toRemove):
+ for remove in sorted(toRemove, key=lambda x: int(x.split(":")[1])):
print("ERROR: %s: remove not needed forward declaration" % remove)
else:
- for remove in sorted(toRemove):
+ for remove in sorted(toRemove, key=lambda x: int(x.split(":")[1])):
print("ERROR: %s: remove not needed include" % remove)
return len(toRemove)
