From 579e1c5d9887670533804e5ed231a42e365404045b4dd68e935215d87f478334 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Tue, 24 Nov 2020 17:07:48 +0000 Subject: [PATCH] Accepting request 848967 from home:mgorse:branches:graphics - Switch to ninja; probably fixes intermittent build failure (bsc#1177208). OBS-URL: https://build.opensuse.org/request/show/848967 OBS-URL: https://build.opensuse.org/package/show/graphics/inkscape?expand=0&rev=73 --- inkscape.changes | 6 ++++++ inkscape.spec | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/inkscape.changes b/inkscape.changes index d6466f3..81d27c9 100644 --- a/inkscape.changes +++ b/inkscape.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Nov 2 16:41:50 UTC 2020 - Michael Gorse + +- Switch to ninja; probably fixes intermittent build failure + (bsc#1177208). + ------------------------------------------------------------------- Fri Oct 2 23:17:32 UTC 2020 - Stefan BrĂ¼ns diff --git a/inkscape.spec b/inkscape.spec index 55faeeb..f663132 100644 --- a/inkscape.spec +++ b/inkscape.spec @@ -38,8 +38,8 @@ BuildRequires: intltool BuildRequires: libboost_headers-devel BuildRequires: liblcms2-devel BuildRequires: libpoppler-glib-devel -BuildRequires: libtool BuildRequires: libxslt-devel +BuildRequires: ninja BuildRequires: perl BuildRequires: pkgconfig BuildRequires: popt-devel @@ -140,12 +140,13 @@ Inkscape is a vector graphics editor. export LDFLAGS+="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads" %endif %cmake \ + -GNinja \ -DINKSCAPE_INSTALL_LIBDIR=%{_libdir} \ -DWITH_MANPAGE_COMPRESSION=OFF -%cmake_build +%ninja_build %install -%cmake_install +%ninja_install -C build # Only useful for translators. rm %{buildroot}%{_datadir}/inkscape/extensions/genpofiles.sh