rpm/zxing-cpp
SHA256
1
0
Fork 0
forked from pool/zxing-cpp
Code Pull Requests Activity

Accepting request 1004902 from devel:libraries:c_c++

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1004902
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/zxing-cpp?expand=0&rev=11
This commit is contained in:
Dominique Leuenberger 2022-09-21 12:41:40 +00:00 committed by Git OBS Bridge
commit f920da1acf
3 changed files with 54 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
0001-test-update-to-libfmt-v9.0.0.patch Normal file
View File

@ -0,0 +1,44 @@
From 6dc756175003658cafb9039185a5094b9c157ba6 Mon Sep 17 00:00:00 2001
From: axxel <awagger@gmail.com>
Date: Tue, 26 Jul 2022 22:42:00 +0200
Subject: [PATCH] test: update to libfmt v9.0.0
---
test/blackbox/BlackboxTestRunner.cpp | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/test/blackbox/BlackboxTestRunner.cpp b/test/blackbox/BlackboxTestRunner.cpp
index 0df58ba..b8afe14 100644
--- a/test/blackbox/BlackboxTestRunner.cpp
+++ b/test/blackbox/BlackboxTestRunner.cpp
@@ -158,8 +158,7 @@ static void doRunTests(
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));
@@ -234,7 +233,7 @@ static void doRunStructuredAppendTest(
}
if (Size(imageGroups) != totalTests)
- fmt::print("TEST {} => Expected number of tests: {}, got: {} => FAILED\n", folderName, totalTests,
+ fmt::print("TEST {} => Expected number of tests: {}, got: {} => FAILED\n", folderName.string(), totalTests,
imageGroups.size());
for (auto& test : tests) {
@@ -445,7 +444,7 @@ int runBlackBoxTests(const fs::path& testPathPrefix, const std::set<std::string>
{ 17, 20, 0 },
{ 19, 20, 180 },
});
-
+
runTests("upca-extension-1", "UPC-A", 6, {
{ 3, 6, 0 },
{ 4, 6, 180 },
--
2.37.3

6
zxing-cpp.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Sep 20 07:10:22 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
- Add fmt 9.0 compatibility patch (boo#1202273):
* 0001-test-update-to-libfmt-v9.0.0.patch
-------------------------------------------------------------------
Mon Dec 13 14:14:53 UTC 2021 - Danilo Spinella <danilo.spinella@suse.com>

6
zxing-cpp.spec
View File

@ -30,6 +30,8 @@ Source99: baselibs.conf
Patch0: cmake-check-system-first.patch
# PATCH-FIX-UPSTREAM 269.patch -- Update stb_image/stb_image_write
Patch1: 269.patch
# PATCH-FIX-UPSTREAM 0001-test-update-to-libfmt-v9.0.0.patch -- fmt 9 compatibility
Patch2: 0001-test-update-to-libfmt-v9.0.0.patch
BuildRequires: pkgconfig
# Use cmake3 package on SLE12 because cmake is too old (version 3.5)
%if !0%{?is_opensuse} && 0%{?sle_version} < 150000
@ -83,9 +85,9 @@ other applications.
-DCMAKE_CXX_COMPILER=/usr/bin/g++-11 \
%endif
%if 0%{?suse_version} < 1550
-DBUILD_BLACKBOX_TESTS=OFF \
-DBUILD_BLACKBOX_TESTS=OFF
%endif
;
%cmake_build
%install