The package rpms/libreoffice.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/libreoffice.git/commit/?id=87120c...
https://src.fedoraproject.org/cgit/rpms/libreoffice.git/commit/?id=cae989...
https://src.fedoraproject.org/cgit/rpms/libreoffice.git/commit/?id=093505....
Change:
-%ifarch ppc64le
+%ifarch ppc64le
+%ifarch s390x
Thanks.
Full change:
============
commit a89d19d498b997d5e4cc55571cbab83839670252
Author: Mattia Verga <mattia.verga(a)tiscali.it>
Date: Wed Aug 23 09:43:02 2023 +0200
Disable other failing tests in s390x
diff --git a/libreoffice.spec b/libreoffice.spec
index c1cc7f7..860447c 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -1031,12 +1031,16 @@ sed -i -e /CppunitTest_sc_addin_functions_test/d sc/Module_sc.mk
sed -i -e /CppunitTest_sc_statistical_functions_test/d sc/Module_sc.mk
%endif
%ifarch s390x
+sed -i -e /CppunitTest_sc_array_functions_test/d sc/Module_sc.mk
sed -i -e /CppunitTest_sc_addin_functions_test/d sc/Module_sc.mk
sed -i -e s/CppunitTest_sw_macros_test// sw/Module_sw.mk
#
https://bugs.documentfoundation.org/show_bug.cgi?id=125978
sed -i -e s/CustomTarget_uno_test// testtools/Module_testtools.mk
# failing testTdf149402_vba
sed -i -e s/CppunitTest_basic_macros// basic/Module_basic.mk
+# Other test exclusions pointed out by sharkcz
+sed -i -e /CppunitTest_vcl_svm_test/d vcl/Module_vcl.mk
+sed -i -e /CppunitTest_sw_core_layout/d sw/Module_sw.mk
%endif
#see rhbz#2072615
@@ -2258,7 +2262,7 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor
&>/dev/null || :
%changelog
* Wed Aug 23 2023 Mattia Verga <mattia.verga(a)proton.me> - 1:7.6.0.3-3
-- Disable another failing test under s390x
+- Disable other failing tests under s390x
- Add patch to fix FTB under ppc64le
* Tue Aug 15 2023 Mattia Verga <mattia.verga(a)proton.me> - 1:7.6.0.3-2
commit 499094d747c6c07dce89c8c683ebad09608acda0
Author: Mattia Verga <mattia.verga(a)tiscali.it>
Date: Wed Aug 23 08:47:22 2023 +0200
Patch to fix FTB in ppc64le
diff --git a/libreoffice.spec b/libreoffice.spec
index 8ebbba0..c1cc7f7 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -277,6 +277,8 @@ 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
# not upstreamed
+# fix FTB in ppc64le from sharkcz
+Patch11: lo-7.6-ppc64le-tests.patch
Patch500: 0001-disable-libe-book-support.patch
%global instdir %{_libdir}
@@ -2257,6 +2259,7 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor
&>/dev/null || :
%changelog
* Wed Aug 23 2023 Mattia Verga <mattia.verga(a)proton.me> - 1:7.6.0.3-3
- Disable another failing test under s390x
+- Add patch to fix FTB under ppc64le
* Tue Aug 15 2023 Mattia Verga <mattia.verga(a)proton.me> - 1:7.6.0.3-2
- Disable unreliable test under s390x
diff --git a/lo-7.6-ppc64le-tests.patch b/lo-7.6-ppc64le-tests.patch
new file mode 100644
index 0000000..4732451
--- /dev/null
+++ b/lo-7.6-ppc64le-tests.patch
@@ -0,0 +1,19 @@
+diff -up libreoffice-7.6.0.3/testtools/source/bridgetest/bridgetest.cxx.orig
libreoffice-7.6.0.3/testtools/source/bridgetest/bridgetest.cxx
+--- libreoffice-7.6.0.3/testtools/source/bridgetest/bridgetest.cxx.orig 2023-08-21
13:15:31.738062821 +0200
++++ libreoffice-7.6.0.3/testtools/source/bridgetest/bridgetest.cxx 2023-08-21
13:15:56.607246816 +0200
+@@ -469,6 +469,7 @@ static bool performTest(
+ equals(aData, aSV2ret) && equals(aData, aRet2),
+ "getValues2 test");
+ }
++#if 0
+ {
+ TwoFloats aIn(1.1f, 2.2f);
+ TwoFloats aOut = xLBT->echoTwoFloats(aIn);
+@@ -479,6 +480,7 @@ static bool performTest(
+ FourFloats aOut = xLBT->echoFourFloats(aIn);
+ bRet = check( memcmp(&aIn, &aOut, sizeof(FourFloats)) == 0,
"four floats struct test" ) && bRet;
+ }
++#endif
+ {
+ MixedFloatAndInteger aIn(7.7f, 8);
+ MixedFloatAndInteger aOut = xLBT->echoMixedFloatAndInteger(aIn);
commit 38061e5499187f884517813a2bbf5d16bd9ef8dd
Author: Mattia Verga <mattia.verga(a)tiscali.it>
Date: Wed Aug 23 08:28:51 2023 +0200
Disable another failing test under s390x
diff --git a/libreoffice.spec b/libreoffice.spec
index 5783f4f..8ebbba0 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -58,7 +58,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.3
-Release: 2%{?libo_prerelease}%{?dist}
+Release: 3%{?libo_prerelease}%{?dist}
# default new files are: MPLv2
# older files are typically: MPLv2 incorporating work under ASLv2
# nlpsolver is: LGPLv3
@@ -1033,6 +1033,8 @@ sed -i -e /CppunitTest_sc_addin_functions_test/d sc/Module_sc.mk
sed -i -e s/CppunitTest_sw_macros_test// sw/Module_sw.mk
#
https://bugs.documentfoundation.org/show_bug.cgi?id=125978
sed -i -e s/CustomTarget_uno_test// testtools/Module_testtools.mk
+# failing testTdf149402_vba
+sed -i -e s/CppunitTest_basic_macros// basic/Module_basic.mk
%endif
#see rhbz#2072615
@@ -2253,6 +2255,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor
&>/dev/null || :
%{_includedir}/LibreOfficeKit
%changelog
+* Wed Aug 23 2023 Mattia Verga <mattia.verga(a)proton.me> - 1:7.6.0.3-3
+- Disable another failing test under s390x
+
* Tue Aug 15 2023 Mattia Verga <mattia.verga(a)proton.me> - 1:7.6.0.3-2
- Disable unreliable test under s390x
- Try verbose make if first build attempt fails
commit 87120c1c08f0e0fcbb96f4b9a32b24367a1bc38c
Author: Mattia Verga <mattia.verga(a)tiscali.it>
Date: Sun Aug 20 09:10:44 2023 +0200
Revert boost1.78 conditional as it cannot work anyway
diff --git a/libreoffice.spec b/libreoffice.spec
index e73d220..5783f4f 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -137,11 +137,7 @@ BuildRequires: zip
BuildRequires: %{libo_python}-devel
BuildRequires: %{libo_python}-setuptools
BuildRequires: Box2D-devel
-%ifarch ppc64le
-BuildRequires: boost1.78-devel
-%else
BuildRequires: boost-devel
-%endif
BuildRequires: cups-devel
BuildRequires: fontpackages-devel
%if 0%{?fedora}
commit cae9896d3e386eb3fa1d76d35179d9dc2b58d448
Author: Mattia Verga <mattia.verga(a)tiscali.it>
Date: Sat Aug 19 09:18:19 2023 +0200
Try boost1.78 on ppc64le
diff --git a/libreoffice.spec b/libreoffice.spec
index 5783f4f..e73d220 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -137,7 +137,11 @@ BuildRequires: zip
BuildRequires: %{libo_python}-devel
BuildRequires: %{libo_python}-setuptools
BuildRequires: Box2D-devel
+%ifarch ppc64le
+BuildRequires: boost1.78-devel
+%else
BuildRequires: boost-devel
+%endif
BuildRequires: cups-devel
BuildRequires: fontpackages-devel
%if 0%{?fedora}
commit e73c62cedeeae6eb0f7104f02ae2ae58212d446c
Author: Mattia Verga <mattia.verga(a)tiscali.it>
Date: Sat Aug 19 09:12:07 2023 +0200
Fix specfile
diff --git a/libreoffice.spec b/libreoffice.spec
index 0428099..5783f4f 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -375,7 +375,7 @@ Requires: %{name}-pyuno%{?_isa} = %{epoch}:%{version}-%{release}
Requires: %{name}-ure%{?_isa} = %{epoch}:%{version}-%{release}
%description base
-GUI database front-end for LibreOffice. Allows creation and management of
+GUI database front-end for LibreOffice. Allows creation and management of
databases through a GUI.
%ifarch %{java_arches}
@@ -446,7 +446,7 @@ BuildArch: noarch
%description %{fontname}-fonts
A dingbats font, OpenSymbol, suitable for use by LibreOffice for bullets and
-mathematical symbols.
+mathematical symbols.
%package writer
Summary: LibreOffice Word Processor Application
@@ -460,7 +460,7 @@ Requires: %{name}-ure%{?_isa} = %{epoch}:%{version}-%{release}
The LibreOffice Word Processor application.
%package emailmerge
-Summary: Email mail-merge component for LibreOffice
+Summary: Email mail-merge component for LibreOffice
Requires: %{name}-writer%{?_isa} = %{epoch}:%{version}-%{release}
Requires: %{name}-pyuno%{?_isa} = %{epoch}:%{version}-%{release}
@@ -510,7 +510,7 @@ Requires: %{name}-pdfimport%{?_isa} = %{epoch}:%{version}-%{release}
Requires: %{name}-pyuno%{?_isa} = %{epoch}:%{version}-%{release}
Requires: %{name}-ure%{?_isa} = %{epoch}:%{version}-%{release}
-%description math
+%description math
The LibreOffice Equation Editor Application.
%package graphicfilter
@@ -999,11 +999,6 @@ gpgv2 --keyring ./keyring.gpg %{SOURCE5} %{SOURCE4}
%setup -q -n %{name}-%{version}%{?libo_prerelease} -b 2 -b 4
rm -rf git-hooks */git-hooks
-# This is normally done by %%autosetup -S git_am,
-# but that does not work with multiple -b options, so we use plain %%setup above
-%global __scm git_am
-%__scm_setup_git_am -q
-
#Customize Palette to add Red Hat colours
(head -n -1 extras/source/palettes/standard.soc && \
echo -e ' <draw:color draw:name="Red Hat 1"
draw:color="#cc0000"/>
@@ -1013,7 +1008,6 @@ rm -rf git-hooks */git-hooks
<draw:color draw:name="Red Hat 5" draw:color="#4e376b"/>'
&& \
tail -n 1 extras/source/palettes/standard.soc) > redhat.soc
mv -f redhat.soc extras/source/palettes/standard.soc
-git commit -q -m 'add Red Hat colors to palette'
extras/source/palettes/standard.soc
# apply patches
%autopatch -p1 -M 99
@@ -1236,7 +1230,7 @@ pushd %{buildroot}%{baseinstdir}/share/autocorr
%make_autocorr_aliases -l en-GB en-AG en-AU en-BS en-BW en-BZ en-CA en-DK en-GH en-HK
en-IE en-IN en-JM en-NG en-NZ en-SG en-TT
%make_autocorr_aliases -l en-US en-PH
-#en-ZA exists and has a good autocorrect file with two or three extras that make sense
for
+#en-ZA exists and has a good autocorrect file with two or three extras that make sense
for
#neighbouring english speaking territories
%make_autocorr_aliases -l en-ZA en-NA en-ZW
%if %{with langpacks}
@@ -1296,7 +1290,7 @@ rm -f %{buildroot}%{baseinstdir}/CREDITS.fodt
%{buildroot}%{baseinstdir}/LICENSE
ln -sr %{buildroot}%{lodatadocdir}/CREDITS.fodt %{buildroot}%{baseinstdir}/CREDITS.fodt
ln -sr %{buildroot}%{lodatadocdir}/LICENSE.html %{buildroot}%{baseinstdir}/LICENSE.html
-#ensure that no sneaky un-prelinkable, un-fpic or non executable shared libs
+#ensure that no sneaky un-prelinkable, un-fpic or non executable shared libs
#have snuck through
pic=0
executable=0
@@ -1481,9 +1475,6 @@ export DESTDIR=%{buildroot}
# org.libreoffice.LibreOffice.appdata.xml:
solenv/bin/assemble-flatpak-appdata.sh \
%{buildroot}%{_datadir}/metainfo/ 0
-# ...then append the original files to the single file:
-solenv/bin/assemble-flatpak-appdata-step2.sh \
- %{buildroot}%{_datadir}/metainfo/ %{buildroot}%{_datadir}/metainfo/
rm %{buildroot}%{_datadir}/metainfo/libreoffice-*.appdata.xml
%endif
@@ -2266,6 +2257,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor
&>/dev/null || :
- Disable unreliable test under s390x
- Try verbose make if first build attempt fails
+* Sun Aug 13 2023 Mattia Verga <mattia.verga(a)proton.me> - 1:7.6.0.3-1
+- 7.6.0.3
+
* Wed Aug 02 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1:7.5.5.2-2
- Poppler rebuild.
commit 25124fd9249f720d11b4a25cc1af11eafb0b588c
Author: Gwyn Ciesla <gwync(a)protonmail.com>
Date: Fri Aug 18 13:12:58 2023 -0500
Sources
diff --git a/.gitignore b/.gitignore
index cc82f2a..47a6d53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,9 @@
/libreoffice-help-7.5.5.2.tar.xz.asc
/libreoffice-translations-7.5.5.2.tar.xz
/libreoffice-translations-7.5.5.2.tar.xz.asc
+/libreoffice-7.6.0.3.tar.xz
+/libreoffice-7.6.0.3.tar.xz.asc
+/libreoffice-help-7.6.0.3.tar.xz
+/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
diff --git a/sources b/sources
index 656f314..b178851 100644
--- a/sources
+++ b/sources
@@ -1,9 +1,9 @@
-SHA512 (libreoffice-7.5.5.2.tar.xz) =
22b905507c3c5e97eb41673fdd21254f254992bfd5f6abf95b49603372027bbb2e329ec43a52ac56d42116fb1821b5c87e53e96105fe194df0ccbfabc7104358
-SHA512 (libreoffice-7.5.5.2.tar.xz.asc) =
7338e2f0705199af066dc622ab43542c255c369e45cffae66c2c8afbf7881ac1751357f5ba3bd1cb6406e9e1dbb80bda6e86a43ecc1438bbaa6187127d49238b
-SHA512 (libreoffice-help-7.5.5.2.tar.xz) =
1747bd1c4df7341074d4e805b8fa4165d1f311d7113b7f73b94449496a8c37c0cd02c4bf1faa5187a14ea43fc531028347cca2dd0a3db9e8a9b9abe72fe7f07f
-SHA512 (libreoffice-help-7.5.5.2.tar.xz.asc) =
1cab32c7cf9e30b80bdcf04299203966fd72aaaa8ca50656c9464fe34d6a537f70874fcb1a77deb29ce5ac7dd83209c17a7f6acb10870a2ed66328109fa01530
-SHA512 (libreoffice-translations-7.5.5.2.tar.xz) =
95dc83728e1350cde72a770ab29b9b001f7318620df9147b947cad598dfe075d934ee9dea1263c3fe5339b465f588e22c4af6335ce5fa8002a141981ec969213
-SHA512 (libreoffice-translations-7.5.5.2.tar.xz.asc) =
1cc768c1404bcb266c61610bf1422e6dc2eab32996a2a6ad0192b224f0046c68efe407f96cde24472b1aab39fea74d02a19250e6e1b2c2aa61a6f26f0ada7723
+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 (17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) =
a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a
SHA512 (185d60944ea767075d27247c3162b3bc-unowinreg.dll) =
854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c
SHA512 (a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) =
2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
commit 09350532ee8e0b968cc2a1ed38b132580f19ae31
Author: Gwyn Ciesla <gwync(a)protonmail.com>
Date: Fri Aug 18 11:56:32 2023 -0500
Consolidated changes for 7.6.0.3 testing.
diff --git a/0001-fix-testSignDocument_PEM_PDF.patch
b/0001-fix-testSignDocument_PEM_PDF.patch
deleted file mode 100644
index 32c7395..0000000
--- a/0001-fix-testSignDocument_PEM_PDF.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 599722cf77310429a9b9bd2a348486a08b60de0d Mon Sep 17 00:00:00 2001
-From: Miklos Vajna <vmiklos(a)collabora.com>
-Date: Mon, 13 Mar 2023 20:04:17 +0100
-Subject: svl: fix CppunitTest_desktop_lib's
- DesktopLOKTest::testSignDocument_PEM_PDF
-
-The problem was that this test passed when the entire suite was running,
-but not as an individual test.
-
-Digging deeper, this didn't pass in isolation because the test loads a
-private key into memory (which is not in the NSS DB) and since commit
-5592ee094ca9f09bfcc16537d931518d4e6b2231 (svl: fix
-testSignDocument_PEM_PDF with "dbm:" NSS DB, 2022-04-28) we delete that
-in-memory key as a workaround for the NSS dbm -> sqlite transition.
-
-Fix the problem by not deleting the in-memory private key in the LOK
-case: this makes the test (operating in a stateless mode, with in-memory
-keys) pass again and keeps the desktop signing (working with the NSS DB)
-working.
-
-I noticed this test failure as a local test update of libxmlsec to 1.3
-RC started to fail here even when the whole suite was running, but looks
-like this was working by accident before anyway, and the fix doesn't
-hurt for libxmlsec 1.2, either.
-
-Change-Id: Id365ddc5c5d04d538609f444c0e3c4ab4b32a6fd
-Reviewed-on:
https://gerrit.libreoffice.org/c/core/+/148817
-Tested-by: Jenkins
-Reviewed-by: Miklos Vajna <vmiklos(a)collabora.com>
----
- svl/source/crypto/cryptosign.cxx | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/svl/source/crypto/cryptosign.cxx b/svl/source/crypto/cryptosign.cxx
-index 1d6337845569..e68ccb8aafda 100644
---- a/svl/source/crypto/cryptosign.cxx
-+++ b/svl/source/crypto/cryptosign.cxx
-@@ -26,6 +26,7 @@
- #include <comphelper/processfactory.hxx>
- #include <comphelper/random.hxx>
- #include <comphelper/scopeguard.hxx>
-+#include <comphelper/lok.hxx>
- #include <com/sun/star/security/XCertificate.hpp>
- #include <com/sun/star/uno/Sequence.hxx>
- #include <o3tl/char16_t2wchar_t.hxx>
-@@ -640,7 +641,11 @@ NSSCMSMessage *CreateCMSMessage(const PRTime* time,
- // if it works, and fallback if it doesn't.
- if (SECKEYPrivateKey * pPrivateKey = PK11_FindKeyByAnyCert(cert, nullptr))
- {
-- SECKEY_DestroyPrivateKey(pPrivateKey);
-+ if (!comphelper::LibreOfficeKit::isActive())
-+ {
-+ // pPrivateKey only exists in the memory in the LOK case, don't delete
it.
-+ SECKEY_DestroyPrivateKey(pPrivateKey);
-+ }
- *cms_signer = NSS_CMSSignerInfo_Create(result, cert, SEC_OID_SHA256);
- }
- else
---
-cgit v1.2.1
-
diff --git a/0001-include-filename-if-the-test-fails.patch
b/0001-include-filename-if-the-test-fails.patch
deleted file mode 100644
index 2f58fe0..0000000
--- a/0001-include-filename-if-the-test-fails.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From d362de6dee0949704c917d65d06d2bf1bc0892c1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm(a)redhat.com>
-Date: Thu, 26 Jan 2023 09:59:47 +0000
-Subject: [PATCH] include filename if the test fails
-
-which it does for me with fedora 38 s390x
-
-Change-Id: I32ad30061717287e785a395afc893db1a5764bcd
----
- sw/qa/core/macros-test.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx
-index 72ed9b5a9612..a8c76bef1883 100644
---- a/sw/qa/core/macros-test.cxx
-+++ b/sw/qa/core/macros-test.cxx
-@@ -142,7 +142,7 @@ void SwMacrosTest::testVba()
-
- uno::Any aRet = executeMacro(testInfo[i].sMacroUrl);
- OUString aStringRes;
-- CPPUNIT_ASSERT(aRet >>= aStringRes);
-+ CPPUNIT_ASSERT_MESSAGE(sFileName.toUtf8().getStr(), aRet >>= aStringRes);
- CPPUNIT_ASSERT_EQUAL(OUString("OK"), aStringRes);
- }
- }
---
-2.39.1
-
diff --git a/0002-Fix-heap-use-after-free.patch b/0002-Fix-heap-use-after-free.patch
new file mode 100644
index 0000000..d79a629
--- /dev/null
+++ b/0002-Fix-heap-use-after-free.patch
@@ -0,0 +1,50 @@
+From 694bacca057c9f1d93ab27d61199aec9d060b868 Mon Sep 17 00:00:00 2001
+From: Tibor Nagy <nagy.tibor2(a)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(a)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
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 83a5822..0428099 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -1,5 +1,5 @@
# download path contains version without the last (fourth) digit
-%global libo_version 7.5.5
+%global libo_version 7.6.0
# 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}.2
-Release: 3%{?libo_prerelease}%{?dist}
+Version: %{libo_version}.3
+Release: 2%{?libo_prerelease}%{?dist}
# default new files are: MPLv2
# older files are typically: MPLv2 incorporating work under ASLv2
# nlpsolver is: LGPLv3
@@ -126,6 +126,7 @@ BuildRequires: patch
BuildRequires: perl(Digest::MD5)
BuildRequires: perl(FindBin)
BuildRequires: perl(base)
+BuildRequires: perl(lib)
%if 0%{?fedora}
BuildRequires: glibc-all-langpacks
BuildRequires: libappstream-glib
@@ -223,10 +224,11 @@ BuildRequires: pkgconfig(harfbuzz)
BuildRequires: pkgconfig(libeot)
BuildRequires: pkgconfig(libepubgen-0.1)
BuildRequires: pkgconfig(libqxp-0.0)
-BuildRequires: pkgconfig(liborcus-0.17)
-BuildRequires: pkgconfig(mdds-2.0)
+BuildRequires: pkgconfig(liborcus-0.18)
+BuildRequires: pkgconfig(mdds-2.1)
BuildRequires: pkgconfig(zxing)
BuildRequires: libnumbertext-devel
+BuildRequires: frozen-static
%ifarch %{java_arches}
# java stuff
@@ -243,6 +245,7 @@ BuildRequires: google-carlito-fonts
BuildRequires: google-rubik-fonts
# Amiri used in vcl/qa/cppunit tests
BuildRequires: amiri-fonts
+BuildRequires: amiri-quran-fonts
BuildRequires: liberation-mono-fonts
BuildRequires: liberation-narrow-fonts
BuildRequires: liberation-sans-fonts
@@ -269,11 +272,10 @@ Patch3:
0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch
Patch4: 0001-default-to-sifr-for-gnome-light-mode.patch
# TODO investigate these
Patch5: 0001-aarch64-failing-here.patch
-Patch6: 0001-include-filename-if-the-test-fails.patch
# backported
-Patch7: 0001-fix-testSignDocument_PEM_PDF.patch
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
# not upstreamed
Patch500: 0001-disable-libe-book-support.patch
@@ -997,6 +999,11 @@ gpgv2 --keyring ./keyring.gpg %{SOURCE5} %{SOURCE4}
%setup -q -n %{name}-%{version}%{?libo_prerelease} -b 2 -b 4
rm -rf git-hooks */git-hooks
+# This is normally done by %%autosetup -S git_am,
+# but that does not work with multiple -b options, so we use plain %%setup above
+%global __scm git_am
+%__scm_setup_git_am -q
+
#Customize Palette to add Red Hat colours
(head -n -1 extras/source/palettes/standard.soc && \
echo -e ' <draw:color draw:name="Red Hat 1"
draw:color="#cc0000"/>
@@ -1006,6 +1013,7 @@ rm -rf git-hooks */git-hooks
<draw:color draw:name="Red Hat 5" draw:color="#4e376b"/>'
&& \
tail -n 1 extras/source/palettes/standard.soc) > redhat.soc
mv -f redhat.soc extras/source/palettes/standard.soc
+git commit -q -m 'add Red Hat colors to palette'
extras/source/palettes/standard.soc
# apply patches
%autopatch -p1 -M 99
@@ -1013,14 +1021,25 @@ mv -f redhat.soc extras/source/palettes/standard.soc
%patch500 -p1
%endif
-# Temporarily disable failig tests
-sed -i -e /CppunitTest_sc_array_functions_test/d sc/Module_sc.mk # ppc64le
-sed -i -e /CppunitTest_sc_addin_functions_test/d sc/Module_sc.mk # aarch64/ppc64*/s390x
-sed -i -e /CppunitTest_sc_financial_functions_test/d sc/Module_sc.mk # ppc64*
-sed -i -e /CppunitTest_sc_statistical_functions_test/d sc/Module_sc.mk # aarch64/ppc64*
-sed -i -e /CppunitTest_dbaccess_hsqldb_test/d dbaccess/Module_dbaccess.mk # ppc64le
-sed -i -e s/CppunitTest_dbaccess_RowSetClones// dbaccess/Module_dbaccess.mk # ppc64le
-sed -i -e s/CppunitTest_sw_macros_test// sw/Module_sw.mk # s390x
+# Temporarily disable failing tests
+%ifarch ppc64le
+sed -i -e /CppunitTest_sc_array_functions_test/d sc/Module_sc.mk
+sed -i -e /CppunitTest_sc_addin_functions_test/d sc/Module_sc.mk
+sed -i -e /CppunitTest_sc_financial_functions_test/d sc/Module_sc.mk
+sed -i -e /CppunitTest_sc_statistical_functions_test/d sc/Module_sc.mk
+sed -i -e /CppunitTest_dbaccess_hsqldb_test/d dbaccess/Module_dbaccess.mk
+sed -i -e s/CppunitTest_dbaccess_RowSetClones// dbaccess/Module_dbaccess.mk
+%endif
+%ifarch aarch64
+sed -i -e /CppunitTest_sc_addin_functions_test/d sc/Module_sc.mk
+sed -i -e /CppunitTest_sc_statistical_functions_test/d sc/Module_sc.mk
+%endif
+%ifarch s390x
+sed -i -e /CppunitTest_sc_addin_functions_test/d sc/Module_sc.mk
+sed -i -e s/CppunitTest_sw_macros_test// sw/Module_sw.mk
+#
https://bugs.documentfoundation.org/show_bug.cgi?id=125978
+sed -i -e s/CustomTarget_uno_test// testtools/Module_testtools.mk
+%endif
#see rhbz#2072615
rm -f vcl/qa/cppunit/graphicfilter/data/tiff/fail/CVE-2017-9936-1.tiff
@@ -1113,12 +1132,9 @@ touch autogen.lastrun
%{?archoptions} \
%{?flatpakoptions}
-if ! make verbose=true build; then
- echo "build attempt 1 failed"
- if ! make verbose=true build; then
- echo "build attempt 2 failed"
- make verbose=true GMAKE_OPTIONS=-rj1 build
- fi
+if ! %make_build; then
+ echo "build attempt 1 failed"
+ make verbose=true build
fi
#generate the icons and mime type stuff
@@ -1465,6 +1481,9 @@ export DESTDIR=%{buildroot}
# org.libreoffice.LibreOffice.appdata.xml:
solenv/bin/assemble-flatpak-appdata.sh \
%{buildroot}%{_datadir}/metainfo/ 0
+# ...then append the original files to the single file:
+solenv/bin/assemble-flatpak-appdata-step2.sh \
+ %{buildroot}%{_datadir}/metainfo/ %{buildroot}%{_datadir}/metainfo/
rm %{buildroot}%{_datadir}/metainfo/libreoffice-*.appdata.xml
%endif
@@ -1529,7 +1548,7 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
%{baseinstdir}/program/libdeployment.so
%{baseinstdir}/program/libdeploymentgui.so
%{baseinstdir}/program/libdlgprovlo.so
-%{baseinstdir}/program/libexpwraplo.so
+#%%{baseinstdir}/program/libexpwraplo.so
%{baseinstdir}/program/libfps_officelo.so
%{baseinstdir}/program/gdbtrace
%{baseinstdir}/program/gengal
@@ -1561,6 +1580,7 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
%{baseinstdir}/program/libdesktop_detectorlo.so
%{baseinstdir}/program/libdict_ja.so
%{baseinstdir}/program/libdict_zh.so
+%{baseinstdir}/program/libdocmodello.so
%{baseinstdir}/program/libdrawinglayerlo.so
%{baseinstdir}/program/libdrawinglayercorelo.so
%{baseinstdir}/program/libeditenglo.so
@@ -2002,7 +2022,7 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
%{baseinstdir}/program/impress.abignore
%endif
%{baseinstdir}/program/libPresentationMinimizerlo.so
-%{baseinstdir}/program/libPresenterScreenlo.so
+#%%{baseinstdir}/program/libPresenterScreenlo.so
%{baseinstdir}/program/libwpftimpresslo.so
%dir %{baseinstdir}/share/config/soffice.cfg/simpress
%{baseinstdir}/share/config/soffice.cfg/simpress/effects.xml
@@ -2242,8 +2262,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor
&>/dev/null || :
%{_includedir}/LibreOfficeKit
%changelog
-* Sun Aug 06 2023 Mattia Verga <mattia.verga(a)proton.me> - 1:7.5.5.2-3
-- Do not setup sources as git repo during build.
+* Tue Aug 15 2023 Mattia Verga <mattia.verga(a)proton.me> - 1:7.6.0.3-2
+- Disable unreliable test under s390x
+- Try verbose make if first build attempt fails
* Wed Aug 02 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1:7.5.5.2-2
- Poppler rebuild.
commit d86b3c49e1dba9d364c8836f48267cf57bad3dbe
Author: Gwyn Ciesla <gwync(a)protonmail.com>
Date: Tue Aug 15 12:22:49 2023 -0500
Fix typo
diff --git a/libreoffice.spec b/libreoffice.spec
index 0a3ad02..83a5822 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -85,7 +85,7 @@ Source8: libreoffice-multiliblauncher.sh
Source9: %{external_url}/dtoa-20180411.tgz
Source10: %{external_url}/dragonbox-1.1.3.tar.gz
Source11: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-#Unfortunately later versions of hsqldb changed the file format, so if we use a later
version we loose
+#Unfortunately later versions of hsqldb changed the file format, so if we use a later
version we lose
#backwards compatability.
Source12: %{external_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
Source13:
%{external_url}/../extern/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf