From e41029dc8be3c2c3c6509ae4f7106b348af42804 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Sat, 15 Feb 2025 19:06:52 +0100 Subject: [PATCH] update to 2.3.0 (rhbz#2253860) --- .gitignore | 1 + sources | 2 +- zxing-cpp.spec | 14 ++++++++++---- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 4bff504..5338394 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /zxing-cpp-2.0.0.tar.gz /zxing-cpp-2.2.1.tar.gz +/zxing-cpp-2.3.0.tar.gz diff --git a/sources b/sources index be224d4..8211feb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zxing-cpp-2.2.1.tar.gz) = f1de8df783061a152a18cd9102ac0c579c40c76ab4a5ba9f30bcb8ddb532f3fac08736840a631adbf7c30a7fa00ce8d65625c8cd695288620601708e8f256a53 +SHA512 (zxing-cpp-2.3.0.tar.gz) = be1c60a6b433c18f8dab56619553023370bfd3eddf49b0e16548466e1ebc2f1f37b48e0b36c2e74296a7274c4f0117d7052f1ffd7d1223d23e493451a11b4a80 diff --git a/zxing-cpp.spec b/zxing-cpp.spec index e08e8d4..5268133 100644 --- a/zxing-cpp.spec +++ b/zxing-cpp.spec @@ -1,5 +1,5 @@ Name: zxing-cpp -Version: 2.2.1 +Version: 2.3.0 Release: %autorelease Summary: C++ port of the ZXing ("Zebra Crossing") barcode scanning library @@ -12,6 +12,8 @@ Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz BuildRequires: gcc-c++ BuildRequires: cmake BuildRequires: cmake(fmt) +BuildRequires: cmake(zint) +BuildRequires: pkgconfig(libpng) %description ZXing-C++ ("zebra crossing") is an open-source, multi-format 1D/2D barcode @@ -46,7 +48,10 @@ sed -r -i 's@(COMMAND )python@\1%{python3}@' wrappers/python/CMakeLists.txt sed -r -i '/cmake/d' wrappers/python/pyproject.toml sed -i 's/pybind11\[global\]/pybind11/' wrappers/python/pyproject.toml -# build verbosely: + +# set same CMAKE flags for extension as for module +sed -i -e '/ZXING_USE_BUNDLED_ZINT/ s/ON/OFF/' wrappers/python/CMakeLists.txt +sed -i -e '/ZXING_EXPERIMENTAL_API/ s/OFF/ON/' wrappers/python/CMakeLists.txt %generate_buildrequires pushd wrappers/python &>/dev/null @@ -63,8 +68,9 @@ popd &>/dev/null # pybind11_add_module. %cmake \ -DZXING_DEPENDENCIES=LOCAL \ - -DBUILD_EXAMPLES=OFF \ - -DBUILD_PYTHON_MODULE=ON \ + -DZXING_EXAMPLES=OFF \ + -DZXING_PYTHON_MODULE=ON \ + -DZXING_USE_BUNDLED_ZINT=OFF \ -DCMAKE_BUILD_TYPE=RelWithDebInfo %cmake_build pushd wrappers/python