Accepting request 1324708 from KDE:Extra

Update to 1.6.5

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

0001-Fix-build-with-PoDoFo-1.0.0.patch

@@ -1,132 +0,0 @@
-From 857b62b7e88eb024539650a3de3c9b26c338ff64 Mon Sep 17 00:00:00 2001
-From: jghali <jghali@11d20701-8431-0410-a711-e3c959e3b870>
-Date: Fri, 6 Jun 2025 23:40:58 +0000
-Subject: [PATCH] Fix build with PoDoFo 1.0.0
-
-git-svn-id: svn://scribus.net/trunk/Scribus@26920 11d20701-8431-0410-a711-e3c959e3b870
----
- scribus/pdf_analyzer.cpp | 31 +++++++++++++++++++++++++++++++
- scribus/pdflib_core.cpp  | 18 ++++++++++++++++++
- 2 files changed, 49 insertions(+)
-
-diff --git a/scribus/pdf_analyzer.cpp b/scribus/pdf_analyzer.cpp
-index d923148..3ecff48 100644
---- a/scribus/pdf_analyzer.cpp
-+++ b/scribus/pdf_analyzer.cpp
-@@ -276,7 +276,11 @@ bool PDFAnalyzer::inspectCanvas(PdfCanvas* canvas, QList<PDFColorSpace> & usedCo
- 	try
- 	{
- 		// start parsing the content stream
-+#if (PODOFO_VERSION >= PODOFO_MAKE_VERSION(1, 0, 0))
-+		PdfContentReaderArgs tokenizerArgs;
-+#else
- 		PdfContentReaderArgs tokenizerArgs = { PdfContentReaderFlags::DontFollowXObjectForms };
-+#endif
- 		PdfContentStreamReader tokenizer(*canvas, tokenizerArgs);
- 		PdfContent pdfContent;
- 		PdfVariant var;
-@@ -289,13 +293,29 @@ bool PDFAnalyzer::inspectCanvas(PdfCanvas* canvas, QList<PDFColorSpace> & usedCo
- 		while (tokenizer.TryReadNext(pdfContent))
- 		{
- 			++tokenNumber;
-+#if (PODOFO_VERSION >= PODOFO_MAKE_VERSION(1, 0, 0))
-+			if (pdfContent.GetType() == PdfContentType::Operator)
-+#else
- 			if (pdfContent.Type == PdfContentType::Operator)
-+#endif
- 			{
- 				args.clear();
-+#if (PODOFO_VERSION >= PODOFO_MAKE_VERSION(1, 0, 0))
-+				const auto& pdfContentStack = pdfContent.GetStack();
-+				size_t stackSize = pdfContentStack.size();
-+				for (size_t i = 0; i < stackSize; ++i)
-+					args.append(pdfContentStack[stackSize - 1 - i]);
-+#else
-+
- 				size_t stackSize = pdfContent.Stack.size();
- 				for (size_t i = 0; i < stackSize; ++i)
- 					args.append(pdfContent.Stack[stackSize - 1 - i]);
-+#endif
-+#if (PODOFO_VERSION >= PODOFO_MAKE_VERSION(1, 0, 0))
-+				switch (pdfContent.GetOperator())
-+#else
- 				switch (pdfContent.Operator)
-+#endif
- 				{
- 				case PdfOperator::q:
- 					gsStack.push(currGS);
-@@ -677,12 +697,23 @@ bool PDFAnalyzer::inspectCanvas(PdfCanvas* canvas, QList<PDFColorSpace> & usedCo
- 				}
- 				args.clear();
- 			}
-+#if (PODOFO_VERSION >= PODOFO_MAKE_VERSION(1, 0, 0))
-+			if (pdfContent.GetType() == PdfContentType::DoXObject)
-+#else
- 			if (pdfContent.Type == PdfContentType::DoXObject)
-+#endif
- 			{
- 				args.clear();
-+#if (PODOFO_VERSION >= PODOFO_MAKE_VERSION(1, 0, 0))
-+				const auto& pdfContentStack = pdfContent.GetStack();
-+				size_t stackSize = pdfContentStack.size();
-+				for (size_t i = 0; i < stackSize; ++i)
-+					args.append(pdfContentStack[stackSize - 1 - i]);
-+#else
- 				size_t stackSize = pdfContent.Stack.size();
- 				for (size_t i = 0; i < stackSize; ++i)
- 					args.append(pdfContent.Stack[stackSize - 1 - i]);
-+#endif
- 				if (!processedNamedXObj.contains(args[0].GetName()))
- 				{
- 					if (args.size() == 1 && args[0].IsName() && xObjectsDict)
-diff --git a/scribus/pdflib_core.cpp b/scribus/pdflib_core.cpp
-index 3465ccd..5c6ebd1 100644
---- a/scribus/pdflib_core.cpp
-+++ b/scribus/pdflib_core.cpp
-@@ -9834,7 +9834,11 @@ bool PDFLibCore::PDF_EmbeddedPDF(PageItem* c, const QString& fn, double sx, doub
- 		PoDoFo::PdfPage& page = doc->GetPages().GetPageAt(qMin(qMax(1, c->pixm.imgInfo.actualPageNumber), c->pixm.imgInfo.numberOfPages) - 1);
- 		PoDoFo::PdfObject& pageObj = page.GetObject();
- 		PoDoFo::PdfObject* contents = page.GetContents() ? &(page.GetContents()->GetObject()) : nullptr;
-+#if (PODOFO_VERSION >= PODOFO_MAKE_VERSION(1, 0, 0))
-+		const PoDoFo::PdfObject* resources = &(page.GetResources().GetObject());
-+#else
- 		PoDoFo::PdfObject* resources = page.GetResources() ? &(page.GetResources()->GetObject()) : nullptr;
-+#endif
- 		PoDoFo::PdfDictionary* pageObjDict = pageObj.IsDictionary() ? &(pageObj.GetDictionary()) : nullptr;
- 		for (PoDoFo::PdfDictionary* par = pageObjDict, *parentDict = nullptr; par && !resources; par = parentDict)
- 		{
-@@ -9855,8 +9859,15 @@ bool PDFLibCore::PDF_EmbeddedPDF(PageItem* c, const QString& fn, double sx, doub
- 			importedObjects[page.GetObject().GetIndirectReference()] = xObj;
- 			writer.startObj(xObj);
- 			PutDoc("<<\n/Type /XObject\n/Subtype /Form\n/FormType 1");
-+#if (PODOFO_VERSION >= PODOFO_MAKE_VERSION(1, 0, 0))
-+			PoDoFo::Rect pageRect = page.GetArtBoxRaw().GetNormalized(); // Because scimagedataloader_pdf use ArtBox
-+			double rotation = 0;
-+			if (!page.TryGetRotationRaw(rotation))
-+				rotation = 0;
-+#else
- 			PoDoFo::Rect pageRect = page.GetArtBox(true); // Because scimagedataloader_pdf use ArtBox
- 			int rotation = page.GetRotationRaw();
-+#endif
- 			double imgWidth  = (rotation == 90 || rotation == 270) ? pageRect.Height : pageRect.Width;
- 			double imgHeight = (rotation == 90 || rotation == 270) ? pageRect.Width : pageRect.Height;
- 			QTransform pageM;
-@@ -9976,8 +9987,15 @@ bool PDFLibCore::PDF_EmbeddedPDF(PageItem* c, const QString& fn, double sx, doub
- 			importedObjects[page.GetObject().GetIndirectReference()] = xObj;
- 			writer.startObj(xObj);
- 			PutDoc("<<\n/Type /XObject\n/Subtype /Form\n/FormType 1");
-+#if (PODOFO_VERSION >= PODOFO_MAKE_VERSION(1, 0, 0))
-+			PoDoFo::Rect pageRect = page.GetArtBoxRaw().GetNormalized(); // Because scimagedataloader_pdf use ArtBox
-+			double rotation = 0;
-+			if (!page.TryGetRotationRaw(rotation))
-+				rotation = 0;
-+#else
- 			PoDoFo::Rect pageRect = page.GetArtBox(true); // Because scimagedataloader_pdf use ArtBox
- 			int rotation = page.GetRotationRaw();
-+#endif
- 			double imgWidth  = (rotation == 90 || rotation == 270) ? pageRect.Height : pageRect.Width;
- 			double imgHeight = (rotation == 90 || rotation == 270) ? pageRect.Width : pageRect.Height;
- 			QTransform pageM;
--- 
-2.49.0
-

0001-Fix-build-with-poppler-25.06.0.patch

@@ -1,30 +0,0 @@
-From 5386d1fd7e33d94d9caa33b1f166e60c1338e5e5 Mon Sep 17 00:00:00 2001
-From: jghali <jghali@11d20701-8431-0410-a711-e3c959e3b870>
-Date: Tue, 3 Jun 2025 22:50:26 +0000
-Subject: [PATCH] Fix build with poppler 25.06.0
-
-git-svn-id: svn://scribus.net/trunk/Scribus@26919 11d20701-8431-0410-a711-e3c959e3b870
----
- scribus/plugins/import/pdf/slaoutput.cpp | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
-index 418df0a..3c65c3f 100644
---- a/scribus/plugins/import/pdf/slaoutput.cpp
-+++ b/scribus/plugins/import/pdf/slaoutput.cpp
-@@ -606,7 +606,12 @@ bool SlaOutputDev::handleWidgetAnnot(Annot* annota, double xCoor, double yCoor,
- 		FormWidget *fm = m_formWidgets->getWidget(i);
- 		if (!fm)
- 			continue;
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 06, 0)
-+		std::shared_ptr<AnnotWidget> anoSharedPtr = fm->getWidgetAnnotation();
-+		AnnotWidget* ano = anoSharedPtr.get();
-+#else
- 		AnnotWidget *ano = fm->getWidgetAnnotation();
-+#endif
- 		if (!ano)
- 			continue;
- 		if (ano != (AnnotWidget*) annota)
--- 
-2.49.0
-

scribus-1.6.4.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:533be7af03acfaa736ec5f7a3fc2562abd200fef5ca2a7cdee02b5f44d61829e
-size 74761856

scribus-1.6.4.tar.xz.asc

@@ -1,6 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iF0EABECAB0WIQRlWL6E0nJzpDihURmL6kgRiuvuZAUCaAUFVAAKCRCL6kgRiuvu
-ZFWiAKCAiEPNRcY2nmc8xFn5u1zudqqvLACdFLIANX9Q1CoXHCXjLYdE9vG1Yio=
-=G20f
------END PGP SIGNATURE-----

scribus-1.6.5.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:09bdb736a8ff8a437191458a36d847cc0adeca0fc059cf696474e0ba6f59ac6a
+size 74962152

scribus-1.6.5.tar.xz.asc

@@ -0,0 +1,6 @@
+-----BEGIN PGP SIGNATURE-----
+
+iF0EABECAB0WIQRlWL6E0nJzpDihURmL6kgRiuvuZAUCaT8++AAKCRCL6kgRiuvu
+ZNFLAJ0cyBeRnrUr8zAy7sDgmgdkoIqf4gCfaCdbevhE1oS3QCfCiTyy2eaBUUo=
+=PKm1
+-----END PGP SIGNATURE-----

scribus.changes

@@ -1,3 +1,70 @@
+-------------------------------------------------------------------
+Mon Dec 29 13:43:08 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 1.6.5
+  * [General]  NTLM hash leak in Scribus
+  * [User Interface]  Dark Color Schema unusable
+  * [Color Management]  Color picker (eyedropper) does not work
+    (always returns "black")
+  * [General]  Layer disappears after editing inline object
+    (layer visibility scrambling)
+  * [General]  Failure to build with poppler 25.10.0
+  * [PDF]  Scribus crashes when exporting pdf via python and the
+    document has a PDF-Push-Button or other PDF-thingy
+  * [Build System]  Won't Compile: 'const_key_value_iterator' does
+    not name a type
+  * [Styles]  The line spacing mode drop down is not correctly
+    displayed for styles with a parent
+  * [Build System]  Fails to build with poppler 25.07
+  * [PDF]  Build failure with podofo 1.0
+  * [Scripter]  Undocumented feature in scribus.ImageExport: transparentBckgnd
+  * [Scripter]  Documentation of function getBoundingBox()
+    missing from HTML docs
+  * [Fonts]  Additional Font Path Settings reset
+  * [General]  Crash when loading legacy file produced with
+    Scribus 1.4.6
+  * [Scripter]  Using unknown/misspelled named parameter in API
+    call causes Scribus crash
+  * [Canvas]  Sometimes all items in a document become invisible
+  * [General]  Failure to build with poppler 25.09.0
+  * [General]  Accept negative values for the rotation in the
+    properties palette
+  * [General]  1.6.4 fails to build with popper 25.06.0
+  * [Fonts]  Font rendering different after PDF export
+  * [Printing]  Print Dialog - Inconsistency between output
+    filename extension and printing language
+  * [Printing]  Print Dialog - Crop marks not present in output
+    when they are the only marks selected
+- Drop patches:
+  * 0001-Fix-build-with-poppler-25.06.0.patch
+  * 0001-Fix-build-with-PoDoFo-1.0.0.patch
+  * 0001-Fix-build-with-poppler-25.07.0.patch
+  * 0001-Failure-to-build-with-poppler-25.09.0.patch
+  * 0001-Fix-build-with-poppler-25.10.0.patch
+
+-------------------------------------------------------------------
+Thu Oct  9 21:32:04 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Add upstream change:
+  * 0001-Fix-build-with-poppler-25.10.0.patch
+
+-------------------------------------------------------------------
+Thu Sep 11 10:51:32 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Add upstream change (boo#1249440)
+  * 0001-Failure-to-build-with-poppler-25.09.0.patch
+
+-------------------------------------------------------------------
+Tue Jul 15 16:51:19 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Amend 0001-Fix-build-with-PoDoFo-1.0.0.patch to really fix build with podofo 1.0
+
+-------------------------------------------------------------------
+Tue Jul 15 08:08:58 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Add  0001-Fix-build-with-poppler-25.07.0.patch: Fix build with
+  poppler 25.07.0
+
 -------------------------------------------------------------------
 Sun Jun  8 08:55:14 UTC 2025 - Christophe Marin <christophe@krop.fr>
 

scribus.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package scribus
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 # Copyright (c) Peter Linnell and 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
@@ -15,6 +15,17 @@
 
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
+# Copyright (c) 2025 SUSE LLC and constributors
+# Copyright (c) Peter Linnell and 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
 
 
 %bcond_without podofo
@@ -28,23 +39,18 @@
 %endif
 
 Name:           scribus
-Version:        1.6.4
+Version:        1.6.5
 Release:        0
 Summary:        Page Layout and Desktop Publishing (DTP)
 License:        GPL-2.0-or-later
 URL:            https://www.scribus.net/
-# https://sourceforge.net/projects/scribus/files/scribus/1.6.4/
-Source0:        %{name}-%{version}.tar.xz
+Source0:        https://downloads.sourceforge.net/scribus/scribus-%{version}.tar.xz
 %if %{with released}
-Source1:        %{name}-%{version}.tar.xz.asc
+Source1:        https://downloads.sourceforge.net/scribus/scribus-%{version}.tar.xz.asc
 Source2:        scribus.keyring
 %endif
 # PATCH-FIX-OPENSUSE
 Patch0:         0001-Make-sure-information-displayed-on-the-about-window-.patch
-# PATCH-FIX-UPSTREAM
-Patch1:         0001-Fix-build-with-poppler-25.06.0.patch
-# PATCH-FIX-UPSTREAM
-Patch2:         0001-Fix-build-with-PoDoFo-1.0.0.patch
 BuildRequires:  cmake >= 3.14.0
 BuildRequires:  cups-devel
 BuildRequires:  dos2unix
@@ -58,6 +64,7 @@ BuildRequires:  libpagemaker-devel
 %if %{with podofo}
 BuildRequires:  libpodofo-devel
 %endif
+BuildRequires:  %{pyver}-devel
 BuildRequires:  libqxp-devel
 BuildRequires:  librevenge-devel
 BuildRequires:  libtiff-devel
@@ -66,7 +73,6 @@ BuildRequires:  libwpd-devel
 BuildRequires:  libwpg-devel
 BuildRequires:  libzmf-devel
 BuildRequires:  pkgconfig
-BuildRequires:  %{pyver}-devel
 BuildRequires:  cmake(Qt5Core) >= 5.14.0
 BuildRequires:  cmake(Qt5Gui)
 BuildRequires:  cmake(Qt5LinguistTools)