Accepting request 1234469 from LibreOffice:Factory

- Update to 24.8.4.2 (24.8.4 final)
  * Release notes:
    https://wiki.documentfoundation.org/Releases/24.8.4/RC1
    https://wiki.documentfoundation.org/Releases/24.8.4/RC2
- Enable HTML help files for the Tagalog translation.

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

OBS-URL: https://build.opensuse.org/request/show/1234469
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=302
This commit is contained in:
Ana Guerrero 2025-01-03 13:17:18 +00:00 committed by Git OBS Bridge
commit f6cd0e9121
15 changed files with 119 additions and 60 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5d709bac629d550b3ff3b7866f7758820a0badbfba06b9cfb946ec037b5f47e9
size 280705168

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmcuNnsACgkQ9DSh76/u
rqNh6xAAnEXxRZq9jBXhRODcGhpns8AhbxjNk6VIynImKrT/lgSVNToo2xIfY6Pb
boPNvqu4q1Pf/OTvycph3EcxHN0KEeKvh1EQsfHZ69wj+PNlQ2RnMfQ87mDosApD
+RPCmOwJAqyys4f9UAyp5SICRgxofOHEOCVnynxq/hnPJLLv82ie8y4k8ZCHiajC
0HtllYeHW9fm2NZEYrB2Gtyo1FeofpQaykgmWfy3hK4uGtFh0MlYo2zva4PxLoJV
CJvlCMDstdUhlG+RlvDgdigwP3zbQ3Fy0k2OVTkeltFWQCBlwvOoQHTCh3iLWKZl
ne3dxvyBFsBpwkv9CjXdZWQpxDZ97WKLgTJ9BAXUSQ0u/EK9RlsE0WtqyedjmtkB
6sOZpTkd6gZ2nIVIDuotRGV5QxgKBrym2w3ZTDjp9GP9BmiXv/XfeiwGMdZi0BPv
NB92f3fjzN1tcWsMlA4FbB5SddLDKh6oo7LdtLl8Fj9w+R5qAF8ZHBzepQacOS/1
l4YbRyHpYCWUSYqicLn76ImFRNkeEi3S7N3NZiHWkLs1lKascARVKR6Vl+u+XWo+
6HK2CpCE6nXGxtbXrTm6bGaeMKf7snpq0k1OD7P2/ruowjn0CszjYtMDXhY75D4R
Mogzy+6epHRAr9xycJI6I9Q0lFhd1lHr7kJScYVwNmYMMD1yYVc=
=EkMr
-----END PGP SIGNATURE-----

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1564de2ea39aa91a66315c051058e43a0be4536ae88c43fdf0f8ce0ebe081a17
size 280866972

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmdbXA0ACgkQ9DSh76/u
rqMs8Q//czrx0nIsduH5/3/ADZXR2LLe22t28Q6UhkDHWsAEvuvvJW3o1P9xTpsg
dmmysIYuYUYiSkAPFLsFXh+OYBWRzXeutKHH3lqckxAH60Of4S7p1tebYxvi+kMA
FDCm2+OCE8Ro+bENaOAE8qXuONKYf/VKjzQ3/2YQR2TqHq4Flfa1uKsnozKW3aSi
vYSthYukjzBb0u6GWQ2CCWSdIz6V/WcUKi/AyGvLeH5TG4BJoXjL13tSdr8RCobn
wKTJHHikf2fXj0rkw0dvJzQHSViQbI0khyQ3kjTPrxT2WFsxc+I7Pww0+CY0H7Jb
tF6rStCiqBntFZ4O9D7Tl+YsQZSWQ6wBIFGCq5lEh+3Bl5zaVSd2F/LFQDryxA/3
cX3kbpBX8ECePj5zfgNIhcyBCZJFpeMPgwRK5MAGPfDnF8KU6wVHf6mzmhJhehP2
KmwTGGqBjkiNAqH9EIMKyILltBKTdPYjlLlRfqvzfmLAvlI/jKgGlzCqP37WOl0r
GGRE6CbhS7Y2uX4G4WvtEMjNm7P2dzjQQH7Pm1hGLAlS5t7YoAzF+PSMcoaBFnt2
dniI+8S8khfB8w43QZlLkCLEyhLgsVnefhzfCCTwHCOVohyceYgrfZcG37Iy4fas
OyVn/II3gaY2G9VZ2nD/+Z/83+u7m5MqeC+T6kfnX2VqEwaWFwI=
=Z0ze
-----END PGP SIGNATURE-----

