Accepting request 959813 from LibreOffice:7.3
- Update to 7.3.1.3 OBS-URL: https://build.opensuse.org/request/show/959813 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=995
This commit is contained in:
parent
a1b41309db
commit
85f0edc7fe
@ -1,57 +0,0 @@
|
|||||||
From 5fd5e42bf28a7910321c6b6d76257e7386839fbc Mon Sep 17 00:00:00 2001
|
|
||||||
From: Michael Weghorn <m.weghorn@posteo.de>
|
|
||||||
Date: Wed, 16 Feb 2022 13:38:47 +0100
|
|
||||||
Subject: [PATCH] configure.ac: Update kf5 include/lib check to work with KF5
|
|
||||||
>= 5.91
|
|
||||||
|
|
||||||
The 'kcoreaddons_version.h' header was moved to the 'KCoreAddons'
|
|
||||||
subdirectory in kcoreaddons commit
|
|
||||||
|
|
||||||
commit d971ba9bb27a3e8f18a116692fdf98c1729ac244
|
|
||||||
Author: Ahmad Samir <a.samirh78@gmail.com>
|
|
||||||
Date: Sat Jan 15 14:14:13 2022 +0200
|
|
||||||
|
|
||||||
Install kcoreaddons_version.h in /usr/include/KF5/KCoreAddons/
|
|
||||||
|
|
||||||
Instead of /usr/include/KF5/kcoreaddons_version.h.
|
|
||||||
|
|
||||||
For more details see:
|
|
||||||
https://invent.kde.org/frameworks/kservice/-/merge_requests/79
|
|
||||||
|
|
||||||
GIT_SILENT
|
|
||||||
|
|
||||||
Adapt the KF5 check to check for the 'KFileWidget' header and
|
|
||||||
the 'libKF5KIOFileWidgets.so' library instead.
|
|
||||||
This is more exact anyway, since we require KIOFileWidgets,
|
|
||||||
and the previous check didn't ensure that.
|
|
||||||
(So in case only KF5CoreAddons but not KIOFileWidgets was installed,
|
|
||||||
configure would previously pass, but the build fail.)
|
|
||||||
|
|
||||||
[1] https://invent.kde.org/frameworks/kcoreaddons/-/commit/d971ba9bb27a3e8f18a116692fdf98c1729ac244
|
|
||||||
|
|
||||||
Change-Id: I7ecf7f29dce85e1a6e6b0d4f2519fa37ab04ca84
|
|
||||||
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129996
|
|
||||||
Tested-by: Jenkins
|
|
||||||
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
|
|
||||||
---
|
|
||||||
configure.ac | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
index 6acb3107cea3..4e84f9a33980 100644
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -13017,8 +13017,8 @@ then
|
|
||||||
kf5_libdirs="$kf5_libdirs /usr/lib64 /usr/lib64/kf5 /usr/lib64/kf5/devel"
|
|
||||||
fi
|
|
||||||
|
|
||||||
- kf5_test_include="KF5/kcoreaddons_version.h"
|
|
||||||
- kf5_test_library="libKF5CoreAddons.so"
|
|
||||||
+ kf5_test_include="KF5/KIOFileWidgets/KFileWidget"
|
|
||||||
+ kf5_test_library="libKF5KIOFileWidgets.so"
|
|
||||||
kf5_libdirs="$qt5_libdir $kf5_libdirs"
|
|
||||||
|
|
||||||
dnl kf5 KDE4 support compatibility installed
|
|
||||||
--
|
|
||||||
2.35.1
|
|
||||||
|
|
3
curl-7.79.1.tar.xz
Normal file
3
curl-7.79.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:0606f74b1182ab732a17c11613cbbaf7084f2e6cca432642d0e3ad7c224c3689
|
||||||
|
size 2465212
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:9e714cca429518b8b96f0baa1c73b57454d17406ef7002a96289384631a6d0b7
|
|
||||||
size 255320720
|
|
@ -1,16 +0,0 @@
|
|||||||
-----BEGIN PGP SIGNATURE-----
|
|
||||||
|
|
||||||
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmIWM0cACgkQ9DSh76/u
|
|
||||||
rqNjOhAAunod5m9XvO+aLDSOSFD9kMPQ2V+e+97mjMM1D94Tgih9dhjnHzhNtSjm
|
|
||||||
yZ1Pwp2mWzGn6DQkPtio/QjsJ1Ne0wD308ikUq8hhRMqloY8blYWRWVUFmbtJ7V5
|
|
||||||
XVT03kpO1e0uVySW4xouhPkvdGLEHEGK9kmW+B/eYzjtTg0bn7x/0/WzvllaHXUE
|
|
||||||
smCYkkeFsKjvxPuXNJeOQJNknNNOG++XCux+TxMFufDUwrB7Z4g7J1+sge7bxTKq
|
|
||||||
8WceR1bv5uSnOcoaEW0RuuGQTbsqVo0I02BCOlC1/NqgV4+Wr4Y4/kkMgcvRmMTy
|
|
||||||
7ISKSX9y6/3ow1SGo+TVQziZ4wssl4av6NNclOyQn31oC7ojgQt5jTZLgqktYO/i
|
|
||||||
db8HANW+taQ15BcHTzN3zFbg9A7o33yC3COb2DHoo5OmJUQ40cj613UTW1x9+9/X
|
|
||||||
3L34QuNrWw3fE6RFH9/FVFow81qJ9jL1m7JLYguLoFtD+C4UuUwAhUk20Csd99/f
|
|
||||||
S3dBZZeqaLboOKfAaCRLPUcORKjaxL4SDE4x3nCMje8ai36ImoHp2bac16D+rIcy
|
|
||||||
6IjSsT0NxQCm+g7bFkorLJI6mJrgqqXKXeLmR3G/wJvVArtWeTWeWGhFPd8fs/k2
|
|
||||||
Xv0+PqEkQU6pV82Ux9hXrOWIoJTy9zAFlUcojEQMnfxbAPeeELA=
|
|
||||||
=AvCq
|
|
||||||
-----END PGP SIGNATURE-----
|
|
3
libreoffice-7.3.1.3.tar.xz
Normal file
3
libreoffice-7.3.1.3.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:6b57f6822a8571a8bd984b4dc048f519c2143c769714dbd491f60b8cc71f51a2
|
||||||
|
size 255329180
|
16
libreoffice-7.3.1.3.tar.xz.asc
Normal file
16
libreoffice-7.3.1.3.tar.xz.asc
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
|
||||||
|
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmIdKXsACgkQ9DSh76/u
|
||||||
|
rqNgew//X6FANTeNXlwrCe8HMVg2n9O2JR5mVBhNNUnHB1SyLBOTe2mSoWA6eQth
|
||||||
|
cpNWSUeXgKZZcWpEbH8sM4kZ+msP5MbbgRpoJADYHClegsFyBuLQvkDCa67TxIDI
|
||||||
|
Qa61DO2fb5+HDTzfjmKEaOEUI4eoIag7ItjHfc/sl/k+fg69KosdXrv8POtWeg+e
|
||||||
|
D7/0DK3GgSvaNnwfLLCPGiow7FPfud5xYDgLhHuILtn5EEyZFc8nscWtqTqV/mTz
|
||||||
|
vuZyCyKUe73OxjaolfHZnVaIjMdLbedhje8xoPdg3GsM7AFb2xS/F2exH9kQlvmB
|
||||||
|
nM2uOKulfpRGc3QUr7fsJfdeGpfzZxg+TT/SHgibyI086UHzIuRhTBqBUPToOnMs
|
||||||
|
kXIKuXYd6srXMZ8rcW+LWhjU3mZbzTyRS54pUbW09z+p2uYLpSTfgkNZKyu9whoZ
|
||||||
|
K7j6kCo67xKT4O04JD0bDotncasKcTggnTm0FqoHeXxeJR0XSHhZhQAxGD4D8QD7
|
||||||
|
jpVEGz4KREYidLR1AfpqVm3mgSrbMwXnb0lidOKPVgJMHI1xENZJSbBiZGkWjm7t
|
||||||
|
UY9JsfJcA6Irc39jHTjgVAWoy2FxXi2lhTNB/NSGmHH7Q+ZyuB4WnBjZKUqw8m0x
|
||||||
|
wEBPK/1iKtJxmLpaDdtjqSXI5IDqUcoGQDyD2LPjhFvLR+7zSVo=
|
||||||
|
=RfmA
|
||||||
|
-----END PGP SIGNATURE-----
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:4dbbaf47b3acc397a1fe9581cb6be50f61cde7cb21745a2a40661dfa3532a291
|
|
||||||
size 112208144
|
|
@ -1,16 +0,0 @@
|
|||||||
-----BEGIN PGP SIGNATURE-----
|
|
||||||
|
|
||||||
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmIWM1kACgkQ9DSh76/u
|
|
||||||
rqN8zQ//fB8F8F7czxrxoBj8D/q/G01hCDXftfPOz+x16bHy7CMphlfD0NprW0ia
|
|
||||||
YWTp12vu6LM4GJr+1a4IaBAiCXueYcVqY28MPXx4zGPvRoR4HKcNJpQgcAQEvDii
|
|
||||||
j5d8heZxHvjWWtdzi1pSnRxkYoP+/lHWyMf9lzgC9M6s5i3MbQY776diJ0mBIcMc
|
|
||||||
EckX+Xkx5rtM89mO4YkfSJJ2CbVi1JnHNiUNuNQDYyS5SyPvxPveOrJQF4b9k399
|
|
||||||
b0NSCUOeMZsRguL7rpTjtdUGXGfJENEFufYOTcFk2lQgBKm2qN7WvVdkojU8aUi4
|
|
||||||
0H/Qjo2rzqCNqEnknAuuF8CKoRMRIHM4dPdnlh9NwR4sO7vnc7SSA/A5qcGG2KrX
|
|
||||||
/k09a20yEeFhPFqOMogdKuPLDqlZ9y49VZfPsbae8XNUWt24XnU+Eq3WU75J/3kN
|
|
||||||
mx6kDmE+NiWXKqLXjM/rhxZSI1IwuXEOhX/ckGGOE29Tn18WSB1hSjMqEnnOiWHQ
|
|
||||||
WnDL1KjtNLjBNCaPD3gcfDhyHPiwAjRmcIlNoLzJe6o+0CPmvdM35/2FfT5Cx/0M
|
|
||||||
ZUVgrDTYXKGoJuP25GJdVqetd9YqxumuSpuJ2/+Qfr+Ufxl7RY0qKLVLWX9+ioaW
|
|
||||||
qjeZmEMwAhdClrthAMYWgTZ3yXvgzS6jGJvY6nC45WoCt00lp/E=
|
|
||||||
=qtdu
|
|
||||||
-----END PGP SIGNATURE-----
|
|
3
libreoffice-help-7.3.1.3.tar.xz
Normal file
3
libreoffice-help-7.3.1.3.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:34fb4c3f5ba76deefe409d14c027899a1014fd8ffff057238ba37c1dd17baaaa
|
||||||
|
size 112208156
|
16
libreoffice-help-7.3.1.3.tar.xz.asc
Normal file
16
libreoffice-help-7.3.1.3.tar.xz.asc
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
|
||||||
|
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmIdKYIACgkQ9DSh76/u
|
||||||
|
rqPtRw/9Greh3cXfOt8fAM38kCDKcZTc3rU2IncrLbBzkwxGm6PnKgXPIEkg4794
|
||||||
|
ljk169/7tHB6M70s2V5XGiG2gtlLJLRNod/lXHkftDez6NAKKYuoGDeTjgzhRjX/
|
||||||
|
K5N7fCARbX4JK8wu910BTjwmCGvo7Gc6k1+sD4HfRBm+CeXMj31uQ4Oh5K0nLm51
|
||||||
|
xdqNdVfKdnQuA2io+kHe2uuSPuy2a2vKvf5NcFjKK2T+Nr5RJuJV0ajS09sC3sGG
|
||||||
|
w0yuZY5+jUk2HNNJeRHHO4VnKx7GCYzmwzyajFR3b1LYkzg0sWefMVgWjEREbRZ9
|
||||||
|
6p0Y4KRmsGZjWAoYkQAi90wsoWQbXCKiXmDNJyw7BEDQyKDdxTZ/JnJLwkfeJV2B
|
||||||
|
wniuBxCA36Azr4wdRgGMP9FuBurEaB1+KxUhmmCFUMrx7N/ZgSZ0AKwjdkIhLz9d
|
||||||
|
NHdbsqP0Mu931uXTLasXcq2NqqVFglHFgkrLrnj+dW9NOprUFbf1mrjr65toTwnr
|
||||||
|
unt4FxSTBuC4FErwGsNlSwNDZMDhNbpNaHHq3jqIj6HODiZ0NcyAOSxVisgyo4bS
|
||||||
|
uwvkz6OoLFW77nL9j2fJR7DOfLjA8OxvYZv65DMSuDWG8GVNCl0n6AyMaPO27gbK
|
||||||
|
kRfzr3e4ELGUv2q4NnOOpofJC3puZRp7ZE3p8MNKPsm4+rVW6Ak=
|
||||||
|
=ZucG
|
||||||
|
-----END PGP SIGNATURE-----
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:bb0917dd7e33b30464b992bf31b1e4ccd59b73920349c2a03a196dbf3cf284f3
|
|
||||||
size 196055264
|
|
@ -1,16 +0,0 @@
|
|||||||
-----BEGIN PGP SIGNATURE-----
|
|
||||||
|
|
||||||
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmIWM1oACgkQ9DSh76/u
|
|
||||||
rqMz6g//ZLVdlCfgYlM7bH87eOEFnTq6KvtM9zsKvJfv2i9siI2FD7tSwMgeAzBr
|
|
||||||
v2QVmYgFfd7TTcw8+ZYqRuhkUVHs8Uz3eM1dPtJPN9uRvPPITAcdYRhGfu5Zaejt
|
|
||||||
3Ivnd+nyDLeYXa87oaPddbAdHPshxlyA7gBvuo+7piqvK75KQHoVJiuim2JMmjfe
|
|
||||||
XAsKYQwOZw8wKEWTvXY5ZN+nbxeGL0XWEpS1EIJB09E9Dw6EGNTmPOcaShBg+zTW
|
|
||||||
dgfSf6j+RzTyU77FaRjOeo0hrHM3frhmLQRqKgDA+okyzNxsrdKpxsddYq6RRPvq
|
|
||||||
KlW+kN9tredoXvH/9t7VmxlI9ShSYiCzHoYT4gjRehecsLRIubBcCOEgK3ISisNa
|
|
||||||
vRZDUrr/44+Og6KXo+Ji1a0QvN++DTWJ8VineVO200TzBECUOCXgEnhmcp79crXF
|
|
||||||
pFhXvXmyZFCDTgK5u8nJhNTTSUagkZXZlfEM14lf5zRFzKFy0h5WPjpiGs6V3t9L
|
|
||||||
/jPPEuX0OhmxIbXENaylRQXNCL1QqBF8EO6OKTA8lJ1EGCbFLJayMiVQ5bRc/S9u
|
|
||||||
iq5aYxFhd3b7lHZ0a71uMvmsmOwrrXcQabAVA7a90O+yPF8w52HWtzAXt5OygxCN
|
|
||||||
dB2D06iD6mtcvr3g1kU+N/0VDbs3QCYxYDa7do1L/wkd2uTkMQg=
|
|
||||||
=05hN
|
|
||||||
-----END PGP SIGNATURE-----
|
|
3
libreoffice-translations-7.3.1.3.tar.xz
Normal file
3
libreoffice-translations-7.3.1.3.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:e9b4b8ccf89ba92ad031ab909cd1dc2419aa83948ed7bf4694215a247535124e
|
||||||
|
size 196069996
|
16
libreoffice-translations-7.3.1.3.tar.xz.asc
Normal file
16
libreoffice-translations-7.3.1.3.tar.xz.asc
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
|
||||||
|
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmIdKYMACgkQ9DSh76/u
|
||||||
|
rqMmpg//QaFMyF2Okhsju/aE2RT4ngn8s4Ngydl10Cv7MIElCAGEEfvU3zAZRoX0
|
||||||
|
JoRU8WAIIWKyEDsWN/TQwZ4CaQ+1Hff7UVFgn9WOOnChtKs4G0mGhrr1gV6ExOXG
|
||||||
|
jw8xtJTWE/WIBYlwWkKw6Nq/n4RBgALI4Wh5Ba+jFW8lK2mJDre/ic3xRLeKvdZv
|
||||||
|
HgZ2DYY0zYKUWyaUCQfKdyniPxLW7bNVWDZ3BhXQ0XDTDthai18ovkRwNXAEGTNf
|
||||||
|
14OXA5jb/fAenbPewtciw8T8wvSxuQFaOHLrg9Yg8hrWZgaIjIcKG2NIJoB9udU0
|
||||||
|
jiEEFoko596QBXOff7yad10PKI7fp+3ReL50u5ZCqYn8ETnktP1wZfs1dw7X4Q6H
|
||||||
|
LUwJ7tLrcDoov62jgKICelAzhVcfPIdaPE/gN4vyz2h5MSk5kh2tI7+JzNKaB9s8
|
||||||
|
CJ7uOH07V6TjeX6XOygWq9aPHEyxX/OCIuHZJznL3JDVOCgYY4nK5s14l1SBXupW
|
||||||
|
qXA+qMTPXMjfFRGGT1UcDTGgMmmDNvErN2yys53EjAvIMcTMaWLObixJn7Zutjzl
|
||||||
|
Aoaq+4Mdy/d9yMoFwxkqiKn25HT6DiU5MAz5PKlVfgu5YXt1CSi9TU9OZe9RJkGk
|
||||||
|
wsNJ5jrju4vBjQmAT68vV+VMP2/jX9B3I/Otdt23CIU4KjPTxBU=
|
||||||
|
=vKrk
|
||||||
|
-----END PGP SIGNATURE-----
|
@ -4,6 +4,11 @@ Sat Mar 5 14:30:08 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
|
|||||||
- Add poppler-22-03-0.patch: Fix build with poppler 22.03.0. Patch
|
- Add poppler-22-03-0.patch: Fix build with poppler 22.03.0. Patch
|
||||||
lifted from arch linux.
|
lifted from arch linux.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Mar 4 09:49:17 UTC 2022 - Danilo Spinella <danilo.spinella@suse.com>
|
||||||
|
|
||||||
|
- Update to 7.3.1.3
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Feb 28 16:46:05 UTC 2022 - Danilo Spinella <danilo.spinella@suse.com>
|
Mon Feb 28 16:46:05 UTC 2022 - Danilo Spinella <danilo.spinella@suse.com>
|
||||||
|
|
||||||
|
@ -48,7 +48,7 @@
|
|||||||
%endif
|
%endif
|
||||||
%bcond_with firebird
|
%bcond_with firebird
|
||||||
Name: libreoffice
|
Name: libreoffice
|
||||||
Version: 7.3.1.2
|
Version: 7.3.1.3
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: A Free Office Suite (Framework)
|
Summary: A Free Office Suite (Framework)
|
||||||
License: LGPL-3.0-or-later AND MPL-2.0+
|
License: LGPL-3.0-or-later AND MPL-2.0+
|
||||||
@ -95,6 +95,7 @@ Source2009: %{external_url}/dtoa-20180411.tgz
|
|||||||
# Skia is part of chromium and bundled everywhere as by google only way is monorepo way
|
# Skia is part of chromium and bundled everywhere as by google only way is monorepo way
|
||||||
Source2010: %{external_url}/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz
|
Source2010: %{external_url}/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz
|
||||||
Source2012: %{external_url}/libcmis-0.5.2.tar.xz
|
Source2012: %{external_url}/libcmis-0.5.2.tar.xz
|
||||||
|
Source2013: %{external_url}/curl-7.79.1.tar.xz
|
||||||
# change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse
|
# change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse
|
||||||
# to avoid BerkleyDB incompatibility with the plain build
|
# to avoid BerkleyDB incompatibility with the plain build
|
||||||
Patch1: scp2-user-config-suse.diff
|
Patch1: scp2-user-config-suse.diff
|
||||||
@ -123,7 +124,10 @@ BuildRequires: bison
|
|||||||
BuildRequires: bsh2
|
BuildRequires: bsh2
|
||||||
BuildRequires: commons-logging
|
BuildRequires: commons-logging
|
||||||
BuildRequires: cups-devel
|
BuildRequires: cups-devel
|
||||||
|
# Use bundled curl on SLE-12-SP5
|
||||||
|
%if 0%{suse_version} >= 1500
|
||||||
BuildRequires: curl-devel >= 7.68.0
|
BuildRequires: curl-devel >= 7.68.0
|
||||||
|
%endif
|
||||||
# Needed for tests
|
# Needed for tests
|
||||||
BuildRequires: dejavu-fonts
|
BuildRequires: dejavu-fonts
|
||||||
BuildRequires: doxygen >= 1.8.4
|
BuildRequires: doxygen >= 1.8.4
|
||||||
@ -1164,6 +1168,7 @@ export NOCONFIGURE=yes
|
|||||||
%endif
|
%endif
|
||||||
%if 0%{?suse_version} < 1500
|
%if 0%{?suse_version} < 1500
|
||||||
--without-system-icu \
|
--without-system-icu \
|
||||||
|
--without-system-curl \
|
||||||
%endif
|
%endif
|
||||||
--enable-evolution2 \
|
--enable-evolution2 \
|
||||||
--enable-dbus \
|
--enable-dbus \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user