[neon/backports-jammy/zxing-cpp-jammy/Neon/release] debian: add changes from 1.4.0-1~exp2.1

[Carlos De Maine]

Git commit 6f7689e1579e2cd00461fbf6059413a2aa179870 by Carlos De Maine.
Committed on 16/01/2023 at 11:49.
Pushed by carlosdem into branch 'Neon/release'.

add changes from 1.4.0-1~exp2.1

M  +8    -1    debian/changelog
A  +57   -0    debian/patches/0005-test-update-to-libfmt-v9.0.0.patch
A  +5    -0    debian/patches/series

https://invent.kde.org/neon/backports-jammy/zxing-cpp-jammy/commit/6f7689e1579e2cd00461fbf6059413a2aa179870

diff --git a/debian/changelog b/debian/changelog
index 828323a..8f44671 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,14 @@ zxing-cpp (1.4.0-1) UNRELEASED; urgency=medium
   * debian/control: Build-depends on python3-dev instead of python3-all-dev.
     (Closes: #1024316)
 
- -- Johannes Schauer Marin Rodrigues <josch at debian.org>  Thu, 29 Dec 2022 17:25:24 +0100
+ -- Johannes Schauer Marin Rodrigues <josch at debian.org>  Thu, 29 Dec 2022 17:38:49 +0100
+
+zxing-cpp (1.4.0-1~exp2.1) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * add patch from upstream to work with libfmt v9.0.0 (closes: #1021686)
+
+ -- Johannes Schauer Marin Rodrigues <josch at debian.org>  Mon, 26 Dec 2022 22:19:47 +0100
 
 zxing-cpp (1.4.0-1~exp2) experimental; urgency=medium
 
diff --git a/debian/patches/0005-test-update-to-libfmt-v9.0.0.patch b/debian/patches/0005-test-update-to-libfmt-v9.0.0.patch
new file mode 100644
index 0000000..176d295
--- /dev/null
+++ b/debian/patches/0005-test-update-to-libfmt-v9.0.0.patch
@@ -0,0 +1,57 @@
+From 40d29c20418646a5e9ad372d34dd1d3fcf99d86a Mon Sep 17 00:00:00 2001
+From: axxel <awagger at gmail.com>
+Date: Tue, 26 Jul 2022 22:42:00 +0200
+Subject: [PATCH] test: update to libfmt v9.0.0
+
+---
+ test/blackbox/BlackboxTestRunner.cpp | 8 ++++----
+ test/blackbox/CMakeLists.txt         | 2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/test/blackbox/BlackboxTestRunner.cpp b/test/blackbox/BlackboxTestRunner.cpp
+index aec499f..1a697c2 100644
+--- a/test/blackbox/BlackboxTestRunner.cpp
++++ b/test/blackbox/BlackboxTestRunner.cpp
+@@ -211,8 +211,7 @@ static void doRunTests(const fs::path& directory, std::string_view format, int t
+ 	auto folderName = directory.stem();
+ 
+ 	if (Size(imgPaths) != totalTests)
+-		fmt::print("TEST {} => Expected number of tests: {}, got: {} => FAILED\n", folderName, totalTests,
+-				   imgPaths.size());
++		fmt::print("TEST {} => Expected number of tests: {}, got: {} => FAILED\n", folderName.string(), totalTests, imgPaths.size());
+ 
+ 	for (auto& test : tests) {
+ 		fmt::print("{:20} @ {:3}, {:3}", folderName.string(), test.rotation, Size(imgPaths));
+@@ -270,7 +269,8 @@ static void doRunStructuredAppendTest(const fs::path& directory, std::string_vie
+ 	}
+ 
+ 	if (Size(imageGroups) != totalTests)
+-		fmt::print("TEST {} => Expected number of tests: {}, got: {} => FAILED\n", folderName, totalTests, imageGroups.size());
++		fmt::print("TEST {} => Expected number of tests: {}, got: {} => FAILED\n", folderName.string(), totalTests,
++				   imageGroups.size());
+ 
+ 	for (auto& test : tests) {
+ 		fmt::print("{:20} @ {:3}, {:3}", folderName.string(), test.rotation, Size(imgPaths));
+@@ -481,7 +481,7 @@ int runBlackBoxTests(const fs::path& testPathPrefix, const std::set<std::string>
+ 			{ 17, 20, 0   },
+ 			{ 18, 20, 180 },
+ 		});
+-		
++
+ 		runTests("upca-extension-1", "UPC-A", 6, {
+ 			{ 4, 4, 0 },
+ 			{ 3, 4, 180 },
+diff --git a/test/blackbox/CMakeLists.txt b/test/blackbox/CMakeLists.txt
+index 2d7d9e3..1c8b43e 100644
+--- a/test/blackbox/CMakeLists.txt
++++ b/test/blackbox/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ zxing_add_package_stb()
+-zxing_add_package(fmt fmtlib https://github.com/fmtlib/fmt.git 8.1.1)
++zxing_add_package(fmt fmtlib https://github.com/fmtlib/fmt.git 9.0.0)
+ 
+ if (BUILD_READERS)
+     add_executable (ReaderTest
+-- 
+2.37.2
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7d742b3
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,5 @@
+0001-CMakeLists.txt-Use-top-level-GNUInstallDirs.patch
+0002-fix-python-wrapper-build.patch
+0003-Disable-tests-without-test-file.patch
+0004-Bump-SONAME-to-2.patch
+0005-test-update-to-libfmt-v9.0.0.patch