Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package scribus for openSUSE:Factory checked in at 2022-01-14 23:12:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scribus (Old) and /work/SRC/openSUSE:Factory/.scribus.new.1892 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scribus" Fri Jan 14 23:12:28 2022 rev:78 rq:946077 version:1.5.7 Changes: -------- --- /work/SRC/openSUSE:Factory/scribus/scribus.changes 2021-09-26 21:49:30.166836233 +0200 +++ /work/SRC/openSUSE:Factory/.scribus.new.1892/scribus.changes 2022-01-14 23:12:55.994619900 +0100 @@ -1,0 +2,12 @@ +Thu Jan 13 10:47:59 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Add upstream patch to fix potential crash on startup: + * 0001-16697-Avoid-modifying-container-while-iterating-it.patch + +------------------------------------------------------------------- +Thu Jan 13 09:27:00 UTC 2022 - Bj??rn Lie <[email protected]> + +- Pass WANT_CPP17=ON to cmake, fix build with poppler 22.01.0 and + newer. + +------------------------------------------------------------------- New: ---- 0001-16697-Avoid-modifying-container-while-iterating-it.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scribus.spec ++++++ --- /var/tmp/diff_new_pack.ZPMMks/_old 2022-01-14 23:12:56.810620426 +0100 +++ /var/tmp/diff_new_pack.ZPMMks/_new 2022-01-14 23:12:56.814620429 +0100 @@ -30,7 +30,10 @@ Patch0: 0001-Make-sure-information-displayed-on-the-about-window-.patch # PATCH-FIX-UPSTREAM Patch1: 0001-Use-new-hb-subset-api-with-harfbuzz-2.9.0-in-order-t.patch +# PATCH-FIX-UPSTREAM Patch2: 0002-16635-Replace-hb_subset-removed-in-harfbuzz-3.0-by-h.patch +# PATCH-FIX-UPSTREAM +Patch3: 0001-16697-Avoid-modifying-container-while-iterating-it.patch BuildRequires: cmake >= 3.14.0 BuildRequires: cups-devel BuildRequires: dos2unix @@ -114,6 +117,7 @@ -DWANT_DISTROBUILD=1 \ -DWANT_HUNSPELL=1 \ -DWANT_GRAPHICSMAGICK=1 \ + -DWANT_CPP17=ON \ %if "%{_lib}" == "lib64" -DWANT_LIB64=1 %endif ++++++ 0001-16697-Avoid-modifying-container-while-iterating-it.patch ++++++ >From 4b996fec980a124c362f47258a2fd2574db38337 Mon Sep 17 00:00:00 2001 From: jghali <jghali@11d20701-8431-0410-a711-e3c959e3b870> Date: Tue, 7 Dec 2021 22:40:23 +0000 Subject: [PATCH] #16697: Avoid modifying container while iterating it git-svn-id: svn://scribus.net/trunk/Scribus@24777 11d20701-8431-0410-a711-e3c959e3b870 --- scribus/langmgr.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/scribus/langmgr.cpp b/scribus/langmgr.cpp index 4baff80ee..0e006e565 100644 --- a/scribus/langmgr.cpp +++ b/scribus/langmgr.cpp @@ -20,6 +20,7 @@ for which a new license (GPL+exception) is in place. ***************************************************************************/ #include <iostream> + #include <QDebug> #include <QDir> #include <QFile> @@ -1030,16 +1031,14 @@ void LanguageManager::findSpellingDictionarySets(QStringList &dictionaryPaths, Q QDir dictLocation(dictionaryPaths.at(i)); QStringList dictFilters("*.dic"); QStringList dictList(dictLocation.entryList(dictFilters, QDir::Files, QDir::Name)); - dictList.replaceInStrings(".dic",""); + dictList.replaceInStrings(".dic", ""); + dictList.removeDuplicates(); //Ensure we have aff+dic file pairs, remove any hyphenation dictionaries from the list for (const QString& dictName : qAsConst(dictList)) { if (!QFile::exists(dictionaryPaths.at(i) + dictName + ".aff")) - { - dictList.removeAll(dictName); continue; - } if (dictionaryMap.contains(dictName)) continue; -- 2.34.1
