pool/libreoffice
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Update to 6.4.3.2:

Browse Source 
* 6.4.2 RC2 release
- Drop merged patch adapt-o3tl-span-to-removal-of-std-span-cbegin-et-al.patch

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=873
This commit is contained in:
Tomáš Chvátal 2020-04-08 11:26:15 +00:00 committed by Git OBS Bridge
parent 6b2d45eeaf
commit 6939441b8c
15 changed files with 65 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
adapt-o3tl-span-to-removal-of-std-span-cbegin-et-al.patch
View File

@ -1,68 +0,0 @@
From 6fbfad6b00e8c35346ee59cd32a0d7ccc0d8c19c Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Sat, 22 Feb 2020 17:29:15 +0100
Subject: [PATCH] Adapt o3tl::span to removal of std::span::cbegin et al
<https://cplusplus.github.io/LWG/issue3320> "span::cbegin/cend methods produce
different results than std::[ranges::]cbegin/cend", as implemented now in
<https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;a=commit;
h=247f410b83797a1840573840cc2a539ef9d7f96b> "libstdc++: Remove std::span::cbegin
and std::span::cend (LWG 3320)".
Turns out we only used the removed member functions in o3tl/qa/test-span.cxx.
Change-Id: I6c73797594b4e0e753a88840033d54961e271df5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89261
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
---
include/o3tl/span.hxx | 7 -------
o3tl/qa/test-span.cxx | 6 ------
2 files changed, 13 deletions(-)
diff --git a/include/o3tl/span.hxx b/include/o3tl/span.hxx
index b19d2d847ac7..8af8ba846b65 100644
--- a/include/o3tl/span.hxx
+++ b/include/o3tl/span.hxx
@@ -62,18 +62,11 @@ public:
constexpr iterator begin() const noexcept { return data_; }
constexpr iterator end() const noexcept { return begin() + size(); }
- constexpr const_iterator cbegin() const noexcept { return begin(); }
- constexpr const_iterator cend() const noexcept { return end(); }
-
reverse_iterator rbegin() const noexcept
{ return reverse_iterator(end()); }
reverse_iterator rend() const noexcept
{ return reverse_iterator(begin()); }
- constexpr const_reverse_iterator crbegin() const noexcept
- { return rbegin(); }
- constexpr const_reverse_iterator crend() const noexcept { return rend(); }
-
constexpr size_type size() const noexcept { return size_; }
constexpr reference operator [](size_type pos) const {
diff --git a/o3tl/qa/test-span.cxx b/o3tl/qa/test-span.cxx
index 3cb78ace1db2..26eedfc21938 100644
--- a/o3tl/qa/test-span.cxx
+++ b/o3tl/qa/test-span.cxx
@@ -34,15 +34,9 @@ private:
CPPUNIT_ASSERT_EQUAL(1, *v.begin());
CPPUNIT_ASSERT_EQUAL(
o3tl::span<int>::difference_type(3), v.end() - v.begin());
- CPPUNIT_ASSERT_EQUAL(1, *v.cbegin());
- CPPUNIT_ASSERT_EQUAL(
- o3tl::span<int>::difference_type(3), v.cend() - v.cbegin());
CPPUNIT_ASSERT_EQUAL(3, *v.rbegin());
CPPUNIT_ASSERT_EQUAL(
o3tl::span<int>::difference_type(3), v.rend() - v.rbegin());
- CPPUNIT_ASSERT_EQUAL(3, *v.crbegin());
- CPPUNIT_ASSERT_EQUAL(
- o3tl::span<int>::difference_type(3), v.crend() - v.crbegin());
CPPUNIT_ASSERT_EQUAL(std::size_t(3), v.size());
CPPUNIT_ASSERT(!v.empty());
CPPUNIT_ASSERT_EQUAL(2, v[1]);
--
2.24.1

3
libreoffice-6.4.2.2.tar.xz
View File

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

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

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIyBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl5pFkcACgkQ9DSh76/u
rqPXwg/4rZXk+nxxy11AB/IrERIXGjqNgUIgZvV97s8XyEKWWwDe7SQEADMNKcjt
w2fpZMQgfVt/17heI0LO9v7zBvBgTIqsMoBIzTG08EGwmWn7BQnaAtDlFzbtK+Wo
U8kIZ3AIJNh25MUazZOxlWqYmtAvkY5Q10SDLzT5HiQxyrz3bJduwXJGzvEIsIyK
QBiDEUTpYwHlLADWeO3F1uhOTZ0GSI92yzqxGFBhXINK2zPrqXxac3cAzKAa8CqZ
2zabwyeg9qxQ9Nu5UrcAnMxjdhaHSFzwi2VUkyL2B5YpisObE08U4hcehqpcQGdj
rz56CaWF07bVS/dtjgkaNsOnPlx/5s2ir9LXY/GQ0lYwgc5GaOvL+bVLur8KbJka
gyHeU37b9E61IF4XNhQyMaEVd6FCtsR39VZUXY/O9hMOLZisgZTtktJ+2Bi+MMx0
n3yQhytIlxAOMpZe1rt767YsPYBRRJ2SvO9Pxipef/64+uQxDySg9sXaFTtFbp/0
JYqF3rKUyLcDWq1InFLrwvW09qdO7CcGALDKHI5ueE2CXeNZaqr3RJ6mswSPU3X3
/51XE90bxEqj3fZJVzmH5cdlmThpr5opfzao/xWLItlRzMYy7qs5p11uqqdg2s4E
c3hvYpIRPPBqDVR7Smx6S01CPr9Bm0i4Wm0lXB4245yyXYTrHg==
=gSMm
-----END PGP SIGNATURE-----

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

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

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

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl6MoIwACgkQ9DSh76/u
rqNYWRAAqbxZP1XEWo4ibIfzorZWxFSx3aU/pw2BjSDRGIck0Eo5SNn5wPxxqI0U
epwn7hsH8U7VrjT1o2YqO9gmsCmFDq1eooilEopSvy4rlgz//jUdMmd80EzOXoxG
/dKrx8LRSqVDCrh12UfFb+p9l2BfWGdrIrH19RbTqlNprcBdMzOhSTAhtBwVc9Ok
uJUjWh/v1UMxfrKwVwc0J+ywBW/VSik+KaSSXgapwSZXS4EbdIbJWhrBg/72G92w
78ToErqxJwrzJcSR4blcug+emNzvvuZH5X/xJZNstfaaHhCvBwGSxXUwwRizxKEm
UELuQ2C2NJVtcvJPLDNHGeKO57Yra+zhPxgE1jTzwoHpG8kMeY1RhBMI0cfmebci
nnlfjXVKno9GoThrbHYNDgn5gK9whcMQn6ESVcgVfbzzBISBgfokojh6BUKJ+lCc
cBWOez/VRxYWJsuXXT/hIDRQ7X2yuSWYTXLWEzgR8rBrAz2eQ9e3W+36IMpyiZyG
rfieB3wuWLaY3fwDTQ1X2HnfGLRNZ2Ayx94soG0XQvATGW3vjwm/6Bie3jg4cpSG
+iu8fPgyWc7jes6jhGgoCEBFbJr3zor80jKCf+9rDs+Gh5t91XRXgt7P1mDs4Agq
8yPmKQXptFSv5ZvNYUfts03sCmSCRjIpjXn9K5xn+O8shCj6Y8s=
=MjL/
-----END PGP SIGNATURE-----

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

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

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

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl5pFlIACgkQ9DSh76/u
rqMQHxAAyB3ke/IDrWFMXhuhSXlyfYq0x/Eikbq8FW3NIqwOLTkP9Q7ESM3NRl0c
H/t3PtBYqOb5kfy4mVb5GN9cbYMQegap9HtVIOdsxpeh8SPymA9T60qnqZsM817X
0cXyMPiSVoJ70EmjSWQDTGaGMZOHKrzXS+DgVfUYXCeLCaiiA9tT27O8A9lEtmdt
1nC7HUO3opMy9QNml+GErs6tQnuXLh7YpiGKuxs86zFS0vHlIoZQy1je6jYxz+4j
eP8oGeBHtlxGnwNwYDDBw5L7OKOytfVXjtI4cWVv8uatqjoq0CG4XuRzCeO3VKRc
xidElneSsRnheyLKN+UoCNvbsOJfiquoigeYHmZAJ/hZKVylums4hCpKBNAirfRF
I0ibqoH1YJdkjedu6ySfdQ4N2GN/i5dRpSFGSkvbEFX+p/G64ps6Xo9/X6Wj9w+e
uFQKvDj6PlVRM1SKAyG7koAtuuQU5QK/wfNh1wDr/m2/7ZfyqjvdRoIq2f5vLegN
Pmu2YvZDz5Z6RAjZSgCaT/Gwu+4JFhlTryoNrUa8ww7hkfhW9I7SigX3CyFzpNax
8R0XY8alTsqKBEy88fLxMyOUo138Q1woa+D3GOj4saMw1769muEL1StFCMLb6rPE
t1neTHJfgymCzBZij8JTUh71c1YN71mQzSFqIQwgKgJTWia7Jj4=
=irG+
-----END PGP SIGNATURE-----

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

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

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

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl6MoJEACgkQ9DSh76/u
rqN2CRAAid8Yd7XXHE/zNk4iRsKhXvZ3QGilno1F4NTu3y9OK48F3Nxo+CF/pSBm
KNUmVFzFrd58D8gPwmh8Ka6yipjArHi2NJUoGUBqCrTkz615ZF+10nO6c/mwPYJb
te/gz+M0fC8DcRxydZdJqxZPNbQSGC1T6tRqqfJUZK7y6Q9VQZQG55UMaDBcGb6q
OBQFdQgRLGhwrF+KyvTXu5vIvWtk8CLOp3qwQKYU+zlTECWZ3SCgPnHPbE3sF8So
RX/ATUY/xM2qdoihBtuGi6TPRnW/SZWa+jqaeNdKP0ode6/0N54Thcl8RS7ao8pb
hMWEsGUUPZs8xo8B4qxFmQZld+zmlyroaYl0AGu1KEAdj1JJexxXyKH5UY5DJduN
t2DU0fyUdqMzEPT5cU8XztjfY7rVVUaSbvp7RpZZbnkPw3++14e6sxAIkAcZ6+Cl
T9b7mcVRBnqGLiAsNskvF8QIKJGG83CZrARPr/++suoZzZNU4vnUkhV9+lLywZ7k
1VgH4wYKsGX3QnOzFCOwK2X3RFJfOrdtxSA2YkQhfxf7XYLSSX7CW6g+b+7paHVU
tCCWTvIh8RdQavJ/lmvxGckJrunefTS6Qako2DiGGLH7OM20Hna/PoVZVovej8yi
inpxxVJb7jufRy922Yt2a7Vi59tyBeZC2rJGo0upacd/3YpDg60=
=f4yA
-----END PGP SIGNATURE-----

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

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

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

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl5pFlQACgkQ9DSh76/u
rqN94Q/9HdLv6bilAi/4xDfgNL9RDstm3+mPwkuPRItOcTM4K78ucY2xM71hsW8u
YKRrHFrAV39aX9yR8Ou0SG/v7brnhXNCS8GwReisZWpm6JhChG8IkxRxrVoi8tmw
bQuvDXa6aFfBqbQ7F/zsvtflZJ0jZjI/vqHCG3niGKGRknVk99E1mdB/jexKDJGu
+t7iedtDcdWJp519EwrCCrp15lLEQRRyeL4sO1AO7ekqZdzAZegHVQi9Um1jR2/r
uvDvmoQQ+M9C3a7TtDs2MhWVGSSQxm/G4NmYe7uvE9ZTc/twkJe44F2cbI/toLks
e/54Cv/tvdryN/5pdFrfwMsMCWgnbaXsN97sff+t0C5b6s8fHxlc3spPCLlXg3fS
xs63VYNDqHiDdlzLHMyng0e7nTFoqD0gt04QgS/s1Vx0fwJCSpHThTY9GXF7FAvE
+EtjQ3uXrkpMhUAt9OJwifPfyujimcJsGlFGsj6G0OlGhCJFxwJhQDLuAl4jquCc
K3lIEE7xu1KMqupuN6tsDJI6LvNQCcphgOsza/jdoj9F6KUrDjmEEP+Sc6FuMfM6
Kzh7uPDXDwoB0KXD5TiPbgUQfVnx6NcFlygFX2Rjg0nYmsf0TE7AKGLX2/B/+u1N
+q9LA9LEk919Dj2ZewumoyFx3s/S9UfBq2f+8HzbKvkJsUva0TU=
=o6rA
-----END PGP SIGNATURE-----

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

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

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

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl6MoJIACgkQ9DSh76/u
rqMKKA/9FHGaXiRnc8azGnAkNXBJPVFctd0/HD0mfAc8DEesznj7Zo4yzWCR4Luj
SKErnPq7Zqx6ijcYI1dLggppihWThQzs5CzOffQpFuWpT8dmHxPSV4quck+aGVE7
/9jlFzD1SX7UiyJu8fqelJtPbtZUiJT9gG7uo2MzGaOTYWQkxwYwGoO2xD5ivH9U
CGsnxJWX3YlMCI+0q6XHgJ/FVijdD6RIUhZHgmgbCglQ7o5f5MwEmew5dJcOY4Qv
80FMaUdMQOATOtbGbFP/etWVgPGAVFCUHnF31MT6ZF4BCgI09fy16PELNmQQWFUz
r2sDwFQez3whjjxE2JFqjSqsPOZ9YARz9+j2exTg6rDWrkQy9vXNGfoqba4Wh76Q
3xbwrosTXHM0JWoKlIbiwlbm1kg8wS5kg9FtX4P3pj67fGDGvvDBGJ6sQa6rEblz
2A5uKbx9XGjFQBpPdYbIBk7uFLYQSOpf9sP6spITATxIIUnp6z4iBTkSJOoeZHLL
Iy/hn4L6YGGsZHYZmIfcw9xYlU2eCaangFDzIlR0/DgU533X//wmLGD+Nu0FM0oe
1FM3cGmltVZJrK0C7124eJBxcaKRsJv6h5V+0NPc8+IkyMnwOZqMHnwPVRoE46m/
gyn2wQ7RRUkhAUsC52cUJ+3/6sfg3IYbuLWi1jfIMw/8ejrydqY=
=+KxM
-----END PGP SIGNATURE-----

7
libreoffice.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Apr 8 11:13:30 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
- Update to 6.4.3.2:
* 6.4.2 RC2 release
- Drop merged patch adapt-o3tl-span-to-removal-of-std-span-cbegin-et-al.patch
-------------------------------------------------------------------
Mon Mar 30 08:41:19 UTC 2020 - Martin Liška <mliska@suse.cz>

4
libreoffice.spec
View File

@ -50,7 +50,7 @@
%bcond_with system_gpgme
%endif
Name: libreoffice
Version: 6.4.2.2
Version: 6.4.3.2
Release: 0
Summary: A Free Office Suite (Framework)
License: LGPL-3.0-or-later AND MPL-2.0+
@ -101,7 +101,6 @@ Patch3: mediawiki-no-broken-help.diff
Patch6: fix_old_boost_spirit_namespace.patch
Patch7: poppler-0.86.patch
Patch8: replace-boost-bimap-in-sdext-pdfimport.patch
Patch9: adapt-o3tl-span-to-removal-of-std-span-cbegin-et-al.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
@ -960,7 +959,6 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch990 -p1
%patch991 -p1