Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2026-02-19 14:20:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreoffice (Old) and /work/SRC/openSUSE:Factory/.libreoffice.new.1977 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice" Thu Feb 19 14:20:03 2026 rev:318 rq:1333738 version:25.8.3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2025-11-20 14:46:52.413492837 +0100 +++ /work/SRC/openSUSE:Factory/.libreoffice.new.1977/libreoffice.changes 2026-02-19 14:20:06.858609072 +0100 @@ -1,0 +2,7 @@ +Tue Feb 17 22:07:01 UTC 2026 - Stefan Brüns <[email protected]> + +- Fix build with Poppler 26.01.0/26.02.0 (boo#1257664): + * Add fix_poppler_26.01.0.patch + * Add fix_poppler_26.02.0.patch + +------------------------------------------------------------------- New: ---- fix_poppler_26.01.0.patch fix_poppler_26.02.0.patch ----------(New B)---------- New:- Fix build with Poppler 26.01.0/26.02.0 (boo#1257664): * Add fix_poppler_26.01.0.patch * Add fix_poppler_26.02.0.patch New: * Add fix_poppler_26.01.0.patch * Add fix_poppler_26.02.0.patch ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice.spec ++++++ --- /var/tmp/diff_new_pack.YETsB1/_old 2026-02-19 14:20:13.230870553 +0100 +++ /var/tmp/diff_new_pack.YETsB1/_new 2026-02-19 14:20:13.234870717 +0100 @@ -152,6 +152,10 @@ Patch15: fix-sdk-idl.patch # PATCH-FIX-UPSTREAM Patch16: boost-1_89_0.patch +# PATCH-FIX-UPSTREAM +Patch17: fix_poppler_26.01.0.patch +# PATCH-FIX-UPSTREAM +Patch18: fix_poppler_26.02.0.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff # save time by relying on rpm check rather than doing stupid find+grep @@ -1124,6 +1128,8 @@ %endif %patch -P 15 -p1 %patch -P 16 -p1 +%patch -P 17 -p1 +%patch -P 18 -p1 %patch -P 990 -p1 %patch -P 991 -p1 %if 0%{?suse_version} < 1550 ++++++ fix_poppler_26.01.0.patch ++++++ >From b307d254a88a87fe59f9c041346657790c75ac16 Mon Sep 17 00:00:00 2001 From: Xisco Fauli <[email protected]> Date: Wed, 7 Jan 2026 14:06:55 +0100 Subject: [PATCH] poppler: upgrade to 26.01.0 Adapt external/poppler/poppler-config.patch.1 after commit 808094b11c07b1895bc9a1d03e338584045e6087 Author: Albert Astals Cid <[email protected]> Date: Fri Dec 5 01:59:41 2025 +0100 cmakedefine -> cmakedefine01 Downloaded from https://poppler.freedesktop.org/poppler-26.01.0.tar.xz Change-Id: I8cf88d535e6fbd85fa0761fa23ac790c01711e01 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196684 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> --- .../pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 15 +- .../pdfimport/xpdfwrapper/pnghelper.cxx | 25 +- 4 files changed, 81 insertions(+), 184 deletions(-) diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx index a3b34db15464d..6b9184809803d 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx @@ -231,7 +231,10 @@ static void writeJpeg_( OutputBuffer& o_rOutputBuf, Stream* str ) #else str = ((DCTStream *)str)->getRawStream(); #endif -#if POPPLER_CHECK_VERSION(25, 2, 0) +#if POPPLER_CHECK_VERSION(26, 1, 0) + if (!str->rewind()) + return; +#elif POPPLER_CHECK_VERSION(25, 2, 0) if (!str->reset()) return; #else @@ -272,7 +275,10 @@ static void writePbm_(OutputBuffer& o_rOutputBuf, Stream* str, int width, int he o_rOutputBuf.resize(header_size); // initialize stream -#if POPPLER_CHECK_VERSION(25, 2, 0) +#if POPPLER_CHECK_VERSION(26, 1, 0) + if (!str->rewind()) + return; +#elif POPPLER_CHECK_VERSION(25, 2, 0) if (!str->reset()) return; #else @@ -334,7 +340,10 @@ static void writePpm_( OutputBuffer& o_rOutputBuf, width, colorMap->getNumPixelComps(), colorMap->getBits())); -#if POPPLER_CHECK_VERSION(25, 2, 0) +#if POPPLER_CHECK_VERSION(26, 1, 0) + if (!imgStr->rewind()) + return; +#elif POPPLER_CHECK_VERSION(25, 2, 0) if (!imgStr->reset()) return; #else diff --git a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx index e21d9192f563e..6e9784d4aa6bb 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx @@ -214,7 +214,10 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf, int nLineSize = (width + 7)/8; aScanlines.reserve( nLineSize * height + height ); -#if POPPLER_CHECK_VERSION(25, 2, 0) +#if POPPLER_CHECK_VERSION(26, 1, 0) + if (!str->rewind()) + return; +#elif POPPLER_CHECK_VERSION(25, 2, 0) if (!str->reset()) return; #else @@ -257,7 +260,10 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf, width, colorMap->getNumPixelComps(), colorMap->getBits())); -#if POPPLER_CHECK_VERSION(25, 2, 0) +#if POPPLER_CHECK_VERSION(26, 1, 0) + if (!imgStr->rewind()) + return; +#elif POPPLER_CHECK_VERSION(25, 2, 0) if (!imgStr->reset()) return; #else @@ -299,7 +305,10 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf, maskColorMap->getNumPixelComps(), maskColorMap->getBits())); -#if POPPLER_CHECK_VERSION(25, 2, 0) +#if POPPLER_CHECK_VERSION(26, 1, 0) + if (!imgStrMask->rewind()) + return; +#elif POPPLER_CHECK_VERSION(25, 2, 0) if (!imgStrMask->reset()) return; #else @@ -353,7 +362,10 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf, width, colorMap->getNumPixelComps(), colorMap->getBits())); -#if POPPLER_CHECK_VERSION(25, 2, 0) +#if POPPLER_CHECK_VERSION(26, 1, 0) + if (!imgStr->rewind()) + return; +#elif POPPLER_CHECK_VERSION(25, 2, 0) if (!imgStr->reset()) return; #else @@ -392,7 +404,10 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf, std::unique_ptr<ImageStream> imgStrMask( new ImageStream(maskStr, maskWidth, 1, 1)); -#if POPPLER_CHECK_VERSION(25, 2, 0) +#if POPPLER_CHECK_VERSION(26, 1, 0) + if (!imgStrMask->rewind()) + return; +#elif POPPLER_CHECK_VERSION(25, 2, 0) if (!imgStrMask->reset()) return; #else ++++++ fix_poppler_26.02.0.patch ++++++ >From 3c29b709cd2b5b18776b3c15638b66bd8a7dcb07 Mon Sep 17 00:00:00 2001 From: Xisco Fauli <[email protected]> Date: Fri, 6 Feb 2026 00:53:12 +0100 Subject: [PATCH] poppler: upgrade to 26.02.0 * external/poppler/missinginclude.patch has been fixed upstream Downloaded from https://poppler.freedesktop.org/poppler-26.02.0.tar.x Change-Id: I7641b7b544e853a86563dbe312af4b36444dea8e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198803 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> --- .../pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 22 +++++++++- .../pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 21 +++++++++- 7 files changed, 69 insertions(+), 71 deletions(-) delete mode 100644 external/poppler/missinginclude.patch diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx index 6b9184809803d..f1487453eb503 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx @@ -711,13 +711,17 @@ void PDFOutDev::restoreState(GfxState*) printf( "restoreState\n" ); } -#if POPPLER_CHECK_VERSION(0, 71, 0) +#if POPPLER_CHECK_VERSION(26, 2, 0) +void PDFOutDev::setDefaultCTM(const std::array<double, 6> &pMat) +#elif POPPLER_CHECK_VERSION(0, 71, 0) void PDFOutDev::setDefaultCTM(const double *pMat) #else void PDFOutDev::setDefaultCTM(double *pMat) #endif { +#if !POPPLER_CHECK_VERSION(26, 2, 0) assert(pMat); +#endif OutputDev::setDefaultCTM(pMat); @@ -737,8 +741,12 @@ void PDFOutDev::updateCTM(GfxState* state, { assert(state); +#if POPPLER_CHECK_VERSION(26, 2, 0) + const std::array<double, 6> pMat = state->getCTM(); +#else const double* const pMat = state->getCTM(); assert(pMat); +#endif printf( "updateCtm %f %f %f %f %f %f\n", normalize(pMat[0]), @@ -1044,7 +1052,11 @@ void PDFOutDev::drawChar(GfxState *state, double x, double y, double csdx = 0.0; double csdy = 0.0; +#if POPPLER_CHECK_VERSION(26, 2, 0) + if (!state->getFont() || GfxFont::WritingMode::Horizontal == state->getFont()->getWMode()) +#else if (!state->getFont() || !state->getFont()->getWMode()) +#endif { csdx = state->getCharSpace(); if (*u == ' ') @@ -1067,7 +1079,11 @@ void PDFOutDev::drawChar(GfxState *state, double x, double y, const double aPositionX(x-originX); const double aPositionY(y-originY); +#if POPPLER_CHECK_VERSION(26, 2, 0) + const std::array<double, 6> pTextMat=state->getTextMat(); +#else const double* pTextMat=state->getTextMat(); +#endif printf( "drawChar %f %f %f %f %f %f %f %f %f ", normalize(aPositionX), normalize(aPositionY), @@ -1348,7 +1364,11 @@ poppler_bool PDFOutDev::tilingPatternFill(GfxState *state, Gfx *, Catalog *, const int nDPI = 72; // GfxState seems to have 72.0 as magic for some reason auto pSplashGfxState = new GfxState(nDPI, nDPI, &aBox, 0, false); +#if POPPLER_CHECK_VERSION(26, 2, 0) + auto pSplashOut = new SplashOutputDev(splashModeRGB8, 1, nullptr); +#else auto pSplashOut = new SplashOutputDev(splashModeRGB8, 1, false, nullptr); +#endif pSplashOut->setEnableFreeType(false); pSplashOut->startDoc(m_pDoc); pSplashOut->startPage(0 /* pageNum */, pSplashGfxState, nullptr /* xref */); diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx index b7bd912406b58..da587b1522d61 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx @@ -85,13 +85,21 @@ namespace pdfi isUnderline(rSrc.isUnderline), size(rSrc.size) { +#if POPPLER_CHECK_VERSION(26, 2, 0) + familyName.append(rSrc.getFamilyName()); +#else familyName.append(&rSrc.getFamilyName()); +#endif } FontAttributes& operator=( const FontAttributes& rSrc ) { familyName.clear(); +#if POPPLER_CHECK_VERSION(26, 2, 0) + familyName.append(rSrc.getFamilyName()); +#else familyName.append(&rSrc.getFamilyName()); +#endif isEmbedded = rSrc.isEmbedded; maFontWeight= rSrc.maFontWeight; @@ -104,12 +112,21 @@ namespace pdfi bool operator==(const FontAttributes& rFont) const { +#if POPPLER_CHECK_VERSION(26, 2, 0) + return getFamilyName().compare(rFont.getFamilyName())==0 && + isEmbedded == rFont.isEmbedded && + maFontWeight == rFont.maFontWeight && + isItalic == rFont.isItalic && + isUnderline == rFont.isUnderline && + size == rFont.size; +#else return getFamilyName().cmp(&rFont.getFamilyName())==0 && isEmbedded == rFont.isEmbedded && maFontWeight == rFont.maFontWeight && isItalic == rFont.isItalic && isUnderline == rFont.isUnderline && size == rFont.size; +#endif } GooString familyName; @@ -172,7 +189,9 @@ namespace pdfi //----- initialization and control // Set default transform matrix. -#if POPPLER_CHECK_VERSION(0, 71, 0) +#if POPPLER_CHECK_VERSION(26, 2, 0) +void setDefaultCTM(const std::array<double, 6> &pMat) override; +#elif POPPLER_CHECK_VERSION(0, 71, 0) virtual void setDefaultCTM(const double *ctm) override; #else virtual void setDefaultCTM(double *ctm) override;
