From 3b29e3494afd0134d6a94ba72b68f38a62065815f2f4fb95b0fced692fa07b9d Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Wed, 30 Jun 2021 15:35:36 +0000 Subject: [PATCH] Accepting request 903142 from home:susnux:branches:devel:libraries:c_c++ - Update to 1.2.0 OBS-URL: https://build.opensuse.org/request/show/903142 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/zxing-cpp?expand=0&rev=19 --- 0001-Fix-build-with-GCC-11.patch | 24 ------------------------ cmake-check-system-first.patch | 20 ++++++++++++++++++++ zxing-cpp-1.1.1.tar.gz | 3 --- zxing-cpp-1.2.0.tar.gz | 3 +++ zxing-cpp.changes | 21 +++++++++++++++++++++ zxing-cpp.spec | 19 +++++++++++++++---- 6 files changed, 59 insertions(+), 31 deletions(-) delete mode 100644 0001-Fix-build-with-GCC-11.patch create mode 100644 cmake-check-system-first.patch delete mode 100644 zxing-cpp-1.1.1.tar.gz create mode 100644 zxing-cpp-1.2.0.tar.gz diff --git a/0001-Fix-build-with-GCC-11.patch b/0001-Fix-build-with-GCC-11.patch deleted file mode 100644 index 999b3bc..0000000 --- a/0001-Fix-build-with-GCC-11.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 4766de0a8e6f780a04b03776d0c0380cb85935b8 Mon Sep 17 00:00:00 2001 -From: Christophe Giboudeaux -Date: Tue, 9 Feb 2021 09:14:00 +0100 -Subject: [PATCH] Fix build with GCC 11 - ---- - core/src/Pattern.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/core/src/Pattern.h b/core/src/Pattern.h -index 97093f0..87f340e 100644 ---- a/core/src/Pattern.h -+++ b/core/src/Pattern.h -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include - #include - --- -2.30.0 - diff --git a/cmake-check-system-first.patch b/cmake-check-system-first.patch new file mode 100644 index 0000000..16cefc3 --- /dev/null +++ b/cmake-check-system-first.patch @@ -0,0 +1,20 @@ +diff -Nur zxing-cpp-1.2.0/test/blackbox/CMakeLists.txt new/test/blackbox/CMakeLists.txt +--- zxing-cpp-1.2.0/test/blackbox/CMakeLists.txt 2021-05-28 12:47:09.000000000 +0200 ++++ new/test/blackbox/CMakeLists.txt 2021-05-29 13:34:47.707152999 +0200 +@@ -1,10 +1,13 @@ + cmake_minimum_required(VERSION 3.14) + +-include(FetchContent) +-FetchContent_Declare (fmtlib ++find_package(fmt 7.1.2) ++if (NOT fmt_FOUND) ++ include(FetchContent) ++ FetchContent_Declare (fmtlib + GIT_REPOSITORY https://github.com/fmtlib/fmt.git + GIT_TAG 7.1.2) +-FetchContent_MakeAvailable (fmtlib) # Adds fmt::fmt ++ FetchContent_MakeAvailable (fmtlib) # Adds fmt::fmt ++endif() + + if (BUILD_READERS) + add_executable (ReaderTest diff --git a/zxing-cpp-1.1.1.tar.gz b/zxing-cpp-1.1.1.tar.gz deleted file mode 100644 index 99b1f10..0000000 --- a/zxing-cpp-1.1.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e595b3fa2ec320beb0b28f6af56b1141853257c2611686685639cebb3b248c86 -size 128925736 diff --git a/zxing-cpp-1.2.0.tar.gz b/zxing-cpp-1.2.0.tar.gz new file mode 100644 index 0000000..360b5f3 --- /dev/null +++ b/zxing-cpp-1.2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:653d9e44195d86cf64a36af9ff3a1978ec5599df3882439fefa56e7064f55e8a +size 97942494 diff --git a/zxing-cpp.changes b/zxing-cpp.changes index 0add7da..8df5051 100644 --- a/zxing-cpp.changes +++ b/zxing-cpp.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Sat May 29 10:37:28 UTC 2021 - Ferdinand Thiessen + +- Update to 1.2.0 + * new BarcodeFormat names, old ones are deprecated + * new ZXingQtCamReader demo app based on QtMultimedia and QtQuick + * new QRCode reader, faster and better support for rotated symbols + * added Structured Append support for DataMatrix, Aztec and MaxiCode + * added DMRE support for DataMatrix + * switch to the reimplemented 1D detectors, about 5x faster + * a lot faster and more capable isPure detection for all 2D codes + * 20% faster ReedSolomon error correcting + * PDF417 is faster and supports flipped symbols + * reduced false positive rate for UPC/EAN barcodes and improved + Add-On symbol handling + * proper ECI handling in all 2D barcodes + * much improved python wrapper + * deprecate the use of ResultMetadata +- Add cmake-check-system-first.patch +- Drop upstream merged 0001-Fix-build-with-GCC-11.patch + ------------------------------------------------------------------- Tue Feb 9 07:50:14 UTC 2021 - Christophe Giboudeaux diff --git a/zxing-cpp.spec b/zxing-cpp.spec index 140a4f3..72b2cc4 100644 --- a/zxing-cpp.spec +++ b/zxing-cpp.spec @@ -18,19 +18,24 @@ %define sover 1 Name: zxing-cpp -Version: 1.1.1 +Version: 1.2.0 Release: 0 Summary: Library for processing 1D and 2D barcodes License: Apache-2.0 AND Zlib AND LGPL-2.1-with-Qt-Company-Qt-exception-1.1 Group: Development/Languages/C and C++ URL: https://github.com/nu-book/zxing-cpp/ -Source0: https://github.com/nu-book/zxing-cpp/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source0: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source99: baselibs.conf -# PATCH-FIX-UPSTREAM -Patch0: 0001-Fix-build-with-GCC-11.patch +# PATCH-FIX-OPENSUSE cmake-check-system-first.patch -- Search system for needed libraries first +Patch0: cmake-check-system-first.patch BuildRequires: cmake >= 3.10 BuildRequires: gcc-c++ BuildRequires: pkgconfig +# For tests using the example app +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Multimedia) +# For blackbox tests +BuildRequires: cmake(fmt) >= 7.1.2 %description ZXing ("zebra crossing") is an multi-format 1D/2D barcode image @@ -67,6 +72,12 @@ other applications. %install %cmake_install +%check +%if 0%{?sle_version} +export LD_LIBRARY_PATH=%{buildroot}%{_libdir} +%endif +%ctest + %post -n libZXing%{sover} -p /sbin/ldconfig %postun -n libZXing%{sover} -p /sbin/ldconfig