[neon/backports-jammy/zxing-cpp-jammy/Neon/unstable] debian/patches: fix patches

[Carlos De Maine]

Git commit 86a4e37bd8c09b1c4d06338d93e94e99fd18fb02 by Carlos De Maine.
Committed on 17/01/2023 at 03:54.
Pushed by carlosdem into branch 'Neon/unstable'.

fix patches

M  +1    -1    debian/patches/0003-Disable-tests-without-test-file.patch
D  +0    -57   debian/patches/0005-test-update-to-libfmt-v9.0.0.patch
M  +6    -3    debian/patches/0006-install-examples.patch

https://invent.kde.org/neon/backports-jammy/zxing-cpp-jammy/commit/86a4e37bd8c09b1c4d06338d93e94e99fd18fb02

diff --git a/debian/patches/0003-Disable-tests-without-test-file.patch b/debian/patches/0003-Disable-tests-without-test-file.patch
index 5b2316d..ee8014e 100644
--- a/debian/patches/0003-Disable-tests-without-test-file.patch
+++ b/debian/patches/0003-Disable-tests-without-test-file.patch
@@ -33,4 +33,4 @@ index 2d7d9e3..9bd0e89 100644
 +#    add_test(NAME ReaderTest COMMAND ReaderTest ${CMAKE_CURRENT_SOURCE_DIR}/../samples)
  endif()
  
- if (BUILD_WRITERS)
+ if (BUILD_WRITERS)
\ No newline at end of file
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
deleted file mode 100644
index 176d295..0000000
--- a/debian/patches/0005-test-update-to-libfmt-v9.0.0.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-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/0006-install-examples.patch b/debian/patches/0006-install-examples.patch
index e2bfb0a..80d144f 100644
--- a/debian/patches/0006-install-examples.patch
+++ b/debian/patches/0006-install-examples.patch
@@ -9,12 +9,15 @@ Author: Johannes Schauer Marin Rodrigues <josch at debian.org>
          target_link_libraries(ZXingQtCamReader ZXing::ZXing Qt::Gui Qt::Multimedia Qt::Quick)
 +        install(TARGETS ZXingQtCamReader DESTINATION ${CMAKE_INSTALL_BINDIR})
      endif()
- 
+
      find_package(OpenCV)
 @@ -45,5 +46,6 @@ if (BUILD_READERS)
          add_executable (ZXingOpenCV ZXingOpenCV.cpp)
          target_include_directories (ZXingOpenCV PRIVATE ${OpenCV_INCLUDE_DIRS})
          target_link_libraries (ZXingOpenCV ZXing::ZXing ${OpenCV_LIBS})
 +        install(TARGETS ZXingOpenCV DESTINATION ${CMAKE_INSTALL_BINDIR})
-     endif()
- endif()
+     else ()
+        message("INFO: OpenCV not found, skipping ZXingOpenCV example")
+    endif()
+endif()
+