From fe5e52908fb8eafab019982df2ae3a13c5b5e36d07391af0ba24aa559cfaea84 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Mon, 24 Jan 2022 13:27:38 +0000 Subject: [PATCH] Accepting request 948401 from home:polslinux:branches:KDE:Extra - Update to 1.5.8: * UI Improvements for dark mode and some icon updates and window interactivity * Improvements to file import (IDML, PDF, PNG, TIFF, SVG) * Improvements to PDF export * Improvements with respect to tables (undo/redo, styles) * Improvements to the Story Editor - Remove 0001-Use-new-hb-subset-api-with-harfbuzz-2.9.0-in-order-t.patch - Remove 0001-16697-Avoid-modifying-container-while-iterating-it.patch - Remove 0002-16635-Replace-hb_subset-removed-in-harfbuzz-3.0-by-h.patch OBS-URL: https://build.opensuse.org/request/show/948401 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/scribus?expand=0&rev=74 --- ...difying-container-while-iterating-it.patch | 44 ------------------- ...t-api-with-harfbuzz-2.9.0-in-order-t.patch | 40 ----------------- ..._subset-removed-in-harfbuzz-3.0-by-h.patch | 35 --------------- scribus-1.5.7.tar.xz | 3 -- scribus-1.5.8.tar.xz | 3 ++ scribus-1.5.8.tar.xz.asc | 6 +++ scribus.changes | 14 ++++++ scribus.spec | 15 +++---- 8 files changed, 28 insertions(+), 132 deletions(-) delete mode 100644 0001-16697-Avoid-modifying-container-while-iterating-it.patch delete mode 100644 0001-Use-new-hb-subset-api-with-harfbuzz-2.9.0-in-order-t.patch delete mode 100644 0002-16635-Replace-hb_subset-removed-in-harfbuzz-3.0-by-h.patch delete mode 100644 scribus-1.5.7.tar.xz create mode 100644 scribus-1.5.8.tar.xz create mode 100644 scribus-1.5.8.tar.xz.asc diff --git a/0001-16697-Avoid-modifying-container-while-iterating-it.patch b/0001-16697-Avoid-modifying-container-while-iterating-it.patch deleted file mode 100644 index 45be95f..0000000 --- a/0001-16697-Avoid-modifying-container-while-iterating-it.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 4b996fec980a124c362f47258a2fd2574db38337 Mon Sep 17 00:00:00 2001 -From: jghali -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 -+ - #include - #include - #include -@@ -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 - diff --git a/0001-Use-new-hb-subset-api-with-harfbuzz-2.9.0-in-order-t.patch b/0001-Use-new-hb-subset-api-with-harfbuzz-2.9.0-in-order-t.patch deleted file mode 100644 index 51bba49..0000000 --- a/0001-Use-new-hb-subset-api-with-harfbuzz-2.9.0-in-order-t.patch +++ /dev/null @@ -1,40 +0,0 @@ -From ddf6093991621141a803c33ff7b8d7b8f695b74f Mon Sep 17 00:00:00 2001 -From: Jean Ghali -Date: Sat, 21 Aug 2021 20:05:43 +0000 -Subject: [PATCH 1/2] Use new hb-subset api with harfbuzz >= 2.9.0 in order to - prepeare for removal of legacy API in 3.0 - -git-svn-id: svn://scribus.net/trunk/Scribus@24696 11d20701-8431-0410-a711-e3c959e3b870 -(cherry picked from commit 1b546978bc4ea0b2a73fbe4d7cf947887e865162) ---- - scribus/fonts/sfnt.cpp | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/scribus/fonts/sfnt.cpp b/scribus/fonts/sfnt.cpp -index 50777f66e..fca8b3915 100644 ---- a/scribus/fonts/sfnt.cpp -+++ b/scribus/fonts/sfnt.cpp -@@ -1256,11 +1256,19 @@ namespace sfnt { - - for (int i = 0; i < cids.count(); ++i) - hb_set_add(glyphSet, cids.at(i)); -- -+ -+#if HB_VERSION_ATLEAST(2, 9, 0) -+ uint32_t subsetFlags = (uint32_t) hb_subset_input_get_flags(hbSubsetInput.get()); -+ subsetFlags |= HB_SUBSET_FLAGS_RETAIN_GIDS; -+ subsetFlags &= ~HB_SUBSET_FLAGS_NO_HINTING; -+ subsetFlags |= HB_SUBSET_FLAGS_NAME_LEGACY; -+ hb_subset_input_set_flags(hbSubsetInput.get(), subsetFlags); -+#else - hb_subset_input_set_retain_gids(hbSubsetInput.get(), true); - hb_subset_input_set_drop_hints(hbSubsetInput.get(), false); - #if HB_VERSION_ATLEAST(2, 6, 5) - hb_subset_input_set_name_legacy(hbSubsetInput.get(), true); -+#endif - #endif - - QScopedPointer hbSubsetFace(hb_subset(hbFullFace.get(), hbSubsetInput.get())); --- -2.33.0 - diff --git a/0002-16635-Replace-hb_subset-removed-in-harfbuzz-3.0-by-h.patch b/0002-16635-Replace-hb_subset-removed-in-harfbuzz-3.0-by-h.patch deleted file mode 100644 index 33c4b49..0000000 --- a/0002-16635-Replace-hb_subset-removed-in-harfbuzz-3.0-by-h.patch +++ /dev/null @@ -1,35 +0,0 @@ -From df934c5149577bc0ef68657644045115bd9d4995 Mon Sep 17 00:00:00 2001 -From: Jean Ghali -Date: Sun, 19 Sep 2021 11:59:50 +0000 -Subject: [PATCH 2/2] #16635: Replace hb_subset, removed in harfbuzz 3.0, by - hb_subset_or_fail - -git-svn-id: svn://scribus.net/trunk/Scribus@24707 11d20701-8431-0410-a711-e3c959e3b870 -(cherry picked from commit 68ec41169eaceea4a6e1d6f359762a191c7e61d5) ---- - scribus/fonts/sfnt.cpp | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/scribus/fonts/sfnt.cpp b/scribus/fonts/sfnt.cpp -index fca8b3915..b3dfa50dc 100644 ---- a/scribus/fonts/sfnt.cpp -+++ b/scribus/fonts/sfnt.cpp -@@ -1271,9 +1271,15 @@ namespace sfnt { - #endif - #endif - -+#if HB_VERSION_ATLEAST(2, 9, 0) -+ QScopedPointer hbSubsetFace(hb_subset_or_fail(hbFullFace.get(), hbSubsetInput.get())); -+ if (hbSubsetFace.isNull()) -+ return QByteArray(); -+#else - QScopedPointer hbSubsetFace(hb_subset(hbFullFace.get(), hbSubsetInput.get())); - if (hbSubsetFace.isNull()) - return QByteArray(); -+#endif - - QScopedPointer hbSubsetBlob(hb_face_reference_blob(hbSubsetFace.get())); - if (hbSubsetBlob.isNull()) --- -2.33.0 - diff --git a/scribus-1.5.7.tar.xz b/scribus-1.5.7.tar.xz deleted file mode 100644 index d104367..0000000 --- a/scribus-1.5.7.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:318316b2cfc7a76191d3e0d3f8c2265147daea0570162028e243c292d826f8ce -size 74490040 diff --git a/scribus-1.5.8.tar.xz b/scribus-1.5.8.tar.xz new file mode 100644 index 0000000..3422200 --- /dev/null +++ b/scribus-1.5.8.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:47816e8fcf6d05788ff16aa4499f97ff22431c777a7789149b0a88b451e16b74 +size 74543476 diff --git a/scribus-1.5.8.tar.xz.asc b/scribus-1.5.8.tar.xz.asc new file mode 100644 index 0000000..475236a --- /dev/null +++ b/scribus-1.5.8.tar.xz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABECAB0WIQRlWL6E0nJzpDihURmL6kgRiuvuZAUCYe2OlQAKCRCL6kgRiuvu +ZEVjAJ9VmCNNM+QgJxEsSdXRYhVvKJYfZwCgqIzpdA5U+kkEP7X1t/TbjIQQWg4= +=eiTm +-----END PGP SIGNATURE----- diff --git a/scribus.changes b/scribus.changes index 501f7b4..61f2c50 100644 --- a/scribus.changes +++ b/scribus.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon Jan 24 12:49:07 UTC 2022 - Paolo Stivanin + +- Update to 1.5.8: + * UI Improvements for dark mode and some icon updates + and window interactivity + * Improvements to file import (IDML, PDF, PNG, TIFF, SVG) + * Improvements to PDF export + * Improvements with respect to tables (undo/redo, styles) + * Improvements to the Story Editor +- Remove 0001-Use-new-hb-subset-api-with-harfbuzz-2.9.0-in-order-t.patch +- Remove 0001-16697-Avoid-modifying-container-while-iterating-it.patch +- Remove 0002-16635-Replace-hb_subset-removed-in-harfbuzz-3.0-by-h.patch + ------------------------------------------------------------------- Thu Jan 13 10:47:59 UTC 2022 - Christophe Giboudeaux diff --git a/scribus.spec b/scribus.spec index 4c27ad2..79a7141 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,7 +1,7 @@ # # spec file for package scribus # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # Copyright (c) Peter Linnell and 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties @@ -18,22 +18,17 @@ Name: scribus -Version: 1.5.7 +Version: 1.5.8 Release: 0 Summary: Page Layout and Desktop Publishing (DTP) License: GPL-2.0-or-later Group: Productivity/Publishing/Other URL: https://www.scribus.net/ -# https://sourceforge.net/projects/scribus/files/scribus-devel/1.5.7/ -Source: %{name}-%{version}.tar.xz +# https://sourceforge.net/projects/scribus/files/scribus-devel/1.5.8/ +Source0: %{name}-%{version}.tar.xz +Source1: %{name}-%{version}.tar.xz.asc # PATCH-FIX-OPENSUSE 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