Accepting request 1330958 from KDE:Extra

- Add upstream change (boo#1257664)
  * 0001-Fix-build-failure-with-poppler-26.01.0.patch

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

0001-Fix-build-failure-with-poppler-26.01.0.patch

@@ -0,0 +1,122 @@
+From 8dc2b21936e05cc5eb3398f7da06733ff0794934 Mon Sep 17 00:00:00 2001
+From: Jean Ghali <jghali@libertysurf.fr>
+Date: Wed, 7 Jan 2026 23:12:18 +0000
+Subject: [PATCH] Fix build failure with poppler 26.01.0
+
+git-svn-id: svn://scribus.net/branches/Version16x/Scribus@27299 11d20701-8431-0410-a711-e3c959e3b870
+---
+ scribus/plugins/import/pdf/slaoutput.cpp | 45 ++++++++++++++++++++----
+ 1 file changed, 39 insertions(+), 6 deletions(-)
+
+diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
+index db463b637..e9d8a6549 100644
+--- a/scribus/plugins/import/pdf/slaoutput.cpp
++++ b/scribus/plugins/import/pdf/slaoutput.cpp
+@@ -7,6 +7,7 @@ for which a new license (GPL+exception) is in place.
+ 
+ #include "slaoutput.h"
+ 
++#include <array>
+ #include <memory>
+ #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
+ #include <optional>
+@@ -2495,7 +2496,11 @@ void SlaOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str, int
+ {
+ //	qDebug() << "Draw Image Mask";
+ 	auto imgStr = std::make_shared<ImageStream>(str, width, 1, 1);
+-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 02, 0)
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(26, 1, 0)
++	bool rewindDone = imgStr->rewind();
++	if (!rewindDone)
++		return;
++#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 02, 0)
+ 	bool resetDone = imgStr->reset();
+ 	if (!resetDone)
+ 		return;
+@@ -2576,7 +2581,11 @@ void SlaOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str
+ {
+ //	qDebug() << "SlaOutputDev::drawSoftMaskedImage Masked Image Components" << colorMap->getNumPixelComps();
+ 	auto imgStr = std::make_shared<ImageStream>(str, width, colorMap->getNumPixelComps(), colorMap->getBits());
+-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 02, 0)
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(26, 1, 0)
++	bool rewindDone = imgStr->rewind();
++	if (!rewindDone)
++		return;
++#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 02, 0)
+ 	bool resetDone = imgStr->reset();
+ 	if (!resetDone)
+ 		return;
+@@ -2598,7 +2607,11 @@ void SlaOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str
+ 		return;
+ 
+ 	auto mskStr = std::make_shared<ImageStream>(maskStr, maskWidth, maskColorMap->getNumPixelComps(), maskColorMap->getBits());
+-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 02, 0)
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(26, 1, 0)
++	bool mskRewindDone = mskStr->rewind();
++	if (!mskRewindDone)
++		return;
++#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 02, 0)
+ 	bool mskResetDone = mskStr->reset();
+ 	if (!mskResetDone)
+ 		return;
+@@ -2660,7 +2673,11 @@ void SlaOutputDev::drawMaskedImage(GfxState *state, Object *ref, Stream *str,  i
+ {
+ //	qDebug() << "SlaOutputDev::drawMaskedImage";
+ 	auto imgStr = std::make_shared<ImageStream>(str, width, colorMap->getNumPixelComps(), colorMap->getBits());
+-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 02, 0)
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(26, 1, 0)
++	bool rewindDone = imgStr->rewind();
++	if (!rewindDone)
++		return;
++#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 02, 0)
+ 	bool resetDone = imgStr->reset();
+ 	if (resetDone)
+ 		return;
+@@ -2682,7 +2699,11 @@ void SlaOutputDev::drawMaskedImage(GfxState *state, Object *ref, Stream *str,  i
+ 		return;
+ 
+ 	auto mskStr = std::make_shared<ImageStream>(maskStr, maskWidth, 1, 1);
+-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 02, 0)
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(26, 1, 0)
++	bool mskRewindDone = mskStr->rewind();
++	if (!mskRewindDone)
++		return;
++#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 02, 0)
+ 	bool mskResetDone = mskStr->reset();
+ 	if (!mskResetDone)
+ 		return;
+@@ -2732,7 +2753,11 @@ void SlaOutputDev::drawMaskedImage(GfxState *state, Object *ref, Stream *str,  i
+ void SlaOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, const int* maskColors, bool inlineImg)
+ {
+ 	auto imgStr = std::make_shared<ImageStream>(str, width, colorMap->getNumPixelComps(), colorMap->getBits());
+-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 02, 0)
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(26, 1, 0)
++	bool rewindDone = imgStr->rewind();
++	if (!rewindDone)
++		return;
++#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 02, 0)
+ 	bool resetDone = imgStr->reset();
+ 	if (!resetDone)
+ 		return;
+@@ -3125,10 +3150,18 @@ void SlaOutputDev::updateFont(GfxState *state)
+ #endif
+ 	const double *textMat = nullptr;
+ 	double m11, m12, m21, m22, fontSize;
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(26, 1, 0)
++	std::array<SplashCoord, 4> mat = { 1.0, 0.0, 0.0, 1.0 };
++#else
+ 	SplashCoord mat[4] = { 1.0, 0.0, 0.0, 1.0 };
++#endif
+ 	int n = 0;
+ 	int faceIndex = 0;
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(26, 1, 0)
++	std::array<SplashCoord, 6> matrix = { 1.0, 0.0, 0.0, 1.0, 0.0, 0.0 };
++#else
+ 	SplashCoord matrix[6] = { 1.0, 0.0, 0.0, 1.0, 0.0, 0.0 };
++#endif
+ 
+ 	m_font = nullptr;
+ 
+-- 
+2.52.0
+

scribus-1.6.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7eff9b1f47e372e56bb369f1dbe18fe49101789b5e6bcfdb7890e0346b641383
-size 73129400

scribus-1.6.2.tar.xz.asc

@@ -1,6 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iF0EABECAB0WIQRlWL6E0nJzpDihURmL6kgRiuvuZAUCZm2mxQAKCRCL6kgRiuvu
-ZArHAJ0Ru6M6nyTplBSK4zzmPb2q7eqHrACfYR3rpqPw7A2/Acw3CDJ/NL8St5U=
-=hugY
------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,126 @@
+-------------------------------------------------------------------
+Wed Feb  4 13:16:45 UTC 2026 - Christophe Marin <christophe@krop.fr>
+
+- Add upstream change (boo#1257664)
+  * 0001-Fix-build-failure-with-poppler-26.01.0.patch
+
+-------------------------------------------------------------------
+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>
+
+- Update to 1.6.4:
+  * Avoid custom font encodings when embedding TTF fonts in PDFs.
+  * Fixes to PDF import and export, and checkbox rendering on MS
+    Edge.
+  * Fixes for PDF/X-4 export when attempting to use ICC profile
+    unsuitable for output.
+  * Fixes some images being incorrectly imported as black when
+    importing PDF.
+  * Addressed compilation issues when building against newer
+    versions of poppler.
+  * Added new Python functions for page sizing, bounding boxes
+    for page items, min/max word kerning and a fix to locked
+    layer detection.
+  * Updated translation files
+- Drop patch, merged upstream:
+  * 0001-Fix-build-error-with-poppler-25.02.0.patch
+- Add patches:
+  * 0001-Fix-build-with-poppler-25.06.0.patch
+  * 0001-Fix-build-with-PoDoFo-1.0.0.patch
+
+-------------------------------------------------------------------
+Sun Feb 16 09:05:59 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Add 0001-Fix-build-error-with-poppler-25.02.0.patch: Fix build
+  with poppler 25.02.0.
+
+-------------------------------------------------------------------
+Thu Jan  9 18:00:48 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 1.6.3. Check the ChangeLog file for the full list of
+  changes.
+- Drop patch, merged upstream:
+  * fix_build_with_poppler_24.12.0.patch
+
+-------------------------------------------------------------------
+Fri Dec 20 17:14:05 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Add poppler 24.10 compatibility patch:
+  * Add fix_build_with_poppler_24.12.0.patch
+  * Drop 0001-Fix-build-with-poppler-24.10.0.patch
+
+-------------------------------------------------------------------
+Fri Oct 25 14:39:51 UTC 2024 - Christophe Marin <christophe@krop.fr>
+
+- Add poppler 24.10 compatibility patch:
+  * 0001-Fix-build-with-poppler-24.10.0.patch
+
 -------------------------------------------------------------------
 Tue Jul  2 14:52:57 UTC 2024 - Christophe Marin <christophe@krop.fr>
 

scribus.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package scribus
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2026 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,26 +15,44 @@
 
 # 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
 %bcond_without released
+
+%{?sle15_python_module_pythons}
+%if 0%{?suse_version} > 1500
+%define pyver python3
+%else
+%define pyver python311
+%endif
+
 Name:           scribus
-Version:        1.6.2
+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.2/
-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 poppler...
-
+# PATCH-FIX-UPSTREAM
+Patch1:         0001-Fix-build-failure-with-poppler-26.01.0.patch
 BuildRequires:  cmake >= 3.14.0
 BuildRequires:  cups-devel
 BuildRequires:  dos2unix
@@ -48,6 +66,7 @@ BuildRequires:  libpagemaker-devel
 %if %{with podofo}
 BuildRequires:  libpodofo-devel
 %endif
+BuildRequires:  %{pyver}-devel
 BuildRequires:  libqxp-devel
 BuildRequires:  librevenge-devel
 BuildRequires:  libtiff-devel
@@ -56,7 +75,6 @@ BuildRequires:  libwpd-devel
 BuildRequires:  libwpg-devel
 BuildRequires:  libzmf-devel
 BuildRequires:  pkgconfig
-BuildRequires:  python3-devel
 BuildRequires:  cmake(Qt5Core) >= 5.14.0
 BuildRequires:  cmake(Qt5Gui)
 BuildRequires:  cmake(Qt5LinguistTools)
@@ -68,7 +86,6 @@ BuildRequires:  cmake(Qt5Widgets)
 BuildRequires:  cmake(Qt5Xml)
 BuildRequires:  pkgconfig(GraphicsMagick)
 BuildRequires:  pkgconfig(cairo)
-BuildRequires:  pkgconfig(libpng16)
 BuildRequires:  pkgconfig(fontconfig)
 BuildRequires:  pkgconfig(freetype2)
 BuildRequires:  pkgconfig(harfbuzz)
@@ -77,13 +94,14 @@ BuildRequires:  pkgconfig(icu-i18n)
 BuildRequires:  pkgconfig(icu-uc)
 BuildRequires:  pkgconfig(lcms2)
 BuildRequires:  pkgconfig(libjpeg)
+BuildRequires:  pkgconfig(libpng16)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(openssl)
 BuildRequires:  pkgconfig(poppler) > 21.03.0
 BuildRequires:  pkgconfig(zlib)
 Requires:       hicolor-icon-theme
-Recommends:     python3-Pillow
-Recommends:     python3-tk
+Recommends:     %{pyver}-Pillow
+Recommends:     %{pyver}-tk
 Recommends:     scribus-doc
 # Not packaged anymore
 Provides:       scribus-devel = %{version}
@@ -114,7 +132,11 @@ find . -type f \( -iname \*.py -o -iname \*.cpp -o -iname \*.h \) -exec dos2unix
 # Unused test file still using QQC1
 rm scribus/ui/qml/qtq_test1.qml
 
+%if 0%{?suse_version} > 1500
 find . \( -name "*.py" -o -name "*.html" \) -exec sed -i 's#/usr/bin/env python.*#/usr/bin/python3#' {} \;
+%else
+find . \( -name "*.py" -o -name "*.html" \) -exec sed -i 's#/usr/bin/env python.*#/usr/bin/python3.11#' {} \;
+%endif
 
 %build
 # Don't use the %%cmake macro, it causes crashes when starting scribus