From 90a458427ac69219c06cd1cee2b3cc9c17a62a17f1e1dfb2c79c71d4b85e5c86 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 29 Mar 2016 12:49:19 +0000 Subject: [PATCH] Accepting request 379131 from graphics 1 OBS-URL: https://build.opensuse.org/request/show/379131 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/inkscape?expand=0&rev=81 --- inkscape-cache-fix.patch | 15 +++++++++++++++ inkscape.changes | 11 +++++++++++ inkscape.spec | 8 ++++++-- 3 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 inkscape-cache-fix.patch diff --git a/inkscape-cache-fix.patch b/inkscape-cache-fix.patch new file mode 100644 index 0000000..f8af122 --- /dev/null +++ b/inkscape-cache-fix.patch @@ -0,0 +1,15 @@ +--- inkscape-0.91/src/display/drawing.cpp.orig 2016-03-23 14:16:14.176248123 +0100 ++++ inkscape-0.91/src/display/drawing.cpp 2016-03-23 14:17:52.900328062 +0100 +@@ -210,9 +210,9 @@ + } + + std::set to_cache; +- for (i = _candidate_items.begin(); i != _candidate_items.end(); ++i) { +- i->item->setCached(true); +- to_cache.insert(i->item); ++ for (CandidateList::iterator j = _candidate_items.begin(); j != i; ++j) { ++ j->item->setCached(true); ++ to_cache.insert(j->item); + } + // Everything which is now in _cached_items but not in to_cache must be uncached + // Note that calling setCached on an item modifies _cached_items diff --git a/inkscape.changes b/inkscape.changes index df6730c..06225a9 100644 --- a/inkscape.changes +++ b/inkscape.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Mar 23 13:22:51 UTC 2016 - aeszter@gwdg.de + +- Add inkscape-cache-fix.patch: Fix bnc#972343 + +------------------------------------------------------------------- +Tue Mar 8 16:32:33 UTC 2016 - dimstar@opensuse.org + +- Pass --disable-strict-build to configure: allow to build against + recent glibmm2 versions with deprecated symbols. + ------------------------------------------------------------------- Sat Jan 31 08:33:53 UTC 2015 - mailaender@opensuse.org diff --git a/inkscape.spec b/inkscape.spec index 00ee5c6..12e589d 100644 --- a/inkscape.spec +++ b/inkscape.spec @@ -1,7 +1,7 @@ # # spec file for package inkscape # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,6 +31,8 @@ Source2: inkscape-split-extensions-extra.sh Patch0: inkscape-remove-datetime.patch # PATCH-FIX-OPENSUSE inkscape-packages.patch sbrabec@suse.cz -- Suggest packages instead of compilation from source. Patch1: inkscape-packages.patch +# PATCH-FIX-UPSTREAM inkscape-cache-fix.patch bnc#972343 aeszter@gwdg.de -- fix cache size +Patch2: inkscape-cache-fix.patch BuildRequires: aspell-devel BuildRequires: autoconf BuildRequires: automake @@ -162,6 +164,7 @@ Inkscape is a vector illustration program for the GNOME desktop. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build RPM_OPT_FLAGS="%{optflags}" @@ -173,7 +176,8 @@ export CXXFLAGS="%{optflags} -fno-strict-aliasing" %configure\ --enable-lcms \ - --enable-poppler-cairo + --enable-poppler-cairo \ + --disable-strict-build make %{?_smp_mflags}