- Update to 6.4.0.2:

* RC2 of 6.4 release
- Drop merged patch 0001-tdf-129879-Fix-wrong-order-of-buttons.patch

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=848
This commit is contained in:
Tomáš Chvátal 2020-01-14 08:11:56 +00:00 committed by Git OBS Bridge
parent f5b79b7f82
commit 9cb8d732cd
15 changed files with 65 additions and 88 deletions

View File

@ -1,28 +0,0 @@
From 9b51a4b02993524f42bbd4f19d982b88914b788f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Wed, 8 Jan 2020 13:25:05 +0100
Subject: [PATCH] tdf#129879 Fix wrong order of buttons
Change-Id: I0cb135c5b8298fd7c5579673d0eaff7068a03842
---
vcl/source/window/layout.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 981ac621aa60..9c5a36304a21 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -718,8 +718,8 @@ static int getButtonPriority(const OString &rType)
const OUString &rEnv = Application::GetDesktopEnvironment();
if (rEnv.equalsIgnoreAsciiCase("windows") ||
- rEnv.equalsIgnoreAsciiCase("tde") ||
- rEnv.startsWithIgnoreAsciiCase("kde"))
+ rEnv.equalsIgnoreAsciiCase("lxqt") ||
+ rEnv.startsWithIgnoreAsciiCase("plasma"))
{
pOrder = &aSaveDiscardCancel[0];
}
--
2.24.1

View File

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

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl36CvQACgkQ9DSh76/u
rqNIEw//YyURwMRvtkKBHizQ88873Hkp4RAvhjft72GcvE2W8VEMevI+GLZnSCXH
Lw9Jy1ezWP3mfbmDAytzYxsOy+jig194RAFumDelCDMExAZV0ykgUIakH7iGwLGR
rhOkhRYi8aSMSHV5DP8OgznxSFVuYm0ERuFye38f0lm5nWf8Ce9qyOiI4ITfXbfF
FUlTSsrnfSV+7u0dreHcek/G6PAfJe6wVENaoF9t4ksDtitjyktKRUJWyuatSjou
HW+CkxmLF1puYCFGKr4cHAoyy9sAG4RCQ7umi9eCutmnbjwXr+diK5KLOXGr1Aen
aVv3xVMRSHnF//IIgQxfHrBrbfp/BrVRcyrH/hBgEyvBOwQWu92lQ+iZOFI/eCOV
TLzA0f33rQRqMf9exnfp08IqB3HrEnUDRnrdPTQ9g8UZRkVKacXtWcWhEG832V8x
DggcCKub/nwi1qxMJCD+iaNFABngTVZa+9AXRtWbfMneo6r5gvxTV5toYzwjwnFZ
W+cx4Z3cfXYK4LUVXwy2T0FxRapltrnIMy2PHd+aIwrLdVSgDLgZdj84ctA+bYUW
+pMmfMnAwCPLPEn25Fxu11/eqj9/in9t59oa6gpMw6xSiRtdaVlz7UibBeh482mv
w0rMSx7pjftKVfy9YGtOpWLRYjFEGCARhw4s7EwnxEEVwCruB2Y=
=icSR
-----END PGP SIGNATURE-----

View File

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

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl4W8ZIACgkQ9DSh76/u
rqMSkRAAzp9DrwndmrSVNHPH1JWllOtu+usryX2kt/j/7BnhZza92RhPDZgZFxgQ
wVoMvsk8jnl0azgY9vR+xPdj47SuhwoWqSqWzm2Gwvv5RyjjatE/vwdR/wWdyPg4
ClX0Y+El6feVPLxAk0FLwhLz78tWdUvVmxw1IZngBRgGrGXkgJpt7mbf4xTjHWVk
PlSASQrDyK1DUgpOr1138t2ZiNRq+2NEZ8P+3yu3+0rKZfurzpRTZnGubLo8SYbD
jsWBdbkVlw7HYRSqy6ylfOes0NOdPigNnFxrAIW+dVJMw7VdMYkd0Mif0mlFURxF
vMuLQ4aMQBEvs+qaoCNovG7V9omYQuHn0DrK072kyUnwqjjnEUoG+UXjcsY3LmnT
XMvdDm8Tx7YCyq1KfBixYeMnOFHEMKLIhAYCDQ2TOPpLuIfz7az41QGB26LAJBC+
pd8uTWDlr6b/iuz1G49wu1sx1NVnfh9UfCNRZ+z/T6ODpRqaIzpQMYhgw8+qsg3a
Be3N4OpzUh5WNpk5HNUFHywcB7RM81ZWQWslPkvyxG86au5ZUoyJMjIHIgxCyrmb
ZyrKmQ3TboiAoL8b6NDApKbSXAxoLjBM7fz9iB/r6dxz0qRdJpKEVoDnXLVfnwam
sbEaxLwENtb+aaxjiclg3/WjYJT30Iv4v/MuWrDsClai5yHm9GA=
=Im3l
-----END PGP SIGNATURE-----

