download.lst | 4 +-- external/zxing/0001-add-ZXVersion-h.patch | 4 +-- external/zxing/UnpackedTarball_zxing.mk | 1 external/zxing/gcc12-format.patch | 35 ------------------------------ 4 files changed, 4 insertions(+), 40 deletions(-)
New commits: commit 1e1a0d4d473b3bb128d8a5e92d8c3eb5eb54b2cc Author: Xisco Fauli <[email protected]> AuthorDate: Thu Feb 19 13:18:15 2026 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Thu Feb 19 15:44:17 2026 +0100 zxing-cpp: upgrade to 3.0.2 * gcc12-format.patch has been fixed upstream Downloaded from https://github.com/zxing-cpp/zxing-cpp/releases/download/v3.0.2/zxing-cpp-3.0.2.tar.gz Change-Id: I028fa07c520c8eb79440863bcdd20fa54edd6aa8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199718 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins diff --git a/download.lst b/download.lst index 012311b9cea6..db29cdbd1a27 100644 --- a/download.lst +++ b/download.lst @@ -721,8 +721,8 @@ ZXCVBN_C_TARBALL := zxcvbn-c-2.6.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -ZXING_SHA256SUM := bfea8f8ebc8e04e5c4a57e5cbdc302d05c72b916d142564b6d14f01050bb93d4 -ZXING_TARBALL := zxing-cpp-3.0.0.tar.gz +ZXING_SHA256SUM := e957f13e2ad4e31badb3d9af3f6ba8999a3ca3c9cc4d6bafc98032f9cce1a090 +ZXING_TARBALL := zxing-cpp-3.0.2.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 f1f039d4d108..9f11bb1e1c14 100644 --- a/external/zxing/0001-add-ZXVersion-h.patch +++ b/external/zxing/0001-add-ZXVersion-h.patch @@ -27,8 +27,8 @@ +// Version numbering +#define ZXING_VERSION_MAJOR 3 +#define ZXING_VERSION_MINOR 0 -+#define ZXING_VERSION_PATCH 0 ++#define ZXING_VERSION_PATCH 2 +#define ZXING_VERSION_SUFFIX "" + -+#define ZXING_VERSION_STR "3.0.0" ++#define ZXING_VERSION_STR "3.0.2" diff --git a/external/zxing/UnpackedTarball_zxing.mk b/external/zxing/UnpackedTarball_zxing.mk index e0f99e7c0c3e..c1f754bcfede 100644 --- a/external/zxing/UnpackedTarball_zxing.mk +++ b/external/zxing/UnpackedTarball_zxing.mk @@ -13,7 +13,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,zxing,$(ZXING_TARBALL))) $(eval $(call gb_UnpackedTarball_add_patches,zxing, \ external/zxing/0001-add-ZXVersion-h.patch \ - external/zxing/gcc12-format.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/external/zxing/gcc12-format.patch b/external/zxing/gcc12-format.patch deleted file mode 100644 index dd731cfc821d..000000000000 --- a/external/zxing/gcc12-format.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- /dev/null 2023-12-10 14:00:18.140142051 +0100 -+++ a/core/src/Version.h 2023-12-22 21:38:22.466302568 +0100 ---- zxing/core/src/BarcodeFormat.cpp 2026-02-11 12:34:03.089993797 +0100 -+++ zxing/core/src/BarcodeFormat.cpp 2026-02-11 12:34:12.849941196 +0100 -@@ -9,7 +9,6 @@ - #include "ZXAlgorithms.h" - - #include <algorithm> --#include <format> - - namespace ZXing { - ---- zxing/core/src/GTIN.cpp 2026-02-11 12:36:55.685059936 +0100 -+++ zxing/core/src/GTIN.cpp 2026-02-11 12:38:19.324604946 +0100 -@@ -7,7 +7,6 @@ - #include "GTIN.h" - - #include <algorithm> --#include <format> - #include <iomanip> - #include <iterator> - #include <string> -@@ -241,11 +240,7 @@ - } - - int rawAmount = std::stoi(ean5AddOn.substr(1)); --#ifndef __cpp_lib_to_chars // not available on older macOS - return currency + std::to_string(rawAmount / 100) + '.' + std::to_string(rawAmount % 100); --#else -- return std::format("{}{:.2f}", currency, float(rawAmount) / 100); --#endif - } - - } // namespace ZXing::GTIN -
