From ab11a838dfb083d4708b3ebd82aca14ba1f6e4d166073e513964e29ba04ad95a Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 10 Apr 2018 11:40:39 +0000 Subject: [PATCH] Accepting request 593387 from home:Guillaume_G:branches:openSUSE:Factory:ARM - Disable VC on non-x86* to fix builds OBS-URL: https://build.opensuse.org/request/show/593387 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/krita?expand=0&rev=65 --- krita.changes | 5 +++++ krita.spec | 13 +++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/krita.changes b/krita.changes index 58a2324..8ab8895 100644 --- a/krita.changes +++ b/krita.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 3 12:39:53 UTC 2018 - guillaume.gardet@opensuse.org + +- Disable VC on non-x86* to fix builds + ------------------------------------------------------------------- Fri Mar 23 18:33:32 UTC 2018 - khnazile@rkmail.ru diff --git a/krita.spec b/krita.spec index 82eb4b8..0f9f72a 100644 --- a/krita.spec +++ b/krita.spec @@ -18,11 +18,18 @@ %bcond_without lang +# Enable VC only on x86* +%ifarch %ix86 x86_64 +%bcond_without vc +%else +%bcond_with vc +%endif + Name: krita Version: 4.0.0 Release: 0 Summary: Digital Painting Application -License: GPL-2.0+ and LGPL-2.1+ +License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: Productivity/Graphics/Bitmap Editors Url: http://www.krita.org/ Source0: http://download.kde.org/stable/krita/%{version}/krita-%{version}.tar.gz @@ -31,7 +38,9 @@ Patch1: fix_libgif_5_0_build.patch BuildRequires: Mesa-devel BuildRequires: OpenColorIO-devel BuildRequires: OpenEXR-devel +%if %{with vc} BuildRequires: Vc-devel-static +%endif %if 0%{?suse_version} < 1320 BuildRequires: boost_1_61-devel %else @@ -67,8 +76,8 @@ BuildRequires: libtiff-devel BuildRequires: openjpeg-devel BuildRequires: perl BuildRequires: python3-devel -BuildRequires: python3-sip BuildRequires: python3-qt5-devel +BuildRequires: python3-sip BuildRequires: update-desktop-files BuildRequires: zlib-devel BuildRequires: pkgconfig(Qt5Concurrent)