From e3bb1d69671101c168bad62cc177a63318d0b0b49a848903408f91eb92d789be Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 4 Nov 2021 09:54:43 +0000 Subject: [PATCH] Accepting request 929043 from home:dspinella:branches:devel:libraries:c_c++ - Use the updated cmake3-full package instead of cmake on SLE12 - Do not build examples on SLE12 - Only build blackbox tests on TW OBS-URL: https://build.opensuse.org/request/show/929043 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/zxing-cpp?expand=0&rev=20 --- zxing-cpp.changes | 7 +++++++ zxing-cpp.spec | 24 ++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/zxing-cpp.changes b/zxing-cpp.changes index 8df5051..d9219ae 100644 --- a/zxing-cpp.changes +++ b/zxing-cpp.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Nov 3 14:42:33 UTC 2021 - Danilo Spinella + +- Use the updated cmake3-full package instead of cmake on SLE12 +- Do not build examples on SLE12 +- Only build blackbox tests on TW + ------------------------------------------------------------------- Sat May 29 10:37:28 UTC 2021 - Ferdinand Thiessen diff --git a/zxing-cpp.spec b/zxing-cpp.spec index 72b2cc4..4aef9cd 100644 --- a/zxing-cpp.spec +++ b/zxing-cpp.spec @@ -28,14 +28,23 @@ Source0: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source99: baselibs.conf # PATCH-FIX-OPENSUSE cmake-check-system-first.patch -- Search system for needed libraries first Patch0: cmake-check-system-first.patch +BuildRequires: pkgconfig +# Use cmake3 package on SLE12 because cmake is too old (version 3.5) +%if !0%{?is_opensuse} && 0%{?sle_version} < 150000 +BuildRequires: cmake3-full >= 3.10 +BuildRequires: gcc11-c++ +%else BuildRequires: cmake >= 3.10 BuildRequires: gcc-c++ -BuildRequires: pkgconfig # For tests using the example app BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Multimedia) +%endif +# only TW has fmt +%if 0%{?suse_version} > 1500 # For blackbox tests BuildRequires: cmake(fmt) >= 7.1.2 +%endif %description ZXing ("zebra crossing") is an multi-format 1D/2D barcode image @@ -66,7 +75,18 @@ other applications. %autosetup -p1 %build -%cmake +# Use g++-11 to build a C++17 codebase +# Examples require QT5 +# Blackbox tests require fmt +%cmake \ +%if !0%{?is_opensuse} && 0%{?sle_version} < 150000 + -DCMAKE_CXX_COMPILER=/usr/bin/g++-11 \ + -DBUILD_EXAMPLES=OFF \ +%endif +%if 0%{?suse_version} < 1550 + -DBUILD_BLACKBOX_TESTS=OFF \ +%endif + ; %cmake_build %install