View File

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

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl36Cv0ACgkQ9DSh76/u
rqOa+xAAknb2amPG/G7bILChRXX0rVEfUkuwafIFA+Hyhx+kb7SJ/Dt2ybvjnEwx
epmTsXMbH1XbgL+XfytKi34/T8kJMSx5v6ZNOE9/VigY08eA1n+BumEa2M+vNOGk
7p9YvTJOKdzQcobRS92jU+ytYLem17XlfdY5g60m2si/ygV+1NinHFFS8LxuRunc
N5Q9Xrb4Xx8LRk5o5QWE75qj80OCWQWfCnUUAVzWqR/+Nf/y1bE34Cz3dzBPoILo
HQlSjy2CCP/GkqCs1iAQT+QgR5ekp4dldlukCzMACp2TUmfYz+PZ+egZsyYhUTk9
itQDgzlpl1QlaIOsRJi4Aj4vKmQHyeG81qdOulS0EZfurgEKIoAMKuJKXeqDIU4p
8EZupet0DDIj1FOHCs+qC57+vwMSBljITnATMpggFQeFUjRspF0Ys4FlOPRVjN32
4mc+qaGqA0++Qk1P6rzou9wkPE0u8cpbg2SPt+eSTVS2XgSQjSvhjuhr0YCENk/S
x6pLiTfql0w31cuHsUIYYnM0G5Ths8ABHpsK30KFb3Vo6yBntPSJ5/eskYyyQsLi
lTY6ZkuuUNFcNrjnRa01akjhrRcId+6Qb3kcumGgUQJ3b2C33hx1QokaWLoeiTdB
XEoZSlxC5B72OhQisDWzBrxuUXaQpdvROwrD6jk+fNloaTuQ40U=
=qyi7
-----END PGP SIGNATURE-----

View File

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

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl4W8ZcACgkQ9DSh76/u
rqOethAAvXp7pjqB1IWByIYPm6Rqjx8whzNtiI1+742wuoDH8pvk4CjJtPyHD5mx
jj/DJ0lFfHwpXLwRWRT8DbzmnLEpr5VmM58jC0XI+ZUoNS1+lJqC0WOfWF3yW4iT
OOSn45nAAqDxBPEdaMTRrL9kbYA/vzYn1zsLsnWM0GOL2DicmWxGZx0g1pJYJg76
zEIbYdbbYw2KbwMP4GL5a4q9vvg5sNSSQVFKyT9KrQkJBy/1NDblwmP2z1uV5pF1
Buw3qqZBF2InCeXgoDQHyb9CCC912Ud8jDnTPFNZLBSLSfANRoCzyk00JyC/Vv+/
OwmcfFHFaf2XqsszxWjZJz4t5VyBmyy88YUspbaJBnqVlbEOORV8RKLieQpTX4xp
Tfa7g3Cvp8CXlcxxdchCC+7Z7jURj6dYx6iUP8iGvm63CHBHzgSHwrqOlqLhWkDD
ufSZODDt0LzxMTBTHAu88nyGn5DhtUejivWMdj+9cxLGf/zQnHB2bBIet1RBXYhu
CUr0C8eOYBI5G0iHmffT4QhFd8ean/dGRX9ZMbUT1HiIFTYfsRqF9ixGD8mlPyTI
JmA4RW/6S1oYzfhuk/AyXncGduSZ+EhFgaERwKM8UlpNHCZngv3O9dlDf+mIrUV5
eIk8yAVhXr+TrPDys8djIH59fY2lwIn2gbcZhbGR8g7FZmIx5ho=
=4L1O
-----END PGP SIGNATURE-----

