7.6.1.1

2023-08-31 15:09:45 -05:00 · 2023-08-31 15:09:45 -05:00 · 36004e2be4
commit 36004e2be4
parent 8240bfa27b
5 changed files with 20 additions and 145 deletions
--- a/.gitignore
+++ b/.gitignore
@ -29,3 +29,9 @@
 /libreoffice-help-7.6.0.3.tar.xz.asc
 /libreoffice-translations-7.6.0.3.tar.xz
 /libreoffice-translations-7.6.0.3.tar.xz.asc
+/libreoffice-7.6.1.1.tar.xz
+/libreoffice-7.6.1.1.tar.xz.asc
+/libreoffice-help-7.6.1.1.tar.xz
+/libreoffice-help-7.6.1.1.tar.xz.asc
+/libreoffice-translations-7.6.1.1.tar.xz
+/libreoffice-translations-7.6.1.1.tar.xz.asc
--- a/0001-Adapt-test-code-to-cURL-8.2.0.patch
+++ b/0001-Adapt-test-code-to-cURL-8.2.0.patch
@ -1,83 +0,0 @@
-From 2a68dc02bd19a717d3c86873206fabed1098f228 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman@redhat.com>
-Date: Mon, 31 Jul 2023 17:09:32 +0200
-Subject: [PATCH] Adapt test code to cURL 8.2.0
-
-...for which CppunitTest_ucb_webdav_core would fail with
-
-> ucb/qa/cppunit/webdav/webdav_local_neon.cxx:60:(anonymous namespace)::webdav_local_test::WebdavUriTest
-> equality assertion failed
-> - Expected: ?query#fragment
-> - Actual  : /?query#fragment
-
-and
-
-> ucb/qa/cppunit/webdav/webdav_local_neon.cxx:89:(anonymous namespace)::webdav_local_test::WebdavUriTest2
-> equality assertion failed
-> - Expected: ?query
-> - Actual  : /?query
-
-because of
-<https://github.com/bch/curl/commit/5752e71080cb3aafa8b24c3261419345b832bc92>
-"urlapi: have *set(PATH) prepend a slash if one is missing".
-
-All that test code had been added with b03e070420606d407df2ec5e9dfa7043ecc46177
-"ucb: webdav-curl: fix CurlUri::CloneWithRelativeRefPathAbsolute()", and it
-looks harmless for our use cases that cURL started to behave differently there
-now.  So instead of accepting either of the outcomes depending on what cURL
-version is being used, just change the test code to not leave out the
-path-absolute in the calls to CloneWithRelativeRefPathAbsolute (which is
-documented in ucb/source/ucp/webdav-curl/CurlUri.hxx to take
-
->     /// @param matches: relative-ref = path-absolute [ "?" query ] [ "#" fragment ]
-
-and path-absolute cannot be empty as per RFC 3986 "Uniform Resource Identifier
-(URI): Generic Syntax").
-
-Change-Id: If07a28598dfa047ebe89d8bcda19e8fcaa36aed0
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155099
-Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
-Tested-by: Jenkins
-Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
---
- ucb/qa/cppunit/webdav/webdav_local_neon.cxx | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/ucb/qa/cppunit/webdav/webdav_local_neon.cxx b/ucb/qa/cppunit/webdav/webdav_local_neon.cxx
-index bde7652b9ffa..a457bc6d2b28 100644
--- a/ucb/qa/cppunit/webdav/webdav_local_neon.cxx
-+++ b/ucb/qa/cppunit/webdav/webdav_local_neon.cxx
-@@ -52,12 +52,12 @@ namespace
-         CPPUNIT_ASSERT_EQUAL( OUString("/foo/bar"), uri2.GetRelativeReference() );
-         CPPUNIT_ASSERT_EQUAL( OUString("http://user%40anothername@server.biz:8040/foo/bar"), uri2.GetURI() );
- 
-        CurlUri uri3(aURI.CloneWithRelativeRefPathAbsolute(u"?query#fragment"));
-+        CurlUri uri3(aURI.CloneWithRelativeRefPathAbsolute(u"/?query#fragment"));
-         CPPUNIT_ASSERT_EQUAL( OUString("http"), uri3.GetScheme() );
-         CPPUNIT_ASSERT_EQUAL( OUString("server.biz"), uri3.GetHost() );
-         CPPUNIT_ASSERT_EQUAL( OUString("user%40anothername"), uri3.GetUser() );
-         CPPUNIT_ASSERT_EQUAL( sal_uInt16(8040), uri3.GetPort() );
-        CPPUNIT_ASSERT_EQUAL( OUString("?query#fragment"), uri3.GetRelativeReference() );
-+        CPPUNIT_ASSERT_EQUAL( OUString("/?query#fragment"), uri3.GetRelativeReference() );
-         CPPUNIT_ASSERT_EQUAL( OUString("http://user%40anothername@server.biz:8040/?query#fragment"), uri3.GetURI() );
-     }
- 
-@@ -80,13 +80,13 @@ namespace
-         CPPUNIT_ASSERT_EQUAL( OUString("/foo/bar"), uri2.GetRelativeReference() );
-         CPPUNIT_ASSERT_EQUAL( OUString("https://foo:bar@server.biz:8040/foo/bar"), uri2.GetURI() );
- 
-        CurlUri uri3(aURI.CloneWithRelativeRefPathAbsolute(u"?query"));
-+        CurlUri uri3(aURI.CloneWithRelativeRefPathAbsolute(u"/?query"));
-         CPPUNIT_ASSERT_EQUAL( OUString("https"), uri3.GetScheme() );
-         CPPUNIT_ASSERT_EQUAL( OUString("server.biz"), uri3.GetHost() );
-         CPPUNIT_ASSERT_EQUAL( OUString("foo"), uri3.GetUser() );
-         CPPUNIT_ASSERT_EQUAL( OUString("bar"), uri3.GetPassword() );
-         CPPUNIT_ASSERT_EQUAL( sal_uInt16(8040), uri3.GetPort() );
-        CPPUNIT_ASSERT_EQUAL( OUString("?query"), uri3.GetRelativeReference() );
-+        CPPUNIT_ASSERT_EQUAL( OUString("/?query"), uri3.GetRelativeReference() );
-         CPPUNIT_ASSERT_EQUAL( OUString("https://foo:bar@server.biz:8040/?query"), uri3.GetURI() );
-     }
- 
-- 
-2.41.0
-
--- a/0002-Fix-heap-use-after-free.patch
+++ b/0002-Fix-heap-use-after-free.patch
@ -1,50 +0,0 @@
-From 694bacca057c9f1d93ab27d61199aec9d060b868 Mon Sep 17 00:00:00 2001
-From: Tibor Nagy <nagy.tibor2@nisz.hu>
-Date: Fri, 4 Aug 2023 00:39:24 +0200
-Subject: [PATCH] Fix heap-use-after-free
-
-The issue is caused by commit Ic87983fa6e3279a64841babc565fbe97710ff730
-(tdf#99808 sc: fix background of conditional formatting in merged cell)
-
-Change-Id: Ic72ba16c2649537dc3b486e07c12e2486cdf1957
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155328
-Tested-by: Jenkins
-Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
---
- sc/qa/unit/ucalc_condformat.cxx | 12 +++++-------
- 1 file changed, 5 insertions(+), 7 deletions(-)
-
-diff --git a/sc/qa/unit/ucalc_condformat.cxx b/sc/qa/unit/ucalc_condformat.cxx
-index 6b79a4318501..7a0abc7cf026 100644
--- a/sc/qa/unit/ucalc_condformat.cxx
-+++ b/sc/qa/unit/ucalc_condformat.cxx
-@@ -1394,21 +1394,19 @@ CPPUNIT_TEST_FIXTURE(TestCondformat, testConditionStyleInMergedCell)
-     // Add a conditional format.
-     auto pFormat = std::make_unique<ScConditionalFormat>(1, m_pDoc);
-     pFormat->SetRange(ScRange(0, 0, 0, 0, 0, 0));
-    auto pFormatTmp = pFormat.get();
-    sal_uLong nKey = m_pDoc->AddCondFormat(std::move(pFormat), 0);
- 
-     // Add condition in which if the value equals 1, set the "Good" style.
-     ScCondFormatEntry* pEntry = new ScCondFormatEntry(
-         ScConditionMode::Equal, "=1", "", *m_pDoc, ScAddress(0, 0, 0), ScResId(STR_STYLENAME_GOOD));
-    pFormatTmp->AddEntry(pEntry);
-+    pFormat->AddEntry(pEntry);
- 
-     // Apply the format to the range.
-    m_pDoc->AddCondFormatData(pFormatTmp->GetRange(), 0, nKey);
-+    m_pDoc->AddCondFormatData(pFormat->GetRange(), 0, 1);
- 
-     ScDocFunc& rFunc = m_xDocShell->GetDocFunc();
-    sal_uInt32 nOldFormat = pFormatTmp->GetKey();
-    const ScRangeList& rRangeList = pFormatTmp->GetRange();
-    rFunc.ReplaceConditionalFormat(nOldFormat, pFormatTmp->Clone(), 0, rRangeList);
-+    sal_uInt32 nOldFormat = pFormat->GetKey();
-+    const ScRangeList& rRangeList = pFormat->GetRange();
-+    rFunc.ReplaceConditionalFormat(nOldFormat, std::move(pFormat), 0, rRangeList);
- 
-     CPPUNIT_ASSERT_EQUAL(true, aListener.mbPaintAllMergedCell);
- 
-- 
-2.41.0
-
--- a/libreoffice.spec
+++ b/libreoffice.spec
@ -1,5 +1,5 @@
 # download path contains version without the last (fourth) digit
-%global libo_version 7.6.0
+%global libo_version 7.6.1
 # 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.
@ -57,8 +57,8 @@ ExcludeArch:    %{ix86}
 Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
-Version:        %{libo_version}.3
-Release:        4%{?libo_prerelease}%{?dist}
+Version:        %{libo_version}.1
+Release:        1%{?libo_prerelease}%{?dist}
 # default new files are: MPLv2
 # older files are typically: MPLv2 incorporating work under ASLv2
 # nlpsolver is: LGPLv3
@ -243,6 +243,7 @@ BuildRequires: dejavu-sans-fonts
 BuildRequires: dejavu-serif-fonts
 BuildRequires: google-carlito-fonts
 BuildRequires: google-rubik-fonts
+BuildRequires: google-crosextra-caladea-fonts
 # Amiri used in vcl/qa/cppunit tests
 BuildRequires: amiri-fonts
 BuildRequires: amiri-quran-fonts
@ -271,9 +272,7 @@ Patch2: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch
 Patch3: 0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch
 Patch4: 0001-default-to-sifr-for-gnome-light-mode.patch
 # backported
-Patch8: 0001-Only-pass-I.-arguments-to-g-ir-scanner-by-using-pkg-.patch
-Patch9: 0001-Adapt-test-code-to-cURL-8.2.0.patch
-Patch10: 0002-Fix-heap-use-after-free.patch
+Patch5: 0001-Only-pass-I.-arguments-to-g-ir-scanner-by-using-pkg-.patch
 # not upstreamed
 # fix FTB in ppc64le from sharkcz
 Patch11: lo-7.6-ppc64le-tests.patch
@ -2258,6 +2257,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
 %{_includedir}/LibreOfficeKit

 %changelog
+* Mon Aug 28 2023 Gwyn Ciesla <gwync@protonmail.com> - 1:7.6.1.1-1
+- 7.6.1.1
+
 * Sun Aug 27 2023 Mattia Verga <mattia.verga@proton.me> - 1:7.6.0.3-4
 - Remove test exclusions from aarch64
 - Link aarch64 executable with standard -g level
--- a/12
+++ b/12
@ -1,9 +1,9 @@
-SHA512 (libreoffice-7.6.0.3.tar.xz) = e8f3d4bede14427027cd69e3a9a21ebe6f8dcf3cd002f67b850fe3a1657ef06b312a34864780280d7a7c713ea906947130239708dcd0a45509b133710fd330be
-SHA512 (libreoffice-7.6.0.3.tar.xz.asc) = 511a0d3896def87f02e8c5aad161482249d39e2739643b0ddc8b905bc9ec9775bbc5cb18572d55320aabddb5e4cdf99f7d3cc77e3e01452fd6b3411b6de708c9
-SHA512 (libreoffice-help-7.6.0.3.tar.xz) = 5293158a51ee62f1df664ff5b49f12e7dee3d25e2e485a53a546db2bca16bb2699e795d21cf8aa8b3e87ba2f159e9cf03fb2f71c6f17307faa8ff60fa0948217
-SHA512 (libreoffice-help-7.6.0.3.tar.xz.asc) = a69db87e55b07985721cea7064268bccfc16fb48919d471063ce21ac3baccdd3b3958830c617b6df34b72ba5ddd2e256cf8a527ebf6a6e8cdc52f4de1aeb52f5
-SHA512 (libreoffice-translations-7.6.0.3.tar.xz) = 2bc9888f3cb7131397585aa8321c703b983e7003eed37b49113128c89b7a0e7350d5f02bd0c7ba3718016eec08a9c50e246391344f54b0137150b4b2b65de1f5
-SHA512 (libreoffice-translations-7.6.0.3.tar.xz.asc) = 841a690149fd9eab6a56c3461a6209ccd448e4de09087bc5cc32972827df56b744fdde40e60512f0f6ea74cf66a57c66375e2bfb18d9e65d56caf7751c4948dc
+SHA512 (libreoffice-7.6.1.1.tar.xz) = 3ef29b11abb40e3a2d6048b38648d677bbe9b9012dd2b262fd81dc1e97485a8f5a3c8a5fa2776171ce9344ea083c1874cc1da66164516ed1691796b34be44341
+SHA512 (libreoffice-7.6.1.1.tar.xz.asc) = 63357bd8220c0023acd0d38c20f9bae20741dae008412313803d9456a8db7c7018a56b97355c76456c37ae9b17d47cc4080b1007221bde8cda7e3527ccceeffd
+SHA512 (libreoffice-help-7.6.1.1.tar.xz) = 75a5c05b7fa0a51e6e33cef1fae742f623d6c92a8a453478474c603909ff0f8fad2a0ffeb5e1903d3be1e6285add67ae34b08a4d2e7135a7d3461695d4fd561e
+SHA512 (libreoffice-help-7.6.1.1.tar.xz.asc) = f2b3dc3fd959de41d62e3c674cb160e9ebb96a1a3de74c8ead99a214b8e4e26682fafb0b689bc843108470009c9c3d031273da488f64fe0abda4728ecd24fe7e
+SHA512 (libreoffice-translations-7.6.1.1.tar.xz) = ff48388aeb2388d7db0c464f5179fd968a021fa99216877cc21742e816d08b5387116c9f6c547ac50aaee427e692d05ffa41c496b177968f1bf856fc7041af22
+SHA512 (libreoffice-translations-7.6.1.1.tar.xz.asc) = 60ef64efafac73ea22bdba85f96e3689988cdf604d192c8c7898788f5d3b303eea9fc32a32d2840a0528e95f536828f3360fc14a53fdf79551ec40bc6f8b341a
 SHA512 (17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a
 SHA512 (185d60944ea767075d27247c3162b3bc-unowinreg.dll) = 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c
 SHA512 (a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a