rpm/libreoffice
SHA256
1
0
Fork 0
forked from pool/libreoffice
Code Pull Requests Activity

- Add poppler_24.10-2.patch and apply conditionally: Fix build with

Browse Source 
poppler 24.12

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=1201
This commit is contained in:
Martin Schreiner 2024-12-30 18:12:07 +00:00 committed by Git OBS Bridge
parent 0a8b5bf150
commit 0292d54a41
3 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libreoffice.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Dec 29 09:56:21 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
- Add poppler_24.10-2.patch and apply conditionally: Fix build with
poppler 24.12
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Dec 11 14:14:16 UTC 2024 - Martin Schreiner <martin.schreiner@suse.com> Wed Dec 11 14:14:16 UTC 2024 - Martin Schreiner <martin.schreiner@suse.com>

8
libreoffice.spec
View File

@ -141,6 +141,8 @@ Patch991: libreoffice-no-destdircheck.patch
Patch992: python34-no-f-strings.patch Patch992: python34-no-f-strings.patch
# PATCH-FIX-OPENSUSE override date in clucene files (boo#1047218) # PATCH-FIX-OPENSUSE override date in clucene files (boo#1047218)
Patch995: reproducible-clucene.patch Patch995: reproducible-clucene.patch
# PATCH-FIX-UPSTREAM Fix build with poppler 24.12
Patch1000: poppler_24.10-2.patch
BuildRequires: %{name}-share-linker BuildRequires: %{name}-share-linker
BuildRequires: ant BuildRequires: ant
BuildRequires: autoconf BuildRequires: autoconf
@ -1132,6 +1134,12 @@ if grep -q setSegmentInfoStartVersion /usr/include/CLucene/index/IndexWriter.h ;
%patch -P 995 -p1 %patch -P 995 -p1
fi fi
%if 0%{?suse_version} >= 1550
%if %{pkg_vcmp libpoppler-devel >= 24.12}
%patch -P 1000 -p1
%endif
%endif
# Do not generate doxygen timestamp # Do not generate doxygen timestamp
echo "HTML_TIMESTAMP = NO" >> odk/docs/cpp/Doxyfile echo "HTML_TIMESTAMP = NO" >> odk/docs/cpp/Doxyfile
echo "HTML_TIMESTAMP = NO" >> odk/docs/idl/Doxyfile echo "HTML_TIMESTAMP = NO" >> odk/docs/idl/Doxyfile

36
poppler_24.10-2.patch Normal file
View File

@ -0,0 +1,36 @@
Submitted By: Bruce Dubbs <bdubbs at linuxfromscratch dot org>
Updated By: Douglas R. Reno <renodr at linuxfromscratch dot org>
Date: 2024-11-18
Updated: 2024-12-03
Initial Package Version: 24.8.3.2
Origin: Upstream
Upstream Status: Pending
Description: Fixes building Libreoffice with poppler-24.11.0.
Update Description: Fixes building Libreoffice with poppler-24.12.0 by
adjusting a call to getImageParams.
diff -up libreoffice-24.8.2.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.omv~ libreoffice-24.8.2.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
--- libreoffice-24.8.2.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.omv~ 2024-10-20 19:08:49.935352230 +0200
+++ libreoffice-24.8.2.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2024-10-20 20:01:30.448965822 +0200
@@ -1090,7 +1090,8 @@
int bitsPerComponent = 1;
StreamColorSpaceMode csMode = streamCSNone;
- str->getImageParams( &bitsPerComponent, &csMode );
+ bool hasAlpha = false;
+ str->getImageParams( &bitsPerComponent, &csMode, &hasAlpha );
if( bitsPerComponent == 1 && (csMode == streamCSNone || csMode == streamCSDeviceGray) )
{
GfxRGB oneColor = { dblToCol( 1.0 ), dblToCol( 1.0 ), dblToCol( 1.0 ) };
@@ -1306,9 +1306,9 @@ poppler_bool PDFOutDev::tilingPatternFil
0, nBitmapWidth * nBitmapHeight, Object(objNull)));
auto aDecode = Object(objNull);
std::unique_ptr<GfxImageColorMap> pRgbIdentityColorMap(new GfxImageColorMap(8, &aDecode,
- new GfxDeviceRGBColorSpace()));
+ std::make_unique<GfxDeviceRGBColorSpace>()));
std::unique_ptr<GfxImageColorMap> pGrayIdentityColorMap(new GfxImageColorMap(8, &aDecode,
- new GfxDeviceGrayColorSpace()));
+ std::make_unique<GfxDeviceGrayColorSpace>()));
OutputBuffer aBuf; initBuf(aBuf);
writePng_(aBuf, pRgbStr.get(), nBitmapWidth, nBitmapHeight, pRgbIdentityColorMap.get(),