Accepting request 946077 from KDE:Extra

- Add upstream patch to fix potential crash on startup:
  * 0001-16697-Avoid-modifying-container-while-iterating-it.patch

- Pass WANT_CPP17=ON to cmake, fix build with poppler 22.01.0 and
  newer.

OBS-URL: https://build.opensuse.org/request/show/946077
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/scribus?expand=0&rev=78

0001-16697-Avoid-modifying-container-while-iterating-it.patch

@@ -0,0 +1,44 @@
+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
+

scribus.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Jan 13 10:47:59 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
+
+- 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 <bjorn.lie@gmail.com>
+
+- Pass WANT_CPP17=ON to cmake, fix build with poppler 22.01.0 and
+  newer.
+
 -------------------------------------------------------------------
 Fri Sep 24 09:13:39 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
 

scribus.spec

@@ -30,7 +30,10 @@ Source:         %{name}-%{version}.tar.xz
 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 @@ cmake .. \
   -DWANT_DISTROBUILD=1 \
   -DWANT_HUNSPELL=1 \
   -DWANT_GRAPHICSMAGICK=1 \
+  -DWANT_CPP17=ON \
 %if "%{_lib}" == "lib64"
   -DWANT_LIB64=1
 %endif