Hello community, here is the log from the commit of package inkscape for openSUSE:Factory checked in at 2016-03-29 14:49:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/inkscape (Old) and /work/SRC/openSUSE:Factory/.inkscape.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "inkscape" Changes: -------- --- /work/SRC/openSUSE:Factory/inkscape/inkscape.changes 2015-02-06 10:50:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.inkscape.new/inkscape.changes 2016-03-29 14:49:20.000000000 +0200 @@ -1,0 +2,11 @@ +Wed Mar 23 13:22:51 UTC 2016 - [email protected] + +- Add inkscape-cache-fix.patch: Fix bnc#972343 + +------------------------------------------------------------------- +Tue Mar 8 16:32:33 UTC 2016 - [email protected] + +- Pass --disable-strict-build to configure: allow to build against + recent glibmm2 versions with deprecated symbols. + +------------------------------------------------------------------- New: ---- inkscape-cache-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ inkscape.spec ++++++ --- /var/tmp/diff_new_pack.3RpSPf/_old 2016-03-29 14:49:21.000000000 +0200 +++ /var/tmp/diff_new_pack.3RpSPf/_new 2016-03-29 14:49:21.000000000 +0200 @@ -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 @@ Patch0: inkscape-remove-datetime.patch # PATCH-FIX-OPENSUSE inkscape-packages.patch [email protected] -- Suggest packages instead of compilation from source. Patch1: inkscape-packages.patch +# PATCH-FIX-UPSTREAM inkscape-cache-fix.patch bnc#972343 [email protected] -- fix cache size +Patch2: inkscape-cache-fix.patch BuildRequires: aspell-devel BuildRequires: autoconf BuildRequires: automake @@ -162,6 +164,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build RPM_OPT_FLAGS="%{optflags}" @@ -173,7 +176,8 @@ %configure\ --enable-lcms \ - --enable-poppler-cairo + --enable-poppler-cairo \ + --disable-strict-build make %{?_smp_mflags} ++++++ inkscape-cache-fix.patch ++++++ --- 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<DrawingItem*> 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
