forked from pool/libreoffice
Compare commits
11 Commits
Author | SHA256 | Date | |
---|---|---|---|
|
f6cd0e9121 | ||
|
d6b8a53a32 | ||
|
0292d54a41 | ||
|
968dea0ee1 | ||
|
0a8b5bf150 | ||
|
e12ee94c4c | ||
56b521ccd8 | |||
81fe87308e | |||
|
4a7ac68264 | ||
d0ab66bf1d | |||
7ea89afe14 |
BIN
curl-8.11.0.tar.xz
(Stored with Git LFS)
Normal file
BIN
curl-8.11.0.tar.xz
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
curl-8.9.1.tar.xz
(Stored with Git LFS)
BIN
curl-8.9.1.tar.xz
(Stored with Git LFS)
Binary file not shown.
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:884486836a6830d761252a5b53c7bc4a5eba2f6ead26d60564250910038811e7
|
||||
size 280526240
|
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmbezu4ACgkQ9DSh76/u
|
||||
rqPEGg/9HucmcuTW7Tadz/KPzq4oZEBhEmfwaDUETmEGNMkNUnNIHBCMNG6Z+ki7
|
||||
1xca63pAT73h+X4Pi1lSlI8pdRIuMyLZsPSsavHfEYXKhgAx8DCnn83lihfGgGsb
|
||||
Jx7fqBnqpwSPTXsrkTgX7HDSzlM1orIWTDwmMHRmZv8wKAp/qZQkx0wN+QfoKcQw
|
||||
RWXcoMFj3IPkoVDHKhKcCLt1kuWHCkC2pxwuE97+jSJ9W+qzvtSQfKHgDt1PCmHc
|
||||
UD2+Jfy+X4XG/u4Ry/qQrqStqEaWkmI3k+wKIa1B2pAjQMZRaEP8EJY1u84qNxvs
|
||||
T5fdV60r7CFJOjvocQNfyzgvPWUEwdlmK5nXwMc6/+8TFrYprfen9RGlAzldtI30
|
||||
6n6CRzU3PaSlOmiwOeSPTR6KzCFyfBNU/q3DBVCRL3c4BxDJK8f6xZHJSA8VCwuN
|
||||
MMKqLVK2b9snFCuNRq+8/kn34X7xaTAb8J1eUVK9rfa5qU3v614xegBKJyQGENqU
|
||||
2nPksI0XKSmYm29AJQBVgzRNhVbZG6xznk/3uWure6tCU0tXwfMoRK8B21AKI5Pq
|
||||
lldBbUJejj7sDNWnVqk3IfG5xgdLrP/Y/uvCVKxd9Uwi/VqwprvOlU6AmxnwkGLS
|
||||
kvQKsBVZ7gtQTDE82ISs2xibhwNtB7nPxNFjMSFUQWO4icgIn6M=
|
||||
=ao64
|
||||
-----END PGP SIGNATURE-----
|
3
libreoffice-24.8.4.2.tar.xz
Normal file
3
libreoffice-24.8.4.2.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1564de2ea39aa91a66315c051058e43a0be4536ae88c43fdf0f8ce0ebe081a17
|
||||
size 280866972
|
16
libreoffice-24.8.4.2.tar.xz.asc
Normal file
16
libreoffice-24.8.4.2.tar.xz.asc
Normal 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-----
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5b31c294c96b0eb744e7ae592e3c5b2caaa8dff0455f68d9c32068a4320b0650
|
||||
size 166985796
|
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmbezvMACgkQ9DSh76/u
|
||||
rqMjXA/8C0LEUd2RNdea+xn5wcGSRNkQebBu9gB8MSYa0/vvu0wT6lbMBZXAB6J6
|
||||
O0O0fl/hhtGMGY63TiCm2RD0F8H9qJTYqPVJ2BbdRUjAuKhKNv3lbj7pQRsrdsd8
|
||||
dhAdayRHCOI1plYE9edn6yltFzHAJpKYOkWveBLBypR6byh4QTXqnAdZfxJnXsoT
|
||||
cQdnJ91DFz3KHxtVTLGdZyAaEztzjmkMacchP/X+XnBpIxtG/fo3zvBfY9t1j99c
|
||||
jf0EIqqruAV5w0yrUBuUQg6HB8amlkYtPk2dwc9ZcAkrccTIXswicBsygvq5XDOW
|
||||
mN0KQSRvNmMrZ6XnVlMiaOf2G8VDMnfC57f66E6LtV+3MF4g5KeYsqBOSQ3X/Js2
|
||||
nsh2Dl9es06eoqwQTwezETV6ej4s+JGGvXf4GPJ+LbBUPm72GYA7ILlKW5e+e6Ri
|
||||
9o5ZYPhixxcAAP7+8HYStzyDi/UimzxkqCuT5cky3XHw+lLgvrvqhoSTzmlWZIci
|
||||
mtp9EINH02Fa1dcdG36QkFtHz72mdAXDKsamJKlPGgGN7fF4hpAbDej5NNApTwD2
|
||||
wcMSMomfa0m7iU1LJ+KD/aOamdZhj/LgxiG41SbHttzja/3xeJoZB6SY9T5OAuuL
|
||||
HrwWWJe3Jj/PEiXnUkma8GWkLsnYgCmwNacok8aZiwVnCJKWTrc=
|
||||
=kJVJ
|
||||
-----END PGP SIGNATURE-----
|
3
libreoffice-help-24.8.4.2.tar.xz
Normal file
3
libreoffice-help-24.8.4.2.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f00e4bfada8fa10b6fc60524429e06124e7118664be6e26cae3bd61e5cbc097c
|
||||
size 168648932
|
16
libreoffice-help-24.8.4.2.tar.xz.asc
Normal file
16
libreoffice-help-24.8.4.2.tar.xz.asc
Normal 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-----
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a14e17cf480fdd8f2289bde7cdf48514f9ceea438211e8de6066886a8c92134b
|
||||
size 222036344
|
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmbezvQACgkQ9DSh76/u
|
||||
rqO0UA/8DMy4SMVzjm/nJNc2KAX+Ygae5uYpuT4++jepwQR/2gCr02nAYgIcJy8e
|
||||
SDf9biu1yCjL47vsyuVj5iY/U5dguFhCkjhFU82VftUf3lH1lJqwL0cS9vRvhQrp
|
||||
Cpzah3IdKb1nSOkQK95HOxnN1DD2e6g7xdo71K325juNcn3ITyiF2Y0eStDubnsz
|
||||
vsV75wvCMagm28PKYjGNlb6NriElT6QCv+r4fxbQxbyTn3OdQ+dM01CWfNAct+9M
|
||||
T+WtTRlOdVkPFtzOHFcVGeUPU8SarUOTO9LeeGdCURtyafFxDCphKlDqcyOQhRB0
|
||||
5kJzVrcTe0+o2EE5qsuKiQbxDZj5nLyuIpdiy+9Wvbc06bZ5sKDwN3uTb7yUGA1D
|
||||
tLgpryDlaNKm9D7DAXn4uH+Crm9SnzUoqKCE42lEtISWiILuCfeEUjdZOjEoJd3Q
|
||||
HoFMeLV9gJ4e6TiGJp1+l94AVDSPzljt8xKqdZPYl9Rhp3PYSWYnwKlyexocFEsp
|
||||
dSkytDTscKszq13vsLinyVyoN8Jm6scVWRQUSpx6SFQmHt8ODb3Rp/jFnFWa3Yvq
|
||||
64s2ZjBegowWU1lkreNGNcv4fvFSeVEu+bkt47bL3knryehj/0KblmUr6MbbUFLG
|
||||
AF+N7IVCnWouCQjr3LEzDsDiXdsWQZZmayOJcNLj2viXlBODhjY=
|
||||
=dNaF
|
||||
-----END PGP SIGNATURE-----
|
3
libreoffice-translations-24.8.4.2.tar.xz
Normal file
3
libreoffice-translations-24.8.4.2.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8d525b83bb5b2a8f831bb40dd0f7eeea35e134d204d590c85af22756b0a8047d
|
||||
size 225715276
|
16
libreoffice-translations-24.8.4.2.tar.xz.asc
Normal file
16
libreoffice-translations-24.8.4.2.tar.xz.asc
Normal 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-----
|
@ -1,3 +1,44 @@
|
||||
-------------------------------------------------------------------
|
||||
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>
|
||||
|
||||
- Don't use system abseil-cpp on versions lower than Tumbleweed or SLE16.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 14 13:17:22 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Update to 24.8.3.2 (24.8.3 final)
|
||||
* Release notes:
|
||||
https://wiki.documentfoundation.org/Releases/24.8.3/RC1
|
||||
https://wiki.documentfoundation.org/Releases/24.8.3/RC2
|
||||
- Update bundled dependencies:
|
||||
* curl 8.10.1 -> 8.11.0
|
||||
- New translation: Tagalog
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 27 22:34:11 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Update to 24.8.2.1 (24.8.2 final)
|
||||
* Release notes:
|
||||
https://wiki.documentfoundation.org/Releases/24.8.2/RC1
|
||||
- Update bundled dependencies:
|
||||
* curl 8.9.1 -> 8.10.1
|
||||
* tiff 4.6.0t -> 4.7.0
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 12 12:53:09 UTC 2024 - Martin Schreiner <martin.schreiner@suse.com>
|
||||
|
||||
|
@ -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
|
||||
@ -59,6 +59,13 @@
|
||||
%bcond_with firebird
|
||||
%endif
|
||||
|
||||
# Disable system abseil-cpp on versions lower than TW / SLE16
|
||||
%if 0%{?suse_version} < 1600
|
||||
%bcond_with system_abseil_cpp
|
||||
%else
|
||||
%bcond_without system_abseil_cpp
|
||||
%endif
|
||||
|
||||
# Use system gpgme and curl on TW and SLE15-SP4 or newer
|
||||
%if 0%{?suse_version} > 1500
|
||||
%bcond_without system_gpgme
|
||||
@ -78,7 +85,7 @@
|
||||
%global with_gcc 12
|
||||
%endif
|
||||
Name: libreoffice
|
||||
Version: 24.8.1.2
|
||||
Version: 24.8.4.2
|
||||
Release: 0
|
||||
Summary: A Free Office Suite (Framework)
|
||||
License: LGPL-3.0-or-later AND MPL-2.0+
|
||||
@ -134,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
|
||||
@ -152,8 +161,8 @@ BuildRequires: zxcvbn-devel
|
||||
%if %{with system_curl}
|
||||
BuildRequires: curl-devel >= 7.68.0
|
||||
%else
|
||||
Source2013: %{external_url}/curl-8.9.1.tar.xz
|
||||
Provides: bundled(curl) = 8.9.1
|
||||
Source2013: %{external_url}/curl-8.11.0.tar.xz
|
||||
Provides: bundled(curl) = 8.11.0
|
||||
%endif
|
||||
# Needed for tests
|
||||
BuildRequires: dejavu-fonts
|
||||
@ -165,9 +174,11 @@ BuildRequires: fontforge
|
||||
BuildRequires: frozen-devel
|
||||
BuildRequires: glm-devel
|
||||
# Needed for tests
|
||||
BuildRequires: google-carlito-fonts
|
||||
%if %{with system_abseil_cpp}
|
||||
BuildRequires: abseil-cpp-devel
|
||||
%endif
|
||||
BuildRequires: dragonbox-devel
|
||||
BuildRequires: google-carlito-fonts
|
||||
BuildRequires: gperf >= 3.1
|
||||
BuildRequires: graphviz
|
||||
BuildRequires: hyphen-devel
|
||||
@ -303,7 +314,7 @@ Obsoletes: %{name}-icon-theme-oxygen < %{version}
|
||||
Source2020: %{external_url}/boost_1_85_0.tar.xz
|
||||
Source2023: %{external_url}/poppler-24.08.0.tar.xz
|
||||
Source2024: %{external_url}/poppler-data-0.4.12.tar.gz
|
||||
Source2030: %{external_url}/tiff-4.6.0t.tar.xz
|
||||
Source2030: %{external_url}/tiff-4.7.0.tar.xz
|
||||
Provides: bundled(boost) = 1.85.0
|
||||
Provides: bundled(poppler) = 24.08.0
|
||||
Provides: bundled(poppler-data) = 0.4.12
|
||||
@ -1057,6 +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 -T
|
||||
%langpack -l tn -n Tswana -X
|
||||
%langpack -l tr -n Turkish -X -T -m tr_TR
|
||||
%langpack -l ts -n Tsonga -X
|
||||
@ -1122,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
|
||||
@ -1245,6 +1263,11 @@ export NOCONFIGURE=yes
|
||||
%else
|
||||
--disable-firebird-sdbc \
|
||||
%endif
|
||||
%if %{with system_abseil_cpp}
|
||||
--with-system-abseil \
|
||||
%else
|
||||
--without-system-abseil \
|
||||
%endif
|
||||
%if 0%{?suse_version} < 1550
|
||||
--without-system-boost \
|
||||
--without-system-poppler \
|
||||
|
36
poppler_24.10-2.patch
Normal file
36
poppler_24.10-2.patch
Normal 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(),
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d6da35c9986a4ec845eb96258b3693f8df515f7eb4c1e597ceb03e22788f305b
|
||||
size 2336816
|
BIN
tiff-4.7.0.tar.xz
(Stored with Git LFS)
Normal file
BIN
tiff-4.7.0.tar.xz
(Stored with Git LFS)
Normal file
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user