Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package scribus for openSUSE:Factory checked in at 2026-02-10 21:10:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scribus (Old) and /work/SRC/openSUSE:Factory/.scribus.new.1670 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scribus" Tue Feb 10 21:10:32 2026 rev:96 rq:1330958 version:1.6.5 Changes: -------- --- /work/SRC/openSUSE:Factory/scribus/scribus.changes 2025-12-30 12:01:11.610603695 +0100 +++ /work/SRC/openSUSE:Factory/.scribus.new.1670/scribus.changes 2026-02-10 21:10:33.454874172 +0100 @@ -1,0 +2,6 @@ +Wed Feb 4 13:16:45 UTC 2026 - Christophe Marin <[email protected]> + +- Add upstream change (boo#1257664) + * 0001-Fix-build-failure-with-poppler-26.01.0.patch + +------------------------------------------------------------------- New: ---- 0001-Fix-build-failure-with-poppler-26.01.0.patch ----------(New B)---------- New:- Add upstream change (boo#1257664) * 0001-Fix-build-failure-with-poppler-26.01.0.patch ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scribus.spec ++++++ --- /var/tmp/diff_new_pack.YZNOie/_old 2026-02-10 21:10:34.466916580 +0100 +++ /var/tmp/diff_new_pack.YZNOie/_new 2026-02-10 21:10:34.466916580 +0100 @@ -1,7 +1,7 @@ # # spec file for package scribus # -# Copyright (c) 2025 SUSE LLC and contributors +# 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 @@ -51,6 +51,8 @@ %endif # PATCH-FIX-OPENSUSE Patch0: 0001-Make-sure-information-displayed-on-the-about-window-.patch +# PATCH-FIX-UPSTREAM +Patch1: 0001-Fix-build-failure-with-poppler-26.01.0.patch BuildRequires: cmake >= 3.14.0 BuildRequires: cups-devel BuildRequires: dos2unix ++++++ 0001-Fix-build-failure-with-poppler-26.01.0.patch ++++++ >From 8dc2b21936e05cc5eb3398f7da06733ff0794934 Mon Sep 17 00:00:00 2001 From: Jean Ghali <[email protected]> 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