View File

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

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmcuNn8ACgkQ9DSh76/u
rqMKYBAAybgaTLnNObh8cYO1dALaz08HeWXtFv5UuNT+E2VUaLM7bp6fQQ5lz9b0
lwzbDleWeZTJdlzVqFuMXDV9T3pCTbpP78jGR0c2KSETAJ3ya3a229WAABW4AE5w
hXalwgeESisG8YkhiLL7zPOrFAVcT5xiQbsPRCURr7Yf97TvqridOpsjCYafDGbS
bd9qbPUEOfpoQBAhD2mUeNav+lGWoYQHfDbftIdBA0Rel6HVb2ph5VSE2oBp1E2Z
PpjAhwYOf0LcFStKEWse/+RWDzUjyKV9K0ZjzScg+OZmuD3gcyIlj3VktInhmzFK
nTqazrjZROwv2qt4rpg+784J9wj2mgh8dcMykBHdYEFuQnFlbvZtAqfA/JULO7zm
8vHWGDnWg+5PwznyYjM0xeUFl3tennvtEejUjLLW48x5o9zG+t6KQp9fVTsLmchd
15pnLGbhPAIIcyCmNsYLyeLuhMFGiKe184yEOIeYtCbJkNvyx0Wto9mVKq8rok/3
DWmbKe0Kk/bHkwvPkoyk/boyTivQ3HNyDd8Qgsvo/hIlPYcRwJQ22mSIIRFdcrxw
60cXtmRnIEVfUWyfOi7pd+toPgjx3P0ZSJ7xBa5p+hOE6sXbt7nilGAC+kNAHWOR
DixDAUyAAE/lKVOVfrqMBoGT8ALcmiaVEI/6EGuYwxPqDZuZsic=
=ILLN
-----END PGP SIGNATURE-----

View File

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

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmdbXBMACgkQ9DSh76/u
rqOHaw//f9UVB+F6zzyR7UnGTa9TabI1kgqhMLuAozOld/m5xCXUErbisqKLDi6N
d6sD3CfFdM0+F5l6q4607L0SpIJgM8Hf0Qq7u7uqTK50PDog9q/G03mck5aQDqI7
OfJtYWZzm2uZNOSnIbG9pGsFzK6IjSmi6aFVe+LR3HWioY1cVGCjVOUUOJux816Z
nWtG+Vt+k1kKSS5AVBUN2zsy/QqrLCjz6zUgXPUGlQQFIRhdVaSXBGQ3jhNO3nKI
P9mlq1VNMoJ5g+xVwUvCGeSwFg1NFgj2ynlvWeABpXPE5zAT4/cm/d0xDuZ+rEZW
JKp1denInxkep+PZWo5HuDrQzuj7qfyiCxf+p7A2JtUGNJdCH+rTJgdi0J3dRQUI
MWhZ6RxT/ar3rDgRxKJVyKawT6ZZykjEw/9CUyY0+tjG976XsiP4CnsA37eGPK4N
ahYqiFh9Tcr45PJKlEbtTUlXALFRk+S3bpzgLW9vRL3vqtjJEdbSajNYfBHPYDUe
Bdyl20jLwAuE4Znz2HxniQ5Xp5NeVH2KYjmIaZIHdh6ahz29JwvZcvlO26V46wzZ
2h8VTD3+9gZp2RUHCzztcgHbXVvkEVCezemG49jQBNefIpW/KFxsI5m6FbSFcVwR
Z/Tv/H/m7JYIn0QWUoLErG+dCyAed28iu82EHqDCH2w9rvARBKo=
=k/hC
-----END PGP SIGNATURE-----