View File

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

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl36Cv4ACgkQ9DSh76/u
rqN9DQ/+MSgn2ql/14DLiLGDcAKCRBWxHRnuuG8srzDB00KEo1grSZ0peuodRjzH
CLeKmSraL39l5pfv8Tq9k6Oq7muu5m68Ip5Y3dOFFTjhoU0FaqJXCTpsU2V9OJs4
eeGX5FnPpZL3xHENMEKj/4fBisAP3hGR4qVuObzWbojSwM5EOhdP0rtAuuPS5C2R
dnEq166gJtEAa/dpzBCXHMvouN1MdjdvcwovWsstquLAc8OF4RiEf6gLsHQCmE/m
GxY/k3vtzKyVGlhxQiGZxPMner22q5GylVPzlB5XI/OZL8QQ8oGOyMI08sHCoc1Q
ttTe/um/WiAjx8PFz7rk6WZcJbrxPpwQzL3K3eMxP5oAoNM21QZKFI/WJ2GdzcPR
WDxHCDrCcGXpWG6PS+axeagcjRJGaqO8Lq4NbEOnPC65uKBCJSeTG9YQ68jFkJF6
mzw0dw/Y1+7N8wXTQ97K6DI+CcoT/3FTHYrS1TRW9c/W3dIlEdi6U5Fb6S8B+3Ki
8YMLQnJ1mJT9flpYkMwcDRR2Ah57dJIKBfhCBXdsVlnUrzlrLE+p8M0uOVHdw/Iw
ZHhTzzgQJzBtZLfNkqixjJomR+nhcvOclVSHRCgK+g0CIXlihaFOg63sK2o7xUhg
Ma9SC5bOHx9mx+67fPDQDLyI7ZRpRD69Rg14O+zI/tcyIvx3aVo=
=hxRa
-----END PGP SIGNATURE-----

View File

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

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl4W8ZkACgkQ9DSh76/u
rqMcVQ/7B8ZKzyGOOhvdO1/R5OwbBojEJ+x0yQaT7Tq92RE6SNVXmHJLbcg8o4me
zAxpUuD1rf8foeZxhtIVbR/oHCiRTT0aGHGE+VdarZDdokMQnkMluaSbCCWxi+n7
zRElqxxJxl1uNejEgdfBOEdhb5u6H41OZqJvk9wVfpKF0u+keiEmD7jbq4I2J6w/
t6mulLidA8YEmykf2a970dQ4OZCA5xv7x5s8ltH3OxmJlvsb9Em5jEo+7K2sI1pY
1xlC6FTDmQL8LXz6O60AsRirT4qrEnCNeyvfH2Cv6sXG36Oskdsz92Tys5pMLYpA
QJIJm4aRP+nij9miwvcS1Lb+pjm2cunAm+9Eby88FgJ4K/uoqB7793q9+UGY3826
lVD5fCuy2R1GWVcp/3NcREmm3TP9sWIgHFIl4r8QniKs/kfYMPPw7tyr1VbRg0pE
55eKB40Id//vrtoURmohlQPZO2bXVxVXZr2XzhJTdmkxsZG8V0+UN0+hCR1+m/4T
m9MP5Pq7PuKToZO2UxYt+4oyA5newTyqO4ED6E4Fatzp7ikGX+WOYyXQkHR13kAG
T23x7CL/YOS0aE4e8r0YNi1cfh/JPWOePNCnqABqR331IlDMbzzA4zX3Vng4uaxc
hpXZAyB52CJYPV6j41HltZHWXgfu3SBhFOUSMhvZM/pu9IlpBFI=
=O4LT
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Jan 14 08:06:37 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
- Update to 6.4.0.2:
* RC2 of 6.4 release
- Drop merged patch 0001-tdf-129879-Fix-wrong-order-of-buttons.patch
-------------------------------------------------------------------
Wed Jan 8 12:29:11 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>

View File

@ -50,7 +50,7 @@
%bcond_with system_gpgme
%endif
Name: libreoffice
Version: 6.4.0.1
Version: 6.4.0.2
Release: 0
Summary: A Free Office Suite (Framework)
License: LGPL-3.0-or-later AND MPL-2.0+
@ -98,7 +98,6 @@ Patch1: scp2-user-config-suse.diff
# FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files
Patch2: nlpsolver-no-broken-help.diff
Patch3: mediawiki-no-broken-help.diff
Patch4: 0001-tdf-129879-Fix-wrong-order-of-buttons.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
@ -954,7 +953,6 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
%endif # Leap 42/SLE-12
%patch2
%patch3
%patch4 -p1
%patch990 -p1
%patch991 -p1