From 7564acae071609a928a8d8157fe5e4464a96bb684419bdb16a23342b823a470f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 5 Nov 2021 14:09:27 +0000 Subject: [PATCH] Accepting request 929661 from home:dspinella:branches:devel:libraries:c_c++ - Do not build examples to avoid a cycle with QT5Multimedia Please forward the request to Factory if it gets accepted. Thank you. OBS-URL: https://build.opensuse.org/request/show/929661 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/zxing-cpp?expand=0&rev=21 --- zxing-cpp.changes | 5 +++++ zxing-cpp.spec | 7 ++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/zxing-cpp.changes b/zxing-cpp.changes index d9219ae..883110a 100644 --- a/zxing-cpp.changes +++ b/zxing-cpp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Nov 5 11:58:38 UTC 2021 - Danilo Spinella + +- Do not build examples to avoid a cycle with QT5Multimedia + ------------------------------------------------------------------- Wed Nov 3 14:42:33 UTC 2021 - Danilo Spinella diff --git a/zxing-cpp.spec b/zxing-cpp.spec index 4aef9cd..942d401 100644 --- a/zxing-cpp.spec +++ b/zxing-cpp.spec @@ -36,9 +36,6 @@ BuildRequires: gcc11-c++ %else BuildRequires: cmake >= 3.10 BuildRequires: gcc-c++ -# For tests using the example app -BuildRequires: pkgconfig(Qt5Gui) -BuildRequires: pkgconfig(Qt5Multimedia) %endif # only TW has fmt %if 0%{?suse_version} > 1500 @@ -76,12 +73,12 @@ other applications. %build # Use g++-11 to build a C++17 codebase -# Examples require QT5 +# Examples require QT5-base/multimedia, but doing so creates a cycle # Blackbox tests require fmt %cmake \ + -DBUILD_EXAMPLES=OFF \ %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 \