From 20ec5738efd991929a3582c90ca3d5fbdfa6a8f6 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Apr 16 2020 14:24:05 +0000 Subject: latest version --- diff --git a/.gitignore b/.gitignore index 45e25ea..caa7677 100644 --- a/.gitignore +++ b/.gitignore @@ -5,9 +5,9 @@ /185d60944ea767075d27247c3162b3bc-unowinreg.dll /884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf /libreoffice-multiliblauncher.sh -/libreoffice-6.4.2.2.tar.xz -/libreoffice-6.4.2.2.tar.xz.asc -/libreoffice-help-6.4.2.2.tar.xz -/libreoffice-help-6.4.2.2.tar.xz.asc -/libreoffice-translations-6.4.2.2.tar.xz -/libreoffice-translations-6.4.2.2.tar.xz.asc +/libreoffice-6.4.3.2.tar.xz +/libreoffice-6.4.3.2.tar.xz.asc +/libreoffice-help-6.4.3.2.tar.xz +/libreoffice-help-6.4.3.2.tar.xz.asc +/libreoffice-translations-6.4.3.2.tar.xz +/libreoffice-translations-6.4.3.2.tar.xz.asc diff --git a/0001-Adapt-o3tl-span-to-removal-of-std-span-cbegin-et-al.patch b/0001-Adapt-o3tl-span-to-removal-of-std-span-cbegin-et-al.patch deleted file mode 100644 index 3a8387a..0000000 --- a/0001-Adapt-o3tl-span-to-removal-of-std-span-cbegin-et-al.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 6fbfad6b00e8c35346ee59cd32a0d7ccc0d8c19c Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann -Date: Sat, 22 Feb 2020 17:29:15 +0100 -Subject: [PATCH] Adapt o3tl::span to removal of std::span::cbegin et al - - "span::cbegin/cend methods produce -different results than std::[ranges::]cbegin/cend", as implemented now in - "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 ---- - 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::difference_type(3), v.end() - v.begin()); -- CPPUNIT_ASSERT_EQUAL(1, *v.cbegin()); -- CPPUNIT_ASSERT_EQUAL( -- o3tl::span::difference_type(3), v.cend() - v.cbegin()); - CPPUNIT_ASSERT_EQUAL(3, *v.rbegin()); - CPPUNIT_ASSERT_EQUAL( - o3tl::span::difference_type(3), v.rend() - v.rbegin()); -- CPPUNIT_ASSERT_EQUAL(3, *v.crbegin()); -- CPPUNIT_ASSERT_EQUAL( -- o3tl::span::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 - diff --git a/libreoffice.spec b/libreoffice.spec index 403283d..3dd878b 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -3,7 +3,7 @@ %global _python_bytecompile_extra 1 # download path contains version without the last (fourth) digit -%global libo_version 6.4.2 +%global libo_version 6.4.3 # Should contain .alphaX / .betaX, if this is pre-release (actually # pre-RC) version. The pre-release string is part of tarball file names, # so we need a way to define it easily at one place. @@ -245,7 +245,6 @@ Patch2: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch # backported Patch3: 0001-replace-boost-bimap-in-sdext-pdfimport.patch Patch4: 0001-fix-detecting-qrcodegen.patch -Patch5: 0001-Adapt-o3tl-span-to-removal-of-std-span-cbegin-et-al.patch %if 0%{?rhel} # not upstreamed @@ -2153,6 +2152,9 @@ done %{_includedir}/LibreOfficeKit %changelog +* Thu Apr 16 2020 Caolán McNamara - 1:6.4.3.2-1 +- latest stable + * Mon Mar 30 2020 Thierry Vignaud 1:6.4.2.2-1 - 6.4.2.2 diff --git a/sources b/sources index 9af5199..cb9cc93 100644 --- a/sources +++ b/sources @@ -6,9 +6,9 @@ SHA512 (a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 2d3835f7ac356805025 SHA512 (0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46 SHA512 (884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf) = ce7e23e750f2c6f7ff2e590cc8941caa18eaae2727c9ca31313ab72ab19278055bd9393d38b0b5b685594e2f04ee15cb83b3bbb25d09665fe7383d7f26bf2ae8 SHA512 (libreoffice-multiliblauncher.sh) = db532afdf5000bc66f9e02c7d0ab586468466f63f8f0bdb204832581e8277c5c59f688fa096548d642411cb8c46e8de4a744676b4e624c075262cfd6945138cd -SHA512 (libreoffice-6.4.2.2.tar.xz) = 3439cd855bf77e07ce0efa866c878cb16d77b6532e1bfa67571e994908c9c8ecdcc8fee504d75878fb499fb84f000dd4d8261424c37a5814bc1c5792d40724d9 -SHA512 (libreoffice-6.4.2.2.tar.xz.asc) = 1cc613ceca1f3e6d9da3e9326e76cc2921a426f8a464a7cc4b422b1e28c541c6624bc556b392f97b28d42d752e228b92eba34aaf8f7e99271b531a55d7290ae4 -SHA512 (libreoffice-help-6.4.2.2.tar.xz) = 503f75ac71ea1d358886d344ba722dc376a48c4a0f6b46d643640679541311215ed6f5840c7c471cce4f84e7f0aff4260f4a04c548013cc41cf2d029ee324501 -SHA512 (libreoffice-help-6.4.2.2.tar.xz.asc) = 61242522fd2d4605956ce28f4cb0810be97e3efcfddcff7dac2592f21d72b6e4a9a9d9346ff62c48b00b0ba3048ab21fd93200612475707cc0dbf2fcf19cd9ff -SHA512 (libreoffice-translations-6.4.2.2.tar.xz) = 3ff32733865d5faa60c0ce505a68f3679e9ecaa67c88a59b569b42be63375617c838604ca9d965872a33087de7b7631bbcd0546bb787eba056e7f635c1bd436e -SHA512 (libreoffice-translations-6.4.2.2.tar.xz.asc) = 906711fd2522d90d3422a3a920213a78a1b08ebef811cc7f22f586a867236c2fe0c95911b03c9cbcf84b586732c6d0ad3a3deac09929c545dc38967dfa1cff28 +SHA512 (libreoffice-6.4.3.2.tar.xz) = ee11c704fa7184ffe371aa36c835c4c7fb06ef03d08fa0a5a9e647e80610db275e091d1ac79c1fe11af0c7f14dd72c821da9e7e6ba59573fc88cec79f84c873a +SHA512 (libreoffice-6.4.3.2.tar.xz.asc) = 236008844537dd7d45104d35aef0bce3e1ebd44fd02e5d893b888dee753bd557e34e7420bcf57e85c4c74a16d4729b90a9f4fc59a80555c532797dcb99155ecd +SHA512 (libreoffice-help-6.4.3.2.tar.xz) = 9f8c1bcde27d153389d124af1393d0939262c85a1624f0b475a5515b5737612cb607d04742a069534771eee51ba98896926804ec7001d6bc2110dccdd6e7615a +SHA512 (libreoffice-help-6.4.3.2.tar.xz.asc) = 8a79881f39714e3ca696c8ea837f8dd9b5252a6e7ecef11e4424d1d0835c006e8332c0171a100cd102c2a2bc78d6bc6d1fd44315a8f99548cfdbfaa32718bf75 +SHA512 (libreoffice-translations-6.4.3.2.tar.xz) = 85c679c7c34727ffea9b01d29ba8b91270c42a54fcbb5b5d3507605443a43e18f944e3a17fa0f27a2bb04e7f74970a25f306cbfc42bac376962784f7fbccaf87 +SHA512 (libreoffice-translations-6.4.3.2.tar.xz.asc) = f6725ce116e52a2c93b8d1e67934a420f3ffea0540be66a1a224b445f4343e53df82cfb5284bafadfdcaf890fd7ef519eb65986c25935131bf5f4900c13de6d5