View File

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

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmcuNn8ACgkQ9DSh76/u
rqNdvQ//We5N9WJPuszsSv3nyeJdFiemdeLMdF3sRp3fG6hoQY1Qd4FW5ZS54WlN
Svge8fl0HNKmiyAx5JC/bdTdLGk3Et99D1mJNg/54mbNjDRWc0zy+Y5+bcFQc8vJ
XOM+LXrurbgw6kbi6+5g6fYfDE2y8TtMgC4+hcjW2Btixe6LAeIvbsMEpxPdke32
p6Wt/XWKrB2gzYH7dB0wMCwjOFVC+Lya49PwGRMUkPxXoS8+Pl656abgiC5uZSzR
Txsd0+dHq2lHtxChAD5zcBNVp1Fqmcy05KDFiLxtjMYrU+awc3YiT6/s6noYZ6vp
W6aontnLF4DoGBSIn0LbznNeAf1tjhrR3Okz78aeJ0Xb7Fb56WLkrpgerX/7RpIY
9g+/dcEihylbsdcchAxlmVk9Xnqraqr+7CHeCBfvQYF9JIalkhH+DPzR+AwSNH9B
kR5xvQF7T6xTldOGUpnSEjjownbzfTlUga0U5T9xAObD9oJuP+Hu3+YXTXe2ziVH
RNogSLhB2W7x5ao7hBeeXn6Z5IDZH4zmVqAAG1fF5z04GC8UddHf59drkIrybnlp
RZNVX2Q+ixve9xwXf8QniLK8MQ9jVb2zVWHartIxA8CyVcDaZVULhD0VMGqgTYzi
jK318KIM3RU/aGM6e+di1sytJjgZhu8Hx5h2oZM9vunoFn8AYJc=
=hKX0
-----END PGP SIGNATURE-----

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8d525b83bb5b2a8f831bb40dd0f7eeea35e134d204d590c85af22756b0a8047d
size 225715276

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmdbXBQACgkQ9DSh76/u
rqN3Ng//Zmsx1bDZUIvdvLj0y2UdV6ucdVfEspSlRddEiAa86XI1jAAArlh39JTr
BTkmpxKiozJicqZ97rJcSI4rBt/Ch/8kS4K/87meuXZzB59aL6r6bxjM1KJfSUyg
+P4RjVSkAm1L7yjBSupIbrTNf3/b4mqAVWdEHkPxmv5cw0M0tuPDnL5P9ERLkyRT
zJY+k5tJ66Jz3ppd00awz9tS270pnwvv29qjgZBTI+jW8WWL1Kafx0wpTnWjfJ74
fThhKksTJNeRKcO4qMndQdnYx0sCpE2PTKOOVB3xrmRc7S0gwCFmkMdSsBK62XG+
HsZtiAvqtbXfWt47yowSWUThj+nCcnSQpfN8CFQ2xvcUMYnPvj2lduSbVpK8CGKu
f87ouev4Sl/b1UF850r+BwV/OEgKlQWl6sJB1r4jlvn20tw1xifcLOW10z0CoZji
UA5EVkaETkXSzD59qTNsErg8mWmdnfWkOmYOPPMUWgeCZUB4XUI0ybvYZKB2j4ga
iIcJJNDVDvaCE3pMibPj+OfvHJRrtquexhFUsxzR9qtwOEij/bikmqPJfrJss7S8
1Mffggh6a4tNFu6W6negoomkABD9rTTiHVHt4O7NCmMgI1GlQdTAjRAxPM49VmUj
d3msAroZm09BJWmmdPWIp4045ZfodoERgGIJM41yaKnecyY3dJ8=
=m0E4
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Tue Dec 31 23:01:19 UTC 2024 - Martin Schreiner <martin.schreiner@suse.com>
- Update to 24.8.4.2 (24.8.4 final)
* Release notes:
https://wiki.documentfoundation.org/Releases/24.8.4/RC1
https://wiki.documentfoundation.org/Releases/24.8.4/RC2
- Enable HTML help files for the Tagalog translation.
-------------------------------------------------------------------
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>

View File

@ -1,7 +1,7 @@
#
# spec file for package libreoffice
#
# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -85,7 +85,7 @@
%global with_gcc 12
%endif
Name: libreoffice
Version: 24.8.3.2
Version: 24.8.4.2
Release: 0
Summary: A Free Office Suite (Framework)
License: LGPL-3.0-or-later AND MPL-2.0+
@ -141,6 +141,8 @@ Patch991: libreoffice-no-destdircheck.patch
Patch992: python34-no-f-strings.patch
# PATCH-FIX-OPENSUSE override date in clucene files (boo#1047218)
Patch995: reproducible-clucene.patch
# PATCH-FIX-UPSTREAM Fix build with poppler 24.12
Patch1000: poppler_24.10-2.patch
BuildRequires: %{name}-share-linker
BuildRequires: ant
BuildRequires: autoconf
@ -1066,7 +1068,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
%langpack -l te -n Telugu -m te_IN -X
%langpack -l tg -n Tajik -T -X
%langpack -l th -n Thai -s ctl -c ctlseqcheck_th -m th_TH -X
%langpack -l tl -n Tagalog -X
%langpack -l tl -n Tagalog -X -T
%langpack -l tn -n Tswana -X
%langpack -l tr -n Turkish -X -T -m tr_TR
%langpack -l ts -n Tsonga -X
@ -1132,6 +1134,12 @@ if grep -q setSegmentInfoStartVersion /usr/include/CLucene/index/IndexWriter.h ;
%patch -P 995 -p1
fi
%if 0%{?suse_version} >= 1550
%if %{pkg_vcmp libpoppler-devel >= 24.12}
%patch -P 1000 -p1
%endif
%endif
# Do not generate doxygen timestamp
echo "HTML_TIMESTAMP = NO" >> odk/docs/cpp/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(),