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

Accepting request 1031352 from LibreOffice:Factory

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1031352
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=261
This commit is contained in:
Dominique Leuenberger 2022-10-27 11:52:41 +00:00 committed by Git OBS Bridge
commit e523b3e007
17 changed files with 130 additions and 4954 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
bsc1201095.patch Normal file
View File

@ -0,0 +1,47 @@
From 37e5c4fcbacb73138fe47bf12e27961a47b11af3 Mon Sep 17 00:00:00 2001
From: Sarper Akdemir <sarper.akdemir@collabora.com>
Date: Mon, 17 Oct 2022 09:06:20 +0300
Subject: [PATCH] tdf#151547 pptx import: workaround for COL_AUTO collision
In the current implementation of ::Color, it is not possible
to have fully transparent white text (since it collides with
COL_AUTO and gets interpreted as Automatic Color).
Implement a workaround for import of fully transparent white
text color so that it isn't interpreted as the magic value
COL_AUTO (i.e. instead of fully transparent #FFFFFF import
as fully transparent #FFFFFE).
Change-Id: Ide750093ef8a89f1424ddd8f4e9ee1e18209f2ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141439
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
(cherry picked from commit adfdd2bee4d1d59bf1ee372d9c242cf0b691e423)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141748
Reviewed-by: Andras Timar <andras.timar@collabora.com>
---
.../drawingml/textcharacterproperties.cxx | 8 +++++-
.../tdf151547-transparent-white-text.pptx | Bin 0 -> 32731 bytes
sd/qa/unit/import-tests2.cxx | 23 ++++++++++++++++++
3 files changed, 30 insertions(+), 1 deletion(-)
create mode 100644 sd/qa/unit/data/pptx/tdf151547-transparent-white-text.pptx
diff --git a/oox/source/drawingml/textcharacterproperties.cxx b/oox/source/drawingml/textcharacterproperties.cxx
index 7be4d89ae57c..e7bc36763049 100644
--- a/oox/source/drawingml/textcharacterproperties.cxx
+++ b/oox/source/drawingml/textcharacterproperties.cxx
@@ -142,7 +142,13 @@ void TextCharacterProperties::pushToPropMap( PropertyMap& rPropMap, const XmlFil
if (aColor.hasTransparency())
{
- rPropMap.setProperty(PROP_CharTransparence, aColor.getTransparency());
+ const auto nTransparency = aColor.getTransparency();
+ rPropMap.setProperty(PROP_CharTransparence, nTransparency);
+
+ // WORKAROUND: Fully transparent white has the same value as COL_AUTO, avoid collision
+ if (nTransparency == 100
+ && aColor.getColor(rFilter.getGraphicHelper()).GetRGBColor() == COL_AUTO.GetRGBColor())
+ rPropMap.setProperty(PROP_CharColor, ::Color(ColorTransparency, 0xFFFFFFFE));
}
}

4842
bsc1203502.patch
View File

File diff suppressed because it is too large Load Diff

3
libreoffice-7.4.1.2.tar.xz
View File

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

16
libreoffice-7.4.1.2.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmMbjn0ACgkQ9DSh76/u
rqNOdw//fd7+HxL62Nt5oZaKCM++E1fucqnQxU19TIyyq+mBZXwnjnuFvj6Yi8nS
gQCqNWDlTuZ+ZGkh4Av5IwU+k804jggT+PbiTDs6HxXtZt+hZJK+UHHn2jqagOli
vTE8RcHuY/mAb0VPhjp/AEb48QqPvV/eOn+zfcugmq3tj/0eBbtRgv8Nc7YGvOxj
WTRmk29+Jjw09cNMEV8iZxqi6rXOmab75PNcghGjVqYKI1d5/Vw/OFF007SQLN1Z
OQfCZ4+Eh9wpl0zhTcYvBJL93wlBpjFeRsq9y/NyMb0jeQJXlCwdpUsRDKUaeIYd
hRfEndSngO8KamKRPCxg9BmgDIrUqaQre/0gXRdSKxCJBSRSCzKXThid2z3AI9Iu
Q6UxjqAut4Kb3u9ukWa525Q6wLeRCjvvGT5m4EGpyi/bnfyrADLcbv2zXNmW7uvL
x9vCoqJoDn8ShKqXqHavFr6F6lnxwvH9cPKKqEKQnSm6oz5QNOPP+IIvFkhwULS/
vrLUjNsQJN2TVvEek/8W7C2bGBqW8zjSU2eFO5/ptRJKuvXThGYl/AG1C4mk9r5X
UhNrwDcIR/1b3BuU4tC2ujtfrviNUfxG72z/n4j585GZHi0MBQBSfo3bcfR+u6HJ
G8hlHRjzglvz2YGdJ/uEWKBm8ugwCAbM+2CZ2HgknGbkLWFSp0k=
=h7wY
-----END PGP SIGNATURE-----

3
libreoffice-7.4.2.3.tar.xz Normal file
View File

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

16
libreoffice-7.4.2.3.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmNEB+YACgkQ9DSh76/u
rqNfFxAAyQN5OODyj5Hjzh7qMHEwIykYvhAlTl8w8m586d2dB4EtEZRdUy/aJOob
9jLImkNUTbVuBRiTyNp++OEbkV/oGQvOK9cuRLvouxnuW5oOn//QWWYicPxd8LA7
c6TpmD7UDx6NP1LGEMriSjMDk+tEbr3jeXXiMjkhKveIFnx5FbZTdgCEsZ8eurBv
Q4Pq7kJ17QQM/YzWzzTve0/VlyQsCZMpDCJeBzCSPyIvXEQe/Q7GgnH0JSsZe76v
13hGwMNMVhQLbP5O9RDIVY1Sp8vJ15fkQOVTW/E//zuVCEgHqxpBNg0x6GUyLcPU
bury0/yjdJ3I3DovlYvSw6qUshUruj+MyDDEkWuXf8zGYkYWTN/liMTGkxmOvfDE
3uBsI5j49KMegP/NlOreNNRPoQKO7/ii7nDaUw9Np/IkaQ+4wHbiEdK5XZSNVNQp
zwYfwJu2Emp4Gb4D8CxDaF5PBWozZxb92/bPzqfw1cTAJilHyKyja/kbEM0WjuRZ
QqqEBtNeN+wlGd0Av0EOBu6Z/4M62dLVsAknc7v/A4GR4hwH0HAc+V5VjypTRkB9
9dhdFO3CVGsKixVvfwNwsNv8iEtkrKLbNhm9aZ7/Mf7i+fAM43zN0pAH5Obq9y18
mj6/ceBbjZ8DsGEmbf1tVuWgSsk8YcREpKOKY9Fw1Ot98dd3EO8=
=ldZl
-----END PGP SIGNATURE-----

3
libreoffice-help-7.4.1.2.tar.xz
View File

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

16
libreoffice-help-7.4.1.2.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmMbjoMACgkQ9DSh76/u
rqPpaQ//X3HqXHAyB4taKdADam0rqqLt3mB0I6V+SNrstV/82orsPnvoUA+Ahrly
vmVmGgdPTg3gdAMxPTRWGaZUxWPx7lXh0ULlk4xkYcNyK14j9A+bUhtWnNwZThh+
uvQWumIfKQLOJzRlP8QG0eN8b0oPmSbGZUHixCzOcAOvBi5Iw2YKNTWnnkZFY502
SDCpduUenwAED5S+gHJBm4bOHbgIGNpJConYzjTBs2gp0faZQOm0UB401P+Qk7w4
YxOB6hwxy6E/PLZhnGm1v7xW3GYUuoM8j0VDYEGrYcdD2rho+jO4KmDx4vAjFXMS
b+a5jeh6scVS1X/NuppHA+uxqWF95b0q4zXI3J1JU03FFyoUCivpx6nb91Vi3kf5
NAQMaGLKrH1P++eCXnz17lkgAvfyLuKAA0vIOMQqJHe1dRzEB1CpHYIO8flMlZzm
zEntxgddGE2JiPYtQ9spfpu1Mv0E3oQBjcl0XYKDfmepGmn3bP3xPW1mRQL+eFT0
8QY6swHQL21Pns4nTBhZfVrwmLh1RqVum79U0Ed/W9hPKyNWYcr3RQg6NZI2ggMa
iFhqzqauBtCYpUTqnwQ8PjtpdxOgD6r6IL7ZtL+GcfnBcodW2P7PJbmPxsWYYwoP
6m95LrwJ9yVzv3dy8yCDxSLmO+1U/d/EthnboCgVH0p+PtkFuqY=
=Ye92
-----END PGP SIGNATURE-----

3
libreoffice-help-7.4.2.3.tar.xz Normal file
View File

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

16
libreoffice-help-7.4.2.3.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmNEB+kACgkQ9DSh76/u
rqNFMBAAgWQs73s1crrZ44aXzcnom25r21Oq1Y6xhwr8Fzq/G92IFRMWPMBXPOBT
v7d9SZeJGy7pZnFNMJZ3lEJ/liG5NTpogaJ/kixCYQ3VeMe0pGyISO72U9vaX4Yq
BnACS0I62sWmPhrYUIM08XtvH1J4CPF8gQIXJZub+BYaHYgo+hdAGlSVBrHQP/GU
wbpayJlrPxv7SyOTOE3EuUkgt8d0bo9WQ0ldgJ+TvaTSSvclatQph7NddIVNGkOo
K0s/tR/DjD6cR9rDwNxDbbZqcQd7Wms48O2rkhM77SUgbTTISaCZ5Vi6yZZ9nmye
Um4rDsV7q0Pi6dKZx0g8HbkM/YlfQ5K96ZunBl7LvaDY1+g8hbS+fTRsx9gj7Yg5
Pk/Hz7pN7OGetQ2V0knTtnSZti/+zK2FXWO8KbPbpupgY8cbsKJSDu4t/WIazLcu
IBbBAYXNZqeHgLpIqeoJaxi0elkzQXRxC+NJOGCPMWIhL+hedOjoUV11lwGwF7qO
K6QUR6j4lGqneHzV18kuW3XJxny7AYxIw8vxS5yb7ZLsq4x1MRd4dQQDlUUHN5dx
l0eh8nEdMBFoeJjymPS9gsyDw41K1yTV3LROWEWSOxmt4r8zd7THz2P1k2ZZ8WXv
Xugim16jSyP/pyZc9vML8wssowyVaYxL+p9zPT1lGGRkFmDCgFY=
=GGg8
-----END PGP SIGNATURE-----

3
libreoffice-translations-7.4.1.2.tar.xz
View File

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

16
libreoffice-translations-7.4.1.2.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmMbjoMACgkQ9DSh76/u
rqORwQ/+PtY6ixz/N9bdVUe8eeGHdsW8IpPZ279zqqx1ApqnysJM2QvjEMV8b1Pc
4IrV2kVWA9XAaiQMCUtauOCO+av3/nO8vUj8Y4XHf0Z785D21bsIiB5yG/7xEx4H
FL2r3LSeCRYkDqNMiEi6WsB5jIEuKeGSkHooq6rT4MeZvDnEqE5aKqt5tBnvZnRl
ZnsXOmH/yH04PeKtG8DQ0JePuaBt1zhyQRt/G1FIn48zKL01wA7ogNyAfOZArh2j
9yHSjPe+7lTuFlc5P7T0PiUOa6qq6yeTN5pEnSJ57D8cBDxHHTD2vOL7xCKo21pn
n8w9ga6VDOeqq2ziqg8zox50TZDW9rNRl1U4haGLaolxbq/oTYAQn/ZcAUo9XDtL
saP/4I1/02k04fGFqbMGYGkTF5brlq1VU2+HYdYrvqZO7GLGw6qjKeADAlezUx65
611I4/yYZeeNPMcOmzu6FrzySgHCJocdatq/tbMTaIkOWagosjdqMa5R4FPV0dDK
lkhepL1FwU6rFJxly+O+18pgkzmXyU5bwqMaiyuCAoTpq/HLmJP2PUxsqxbMgCfu
Tha4qXetcK5MQQC/WHXMV94dunz5+nAe9WDS9is3C3i3XINARWgznDKn9tg5XUEZ
LQ5KKRIKIYI/5c/clu1qOSOC7CQ9pVaORaEXZP0DeDwFLTK3FFc=
=Qbaa
-----END PGP SIGNATURE-----

3
libreoffice-translations-7.4.2.3.tar.xz Normal file
View File

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

16
libreoffice-translations-7.4.2.3.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmNEB+sACgkQ9DSh76/u
rqM0Vw//aPxr8xOwFl4sZOzFZoODWJ/T0nO+6NzPJBPAIEW0zaEcrrVAHpRQ2mY7
+IzDT3a3BYxR7MoOxuIjI5uuUqz+m7htcQ7pwsZtvMEzE+gQ7/b0vIan/qOBRYS9
CQgnvQEObgu2oVigh7FQjbtwERCQmMdR6hVw9gA5kl/dN09OoGY3PfStZkS0oY1E
ikVLomBFsKBAyMcZwr7FdiAa2fV/jQcuGFahqom3x1gE/urJTaxiasCkVnaiiIaS
/Kb2e6YbQyg1tTDvbRLjVk+pmz5HNOpv74c60zy9o0I+sF2o3ok+JbR50QUxBWOT
ibGbay3FYf4miTR2hDMxoihE9EbmMYiMca1xz7ys5G6ynltr/9e3lmjM24ITrw+S
6qvMScWs1NlNRLQ+Yx/n0Lh1rxCOjCQiX01vgztP7R84s9MnFyYcGLRuRzcxqBre
VI95+rtaxPD4lqo1eeceMyEXgK42P8VB4hPGsj855V75lleuHn0RMtLRnlCTHYxX
Lhxbe9JRoyQhq1BgR8hIx8FvDZF6vJfLBQCXPtLtggXXzPElCVahE0TZrLFsVS2q
Zf3x/t0cjw+15K0KOSn49D7WFA01olizNpjESB6acyYKZmLIIAqe1KylT9XvUME6
6C2FDqEsNcUl2wz4XuBWPXma/dDN0OTcG8mU4ftVtUPg6p7oLus=
=nxfg
-----END PGP SIGNATURE-----

22
libreoffice.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Wed Oct 26 08:41:00 UTC 2022 - Andras Timar <andras.timar@collabora.com>
- Fix bsc#1201095 - LO-L3: Text box shows that does not show in PowerPoint
* bsc1201095.patch
-------------------------------------------------------------------
Thu Oct 13 10:07:43 UTC 2022 - Danilo Spinella <danilo.spinella@suse.com>
- Update to 7.4.2.3:
https://wiki.documentfoundation.org/Releases/7.4.2/RC3
https://wiki.documentfoundation.org/Releases/7.4.2/RC2
https://wiki.documentfoundation.org/Releases/7.4.2/RC1
- Remove upstreamed patches:
* poppler-22.09.0.patch
* bsc1203502.patch
-------------------------------------------------------------------
Tue Sep 27 19:27:10 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>
@ -29,6 +46,8 @@ Wed Aug 31 07:45:42 UTC 2022 - Danilo Spinella <danilo.spinella@suse.com>
- Update to 7.4.1.1:
https://wiki.documentfoundation.org/Releases/7.4.1/RC1
* provides fixes for the following security vulnerabilities:
CVE-2022-3140, bsc#1203209
-------------------------------------------------------------------
Tue Aug 23 13:46:00 UTC 2022 - Danilo Spinella <danilo.spinella@suse.com>
@ -121,6 +140,9 @@ Tue Apr 19 10:40:59 UTC 2022 - Danilo Spinella <danilo.spinella@suse.com>
You can find the complete release notes here:
https://wiki.documentfoundation.org/Releases/7.3.3/RC1
* Fixes bsc#1196499
* provides fixes for the following security vulnerabilities:
CVE-2022-26305, bsc#1201868
CVE-2022-26307, bsc#1201872
- Remove upstreamed patches:
* bsc1195881.patch
* bsc1196212.patch

13
libreoffice.spec
View File

@ -49,7 +49,7 @@
%endif
%bcond_with firebird
Name: libreoffice
Version: 7.4.1.2
Version: 7.4.2.3
Release: 0
Summary: A Free Office Suite (Framework)
License: LGPL-3.0-or-later AND MPL-2.0+
@ -107,12 +107,10 @@ Patch3: mediawiki-no-broken-help.diff
Patch6: gcc11-fix-error.patch
Patch9: fix_math_desktop_file.patch
Patch10: fix_gtk_popover_on_3.20.patch
Patch11: poppler-22.09.0.patch
# PATCH-FIX-UPSTREAM revert changes that cause problems with the libreoffice window
# in KDE, bsc#1203502
Patch12: bsc1203502.patch
# PATCH-FIX-UPSTREAM remove egrep/fgrep calls
Patch13: libreoffice-7.4.1.2-grep.patch
# LO-L3: Text box shows that does not show in PowerPoint
Patch14: bsc1201095.patch
# Build with java 8
Patch101: 0001-Revert-java-9-changes.patch
# try to save space by using hardlinks
@ -1032,11 +1030,8 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
%patch10 -p1
%patch101 -p1
%endif
%if 0%{?suse_version} > 1550
%patch11 -p1
%endif
%patch12 -p1
%patch13 -p1
%patch14 -p1
%patch990 -p1
%patch991 -p1

46
poppler-22.09.0.patch
View File

@ -1,46 +0,0 @@
https://gerrit.libreoffice.org/c/core/+/139249
From 8bad83bf044661357b02b695e6f53e2e19dea396 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Fri, 2 Sep 2022 04:31:18 +0100
Subject: [PATCH] Fix build with Poppler 22.09.0
With Poppler 22.09.0, LO fails to build with:
```
/var/tmp/portage/app-office/libreoffice-7.3.5.2/work/libreoffice-7.3.5.2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx:682:36: error: too many arguments to function call, expected single argument 'start', have 3 arguments
state->getLineDash(&dashArray, &arrayLen, &startOffset);
~~~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~
/usr/include/poppler/GfxState.h:1506:32: note: 'getLineDash' declared here
const std::vector<double> &getLineDash(double *start)
^
1 error generated.
```
Poppler changed the getLineDash interface:
```
- void getLineDash(double **dash, int *length, double *start)
+ const std::vector<double> &getLineDash(double *start)
```
Signed-off-by: Sam James <sam@gentoo.org>
Change-Id: I29e18f20d7650a7fcac1bc8ab4aaa04aaa2ab8fb
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -678,8 +678,16 @@ void PDFOutDev::updateLineDash(GfxState *state)
return;
assert(state);
- double* dashArray; int arrayLen; double startOffset;
+ int arrayLen; double startOffset;
+#if POPPLER_CHECK_VERSION(22, 9, 0)
+ const double* dashArray;
+ const std::vector<double> &dash = state->getLineDash(&startOffset);
+ dashArray = dash.data();
+ arrayLen = dash.size();
+#else
+ double* dashArray;
state->getLineDash(&dashArray, &arrayLen, &startOffset);
+#endif
printf( "updateLineDash" );
if( arrayLen && dashArray )