diff --git a/cmake.patch b/cmake.patch index 08dc510..1b4e303 100644 --- a/cmake.patch +++ b/cmake.patch @@ -1,13 +1,14 @@ -diff -ru orig/CMakeLists.txt mod/CMakeLists.txt ---- orig/CMakeLists.txt 2023-07-05 18:25:57.000000000 +0200 -+++ mod/CMakeLists.txt 2023-10-06 08:29:27.429624816 +0200 +Index: zxing-cpp-2.2.1/CMakeLists.txt +=================================================================== +--- zxing-cpp-2.2.1.orig/CMakeLists.txt ++++ zxing-cpp-2.2.1/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.15) +cmake_minimum_required(VERSION 3.5) project(ZXing) -@@ -37,9 +37,6 @@ +@@ -37,9 +37,6 @@ if (BUILD_SHARED_LIBS) set (CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) endif() @@ -17,16 +18,17 @@ diff -ru orig/CMakeLists.txt mod/CMakeLists.txt if (NOT CMAKE_CXX_EXTENSIONS) set (CMAKE_CXX_EXTENSIONS OFF) endif() -diff -ru orig/core/CMakeLists.txt mod/core/CMakeLists.txt ---- orig/core/CMakeLists.txt 2023-07-05 18:25:57.000000000 +0200 -+++ mod/core/CMakeLists.txt 2023-10-06 08:29:35.169666650 +0200 +Index: zxing-cpp-2.2.1/core/CMakeLists.txt +=================================================================== +--- zxing-cpp-2.2.1.orig/core/CMakeLists.txt ++++ zxing-cpp-2.2.1/core/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.15) +cmake_minimum_required(VERSION 3.5) - project (ZXing VERSION "2.1.0") + project (ZXing VERSION "2.2.1") set (ZXING_SONAME 3) # see https://github.com/zxing-cpp/zxing-cpp/issues/333 -@@ -459,8 +459,6 @@ +@@ -464,8 +464,6 @@ if (COMPILER_NEEDS_FLOAT_STORE) ) endif() diff --git a/zxing-cpp-2.1.0.tar.gz b/zxing-cpp-2.1.0.tar.gz deleted file mode 100644 index 45b98c1..0000000 --- a/zxing-cpp-2.1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6d54e403592ec7a143791c6526c1baafddf4c0897bb49b1af72b70a0f0c4a3fe -size 866787 diff --git a/zxing-cpp-2.2.1.tar.gz b/zxing-cpp-2.2.1.tar.gz new file mode 100644 index 0000000..d68252f --- /dev/null +++ b/zxing-cpp-2.2.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:02078ae15f19f9d423a441f205b1d1bee32349ddda7467e2c84e8f08876f8635 +size 891055 diff --git a/zxing-cpp.changes b/zxing-cpp.changes index 1aa2321..aa21493 100644 --- a/zxing-cpp.changes +++ b/zxing-cpp.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Sep 2 21:46:34 UTC 2024 - Martin Schreiner + +- Update to 2.2.1. Changes: + * Fix ABI breakage from 2.2.0. +- Changes from 2.2.0: + * Rename DecodeHints to ReaderOptions. The old name is still available for + backward API compatibility but deprecated. Since the C-API and the Qt + wrapper code are not officially part of the library, they changed without + backward compatibility. + * WASM: bytes in ReadResult. + * DataMatrix: use charset for encoding. + * QRCode: Support QR Code Model1. + * rMQR Code: Support Rectangular Micro QR Code. +- Refresh patch: + * cmake.patch + ------------------------------------------------------------------- Thu Nov 30 14:32:19 UTC 2023 - Guillaume GARDET diff --git a/zxing-cpp.spec b/zxing-cpp.spec index e97af5c..2bd7013 100644 --- a/zxing-cpp.spec +++ b/zxing-cpp.spec @@ -1,7 +1,7 @@ # # spec file for package zxing-cpp # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %define sover 3 Name: zxing-cpp -Version: 2.1.0 +Version: 2.2.1 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