summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCoprDistGit <infra@openeuler.org>2023-09-14 12:05:48 +0000
committerCoprDistGit <infra@openeuler.org>2023-09-14 12:05:48 +0000
commite0299ea396217ce8c8f8d9323082b043d8e5c34c (patch)
tree3feb05634ad74b065f0834cd056710cc0a6bf8a6
parent4ab624f61ef4b8865f856ea28588ed73da3a14da (diff)
automatic import of libreoffice
-rw-r--r--.gitignore10
-rw-r--r--0001-Adapt-test-code-to-cURL-8.2.0.patch83
-rw-r--r--0001-Only-pass-I.-arguments-to-g-ir-scanner-by-using-pkg-.patch36
-rw-r--r--0001-Use-sifr-and-sifr_dark-for-gnome.patch178
-rw-r--r--0001-default-to-sifr-for-gnome-light-mode.patch58
-rw-r--r--0001-fix-testSignDocument_PEM_PDF.patch61
-rw-r--r--0001-rhbz-2171265-Filter-out-all-non-.rdb-files.patch43
-rw-r--r--0001-rhbz-2171265-Report-fatal-InitApplicationServiceMana.patch49
-rw-r--r--libreoffice-7.5.2.2.tar.xz.asc16
-rw-r--r--libreoffice-7.5.5.2.tar.xz.asc16
-rw-r--r--libreoffice-help-7.5.2.2.tar.xz.asc16
-rw-r--r--libreoffice-help-7.5.5.2.tar.xz.asc16
-rw-r--r--libreoffice-translations-7.5.2.2.tar.xz.asc16
-rw-r--r--libreoffice-translations-7.5.5.2.tar.xz.asc16
-rw-r--r--libreoffice.spec38
-rw-r--r--sources20
16 files changed, 365 insertions, 307 deletions
diff --git a/.gitignore b/.gitignore
index 8aa4e07..b89454b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,13 @@
/libreoffice-translations-7.5.5.2.tar.xz
/libreoffice-translations-7.5.5.2.tar.xz.00
/libreoffice-translations-7.5.5.2.tar.xz.01
+/libreoffice-7.5.2.2.tar.xz
+/libreoffice-7.5.2.2.tar.xz.00
+/libreoffice-7.5.2.2.tar.xz.01
+/libreoffice-7.5.2.2.tar.xz.02
+/libreoffice-help-7.5.2.2.tar.xz
+/libreoffice-help-7.5.2.2.tar.xz.00
+/libreoffice-help-7.5.2.2.tar.xz.01
+/libreoffice-translations-7.5.2.2.tar.xz
+/libreoffice-translations-7.5.2.2.tar.xz.00
+/libreoffice-translations-7.5.2.2.tar.xz.01
diff --git a/0001-Adapt-test-code-to-cURL-8.2.0.patch b/0001-Adapt-test-code-to-cURL-8.2.0.patch
deleted file mode 100644
index bfe94fc..0000000
--- a/0001-Adapt-test-code-to-cURL-8.2.0.patch
+++ /dev/null
@@ -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
-
diff --git a/0001-Only-pass-I.-arguments-to-g-ir-scanner-by-using-pkg-.patch b/0001-Only-pass-I.-arguments-to-g-ir-scanner-by-using-pkg-.patch
deleted file mode 100644
index 917dd6a..0000000
--- a/0001-Only-pass-I.-arguments-to-g-ir-scanner-by-using-pkg-.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From caddaaa6afd2709f72dfb6160a485d405ac03966 Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Tue, 11 Jul 2023 20:21:15 +0200
-Subject: [PATCH] Only pass -I... arguments to g-ir-scanner by using
- pkg-config's --cflags-only-I
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Otherwise it is possible that e.g. -Wl,--export-dynamic is passed which is fatal.
-
-Change-Id: I1735641e3149c86456e1164b67509a719e09d446
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154340
-Reviewed-by: René Engelhard <rene@debian.org>
-Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com>
-Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
----
- sysui/CustomTarget_share.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk
-index b86521a3a80f..912048b2ad66 100644
---- a/sysui/CustomTarget_share.mk
-+++ b/sysui/CustomTarget_share.mk
-@@ -167,7 +167,7 @@ $(share_WORKDIR)/%/LOKDocView-0.1.gir: \
- mkdir -p $(dir $@)
- PYTHONWARNINGS=default g-ir-scanner "${SRCDIR}/include/LibreOfficeKit/LibreOfficeKitGtk.h" \
- "${SRCDIR}/libreofficekit/source/gtk/lokdocview.cxx" \
-- `${PKG_CONFIG} --cflags gobject-introspection-1.0 gtk+-3.0` \
-+ `${PKG_CONFIG} --cflags-only-I gobject-introspection-1.0 gtk+-3.0` \
- -I"${SRCDIR}/include/" \
- --include=GLib-2.0 --include=GObject-2.0 --include=Gio-2.0 \
- --library=libreofficekitgtk --library-path="${INSTDIR}/program" \
---
-2.41.0
-
diff --git a/0001-Use-sifr-and-sifr_dark-for-gnome.patch b/0001-Use-sifr-and-sifr_dark-for-gnome.patch
new file mode 100644
index 0000000..1ad8bbb
--- /dev/null
+++ b/0001-Use-sifr-and-sifr_dark-for-gnome.patch
@@ -0,0 +1,178 @@
+From e1464f8601289630d3fd4aed2f4163c07163a52d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Fri, 10 Mar 2023 11:41:45 +0000
+Subject: [PATCH] Use sifr and sifr_dark for gnome
+
+explicitly use:
+ breeze/breeze_dark for plasma
+ sukapura/sukapura_dark for macOS
+ colibre/colibre_dark for win
+
+originally we only had one dark theme so in a dark theme there was only
+one option available, but there's now a bunch to choose from.
+
+https://pagure.io/fedora-workstation/issue/361
+
+"Fedora Workstation currently uses the rather outdated-looking
+Elementary icon theme for LibreOffice, instead of the Sifr icon theme
+which was designed to fit in with GNOME's icons. The Sifr theme saw a
+nice update with LibreOffice 7.5, the version being shipped in Fedora
+Linux 38, which makes the icons fit better with the current GNOME design
+language.
+
+Also, in Fedora Workstation 38, if you change GNOME to dark mode,
+LibreOffice's icons change from the colourful Elementary icon set to the
+monochrome Breeze Dark set, which is a jarring change. The Sifr icons
+have both a light and dark theme, so it would be much more conistent to
+use them. It's also worth noting that the Breeze icons were designed for
+KDE Plasma, not GNOME, so they look even more out of place than the
+Elementary icons."
+
+Change-Id: Ic37bbe8e7ad754ab070ead06dc0b006c6ccf3adb
+---
+ vcl/inc/IconThemeSelector.hxx | 8 ++--
+ vcl/qa/cppunit/app/test_IconThemeSelector.cxx | 6 +--
+ vcl/source/app/IconThemeSelector.cxx | 42 +++++++++++++------
+ 3 files changed, 36 insertions(+), 20 deletions(-)
+
+diff --git a/vcl/inc/IconThemeSelector.hxx b/vcl/inc/IconThemeSelector.hxx
+index 8dab03d3a8d2..0bfbf2034858 100644
+--- a/vcl/inc/IconThemeSelector.hxx
++++ b/vcl/inc/IconThemeSelector.hxx
+@@ -77,12 +77,12 @@ private:
+ static OUString
+ ReturnFallback(const std::vector<IconThemeInfo>& installedThemes);
+
+- /** The name of the icon theme which is used as fallback */
+- static constexpr OUStringLiteral FALLBACK_ICON_THEME_ID = u"colibre";
+-
++ /** The name of the icon themes which are used as fallbacks */
++ static constexpr OUStringLiteral FALLBACK_LIGHT_ICON_THEME_ID = u"colibre";
++ static constexpr OUStringLiteral FALLBACK_DARK_ICON_THEME_ID = u"colibre_dark";
+
+ static OUString
+- GetIconThemeForDesktopEnvironment(const OUString& desktopEnvironment);
++ GetIconThemeForDesktopEnvironment(const OUString& desktopEnvironment, bool bPreferDarkIconTheme);
+
+ OUString mPreferredIconTheme;
+ bool mUseHighContrastTheme;
+diff --git a/vcl/qa/cppunit/app/test_IconThemeSelector.cxx b/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
+index 94d53b43d309..8d1aea0c3889 100644
+--- a/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
++++ b/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
+@@ -85,7 +85,7 @@ IconThemeSelectorTest::ElementaryIsReturnedForGnomeDesktop()
+ std::vector<vcl::IconThemeInfo> themes = GetFakeInstalledThemes();
+ vcl::IconThemeSelector s;
+ OUString r = s.SelectIconThemeForDesktopEnvironment(themes, "gnome");
+- CPPUNIT_ASSERT_EQUAL_MESSAGE("'elementary' theme is returned for gnome desktop", OUString("elementary"), r);
++ CPPUNIT_ASSERT_EQUAL_MESSAGE("'sifr' theme is returned for gnome desktop", OUString("sifr"), r);
+ }
+
+ void
+@@ -96,7 +96,7 @@ IconThemeSelectorTest::ThemeIsOverriddenByPreferredTheme()
+ s.SetPreferredIconTheme(preferred, false);
+ std::vector<vcl::IconThemeInfo> themes = GetFakeInstalledThemes();
+ OUString selected = s.SelectIconThemeForDesktopEnvironment(themes, "gnome");
+- CPPUNIT_ASSERT_EQUAL_MESSAGE("'elementary' theme is overridden by breeze", preferred, selected);
++ CPPUNIT_ASSERT_EQUAL_MESSAGE("'sifr' theme is overridden by breeze", preferred, selected);
+ }
+
+ void
+@@ -148,7 +148,7 @@ IconThemeSelectorTest::FallbackThemeIsReturnedForEmptyInput()
+ vcl::IconThemeSelector s;
+ OUString selected = s.SelectIconTheme(std::vector<vcl::IconThemeInfo>(), "colibre");
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("fallback is returned for empty input",
+- OUString(vcl::IconThemeSelector::FALLBACK_ICON_THEME_ID), selected);
++ OUString(vcl::IconThemeSelector::FALLBACK_LIGHT_ICON_THEME_ID), selected);
+ }
+
+ void
+diff --git a/vcl/source/app/IconThemeSelector.cxx b/vcl/source/app/IconThemeSelector.cxx
+index fd32008d9414..ee30e577f3f5 100644
+--- a/vcl/source/app/IconThemeSelector.cxx
++++ b/vcl/source/app/IconThemeSelector.cxx
+@@ -51,30 +51,50 @@ IconThemeSelector::IconThemeSelector()
+ }
+
+ /*static*/ OUString
+-IconThemeSelector::GetIconThemeForDesktopEnvironment(const OUString& desktopEnvironment)
++IconThemeSelector::GetIconThemeForDesktopEnvironment(const OUString& desktopEnvironment, bool bPreferDarkIconTheme)
+ {
+ if (comphelper::LibreOfficeKit::isActive())
+- return "colibre";
++ {
++ if (!bPreferDarkIconTheme)
++ return "colibre";
++ else
++ return "colibre_dark";
++ }
+
+ #ifdef _WIN32
+ (void)desktopEnvironment;
+- return "colibre";
++ if (!bPreferDarkIconTheme)
++ return "colibre";
++ else
++ return "colibre_dark";
+ #else
+ OUString r;
+ if ( desktopEnvironment.equalsIgnoreAsciiCase("plasma5") ||
+ desktopEnvironment.equalsIgnoreAsciiCase("lxqt") ) {
+- r = "breeze";
++ if (!bPreferDarkIconTheme)
++ r = "breeze";
++ else
++ r = "breeze_dark";
+ }
+ else if ( desktopEnvironment.equalsIgnoreAsciiCase("macosx") ) {
+- r = "sukapura";
++ if (!bPreferDarkIconTheme)
++ r = "sukapura";
++ else
++ r = "sukapura_dark";
+ }
+ else if ( desktopEnvironment.equalsIgnoreAsciiCase("gnome") ||
+ desktopEnvironment.equalsIgnoreAsciiCase("mate") ||
+ desktopEnvironment.equalsIgnoreAsciiCase("unity") ) {
+- r = "elementary";
++ if (!bPreferDarkIconTheme)
++ r = "sifr";
++ else
++ r = "sifr_dark";
+ } else
+ {
+- r = FALLBACK_ICON_THEME_ID;
++ if (!bPreferDarkIconTheme)
++ r = FALLBACK_LIGHT_ICON_THEME_ID;
++ else
++ r = FALLBACK_DARK_ICON_THEME_ID;
+ }
+ return r;
+ #endif // _WIN32
+@@ -89,13 +109,9 @@ IconThemeSelector::SelectIconThemeForDesktopEnvironment(
+ if (icon_theme_is_in_installed_themes(mPreferredIconTheme, installedThemes)) {
+ return mPreferredIconTheme;
+ }
+- //if a dark variant is preferred, and we didn't have an exact match, then try our one and only dark theme
+- if (mPreferDarkIconTheme && icon_theme_is_in_installed_themes("breeze_dark", installedThemes)) {
+- return "breeze_dark";
+- }
+ }
+
+- OUString themeForDesktop = GetIconThemeForDesktopEnvironment(desktopEnvironment);
++ OUString themeForDesktop = GetIconThemeForDesktopEnvironment(desktopEnvironment, mPreferDarkIconTheme);
+ if (icon_theme_is_in_installed_themes(themeForDesktop, installedThemes)) {
+ return themeForDesktop;
+ }
+@@ -177,7 +193,7 @@ IconThemeSelector::ReturnFallback(const std::vector<IconThemeInfo>& installedThe
+ return installedThemes.front().GetThemeId();
+ }
+ else {
+- return FALLBACK_ICON_THEME_ID;
++ return FALLBACK_LIGHT_ICON_THEME_ID;
+ }
+ }
+
+--
+2.39.2
+
diff --git a/0001-default-to-sifr-for-gnome-light-mode.patch b/0001-default-to-sifr-for-gnome-light-mode.patch
deleted file mode 100644
index 01617ff..0000000
--- a/0001-default-to-sifr-for-gnome-light-mode.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From ffceb48dd576ababe346c9548b12ca18f31d3293 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
-Date: Fri, 10 Mar 2023 11:41:45 +0000
-Subject: [PATCH] default to sifr for gnome light mode
-
-https://pagure.io/fedora-workstation/issue/361
-
-"Fedora Workstation currently uses the rather outdated-looking
-Elementary icon theme for LibreOffice, instead of the Sifr icon theme
-which was designed to fit in with GNOME's icons. The Sifr theme saw a
-nice update with LibreOffice 7.5, the version being shipped in Fedora
-Linux 38, which makes the icons fit better with the current GNOME design
-language."
-
-Change-Id: Ic37bbe8e7ad754ab070ead06dc0b006c6ccf3adb
----
- vcl/qa/cppunit/app/test_IconThemeSelector.cxx | 4 ++--
- vcl/source/app/IconThemeSelector.cxx | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/vcl/qa/cppunit/app/test_IconThemeSelector.cxx b/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
-index 72ee344b1437..8d1aea0c3889 100644
---- a/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
-+++ b/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
-@@ -85,7 +85,7 @@ IconThemeSelectorTest::ElementaryIsReturnedForGnomeDesktop()
- std::vector<vcl::IconThemeInfo> themes = GetFakeInstalledThemes();
- vcl::IconThemeSelector s;
- OUString r = s.SelectIconThemeForDesktopEnvironment(themes, "gnome");
-- CPPUNIT_ASSERT_EQUAL_MESSAGE("'elementary' theme is returned for gnome desktop", OUString("elementary"), r);
-+ CPPUNIT_ASSERT_EQUAL_MESSAGE("'sifr' theme is returned for gnome desktop", OUString("sifr"), r);
- }
-
- void
-@@ -96,7 +96,7 @@ IconThemeSelectorTest::ThemeIsOverriddenByPreferredTheme()
- s.SetPreferredIconTheme(preferred, false);
- std::vector<vcl::IconThemeInfo> themes = GetFakeInstalledThemes();
- OUString selected = s.SelectIconThemeForDesktopEnvironment(themes, "gnome");
-- CPPUNIT_ASSERT_EQUAL_MESSAGE("'elementary' theme is overridden by breeze", preferred, selected);
-+ CPPUNIT_ASSERT_EQUAL_MESSAGE("'sifr' theme is overridden by breeze", preferred, selected);
- }
-
- void
-diff --git a/vcl/source/app/IconThemeSelector.cxx b/vcl/source/app/IconThemeSelector.cxx
-index 6b8dfc0f42c7..ee30e577f3f5 100644
---- a/vcl/source/app/IconThemeSelector.cxx
-+++ b/vcl/source/app/IconThemeSelector.cxx
-@@ -86,7 +86,7 @@ IconThemeSelector::GetIconThemeForDesktopEnvironment(const OUString& desktopEnvi
- desktopEnvironment.equalsIgnoreAsciiCase("mate") ||
- desktopEnvironment.equalsIgnoreAsciiCase("unity") ) {
- if (!bPreferDarkIconTheme)
-- r = "elementary";
-+ r = "sifr";
- else
- r = "sifr_dark";
- } else
---
-2.40.1
-
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@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@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-rhbz-2171265-Filter-out-all-non-.rdb-files.patch b/0001-rhbz-2171265-Filter-out-all-non-.rdb-files.patch
new file mode 100644
index 0000000..1f96f54
--- /dev/null
+++ b/0001-rhbz-2171265-Filter-out-all-non-.rdb-files.patch
@@ -0,0 +1,43 @@
+From feb8b04a0ee86b0146a17393da220ae188babda8 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman@redhat.com>
+Date: Wed, 22 Mar 2023 17:19:49 +0100
+Subject: [PATCH] rhbz#2171265 Filter out all non *.rdb files
+
+In that rhbz issue ("Libreoffice cannot start"), it looks like some junk file
+named /usr/lib64/libreoffice/program/services/services.rdb;63ddcd86 caused
+soffice.bin to crash early, without any information (cf.
+a1faf14f74a62ea76141115538d7d30d90c9eeb6 "rhbz#2171265 Report fatal
+InitApplicationServiceManager failures more reliably"). So, following up on
+b8c7548527f5fc14fe8fcbe74a749c7e3c10d385 "ignore backup files in services/
+directory to avoid debugging grief", extend the set of ignored files to anything
+starting with "." or not ending in ".rdb" (in any case).
+
+Change-Id: I154750465d2128b3ff6493f4ab606072dda61503
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149328
+Tested-by: Jenkins
+Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
+---
+ cppuhelper/source/paths.cxx | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/cppuhelper/source/paths.cxx b/cppuhelper/source/paths.cxx
+index ece7650ded4c..dd8fe56df2bf 100644
+--- a/cppuhelper/source/paths.cxx
++++ b/cppuhelper/source/paths.cxx
+@@ -99,9 +99,11 @@ bool cppu::nextDirectoryItem(osl::Directory & directory, OUString * url) {
+ "Cannot stat in directory");
+ }
+ if (stat.getFileType() != osl::FileStatus::Directory) { //TODO: symlinks
+- // Ignore backup files:
++ // Ignore backup and spurious junk files:
+ OUString name(stat.getFileName());
+- if (!(name.match(".") || name.endsWith("~"))) {
++ if (name.match(".") || !name.endsWithIgnoreAsciiCase(u".rdb")) {
++ SAL_WARN("cppuhelper", "ignoring <" << stat.getFileURL() << ">");
++ } else {
+ *url = stat.getFileURL();
+ return true;
+ }
+--
+2.40.0
+
diff --git a/0001-rhbz-2171265-Report-fatal-InitApplicationServiceMana.patch b/0001-rhbz-2171265-Report-fatal-InitApplicationServiceMana.patch
new file mode 100644
index 0000000..b5360d7
--- /dev/null
+++ b/0001-rhbz-2171265-Report-fatal-InitApplicationServiceMana.patch
@@ -0,0 +1,49 @@
+From a1faf14f74a62ea76141115538d7d30d90c9eeb6 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman@redhat.com>
+Date: Wed, 22 Mar 2023 14:40:04 +0100
+Subject: [PATCH] rhbz#2171265 Report fatal InitApplicationServiceManager
+ failures more reliably
+
+For example, when initialization of the UNO type manager failed, any code run
+between this SetBootstrapError and the HandleBootstrapErrors in Desktop::Main
+which would need the type manager (e.g., to set a css::uno::Any) would have
+caused a crash, so would have failed to print to std::cerr the sought-after
+css::uno::Exception message. The mis-initialized process would most definitely
+crash sooner or later anyway, so there's no harm in a controlled std::abort()
+here (if that is even reached, and the process doesn't already crash in
+HandleBootstrapErrors, after it has printed the relevant information to
+std::cerr).
+
+Change-Id: Ic5889aedec0908fa4b1e2966eb188508d0f92d26
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149323
+Tested-by: Jenkins
+Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
+---
+ desktop/source/app/app.cxx | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
+index 5a35b5a745c2..f1ec0b679bc0 100644
+--- a/desktop/source/app/app.cxx
++++ b/desktop/source/app/app.cxx
+@@ -28,6 +28,7 @@
+
+ #include <sal/config.h>
+
++#include <cstdlib>
+ #include <iostream>
+ #include <string_view>
+
+@@ -458,7 +459,8 @@ void Desktop::Init()
+ }
+ catch (css::uno::Exception & e)
+ {
+- SetBootstrapError( BE_UNO_SERVICEMANAGER, e.Message );
++ HandleBootstrapErrors( BE_UNO_SERVICEMANAGER, e.Message );
++ std::abort();
+ }
+
+ // Check whether safe mode is enabled
+--
+2.40.0
+
diff --git a/libreoffice-7.5.2.2.tar.xz.asc b/libreoffice-7.5.2.2.tar.xz.asc
new file mode 100644
index 0000000..33f9fd1
--- /dev/null
+++ b/libreoffice-7.5.2.2.tar.xz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmQd2TMACgkQ9DSh76/u
+rqPjVRAAsJHie3YW/qeljpJE+IetZyNWI7HCWihOh4fOJyh1lQ+/kEPNggwj+Hi7
+5Zm6KchGKHouNvqzGr49blXC7Jh16gCtAbcIp6IENcR3cRauXoePPRTXnEwtTGde
+aiDkCscPZCZBsJfwFCRN4Zop2V2B8GdIGBixmh3CPGSLDtzPgdm3w9t0+l3sgXs9
+4IMxTaedPrz4rkXEWxADzoUiE/KwmBkuiTJgQC691Nx4w9HNeAilNh4GRQcw/1Nu
+VApHgpVnuFvHOwvc0JL6/OgUjJ7Yr5EIw+aCY70Z6RmAK4OHML9sTo0xBZOx5zEC
+TvQODa6igyWR3ggNw1K3JJMKG8micoAJutRKNLw+CyUBLtv8FbhawbBpqp8HFMOu
+vZO51wLJWu8ljpGXiSvt+fNU9Ml+9qv+xZJQmHWMcbm7mvgxf6YC/uCsz3v0xcVm
+Ny2OCoNSlfrcW9l5QpugzzVNIi6LMNvUM5v4AgcmhEE71pcoVDQfn6guWafxwUxA
+8pUiX5ct/VhRffsXMy9MAITRqWgkwshPPSOTv/Fvh07y63fS/4Vzc2IvyKEdu5Ph
+2UfnOXVAksGyNiB5gsdlVeY+tQfih1TLms1KhukNjMhzMvSiEdXmbNkQibwT0QX6
+y05RRNJfbVT6+1+vuQFybPO5y+sOpe0PvqST2BGG6mE56beZCBw=
+=9OIk
+-----END PGP SIGNATURE-----
diff --git a/libreoffice-7.5.5.2.tar.xz.asc b/libreoffice-7.5.5.2.tar.xz.asc
deleted file mode 100644
index 384bc19..0000000
--- a/libreoffice-7.5.5.2.tar.xz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmSu5kIACgkQ9DSh76/u
-rqMf7hAAtddSuVUfauzLv/uIysg4382DZxfXkMbEkqhJXzUsKBLPpNQf8AU0NeEg
-fcsZ8PAlGNsCKu5hDA436k4uunXID7AabkFacHn6nhPmDq96v4437FK2MMaNtFpD
-/7nz+PsFjJL5It45hJ0ZoJ0l8oP2Ooyej9zMRCF7PlfPYTNwm8ZqoO+RKOJlHwlH
-ImQLos+1JHHKiZABNAeRGq9UQmREYUB1Z92wqthljd9CwHTX23De9zjN/gmf9f2c
-ZxVQvit/pPtJMOfNdYodcAmCQSo3nUBvN6fk2h8uRUW1gTLbc4TrikGlnhZqt1Sc
-2s4alt6X5p20bcXbtFAaN5JcrXbN2yukVTh2OUIDBSfc1uwn15HdKvxvw1M886eB
-uf9f+UjNcgYih0qwSRT8OEk9bHKBDidk+vNnK72MMhflL55hbDTRKRtKqHJiNLOU
-Ib+qsp3Pqe7Kqik2UclntHf4zBSXuqmd0862T9obnL48S876D+pP35X4I6iezN0w
-c2pciQABdPanMmGKJ7EETBDXrJa14oFzkuXhXLh7kZM6B9e7rOZW4a5XSM9Cho+o
-CzvYGyCo46EzRd/Fha9ne60SSFrBtPJ0UnqLSR0f47giKdoL8an64oGtlEqMk357
-hMXvSqCVXYZRVLbEX28PGxCchxPf7Bjq+j8VUq25mFgqAcMsmW0=
-=dXuq
------END PGP SIGNATURE-----
diff --git a/libreoffice-help-7.5.2.2.tar.xz.asc b/libreoffice-help-7.5.2.2.tar.xz.asc
new file mode 100644
index 0000000..86dca65
--- /dev/null
+++ b/libreoffice-help-7.5.2.2.tar.xz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmQd2TgACgkQ9DSh76/u
+rqO98Q/+K2RiPRItYrFv4sppJ6DdKPKjfUeG+t/eyMSs5ScNpsxmsqjkVreGwJzC
+cKTFPAl9U5ddYFg/LnCGBD7SfthLYpU4PJ51QLuWD7BLVvEFxCf5ShptkmkXO29d
+R/as6+ANTNJNzsJDEmrxUCOMpOWMOZW4CCPbdMFspQrL0sIsYBqnuvjtjAoRMRq1
+tWwQCIW5ejsCXH10OPIphxT64TvbTYIxcf6BtaebTj0622GBdxi8PAbL/gCmnKLI
+HnTDayjaIgV1kokHjTWVyA0+4PfShWPjGPERRCKKIKTWcRrZphjn0eYjvvOhSHO/
+X5uc1yEzP+YEcBTQXNyMLn+cr2kYz30ejtOXMUfz2tBw0DKkueKOuwYCi/BXSehA
+R9tuyfT3glMMNrEyOVXRQRfc6x95tlzBJNTqNUXTW8yrbiRzxiKpFY6HEms4hO53
+K4yAuQEwMg/NKo82RJQ6hXHQ3FWVYAugcLb33EdICz3+y2gibhXBnEH+bYUc4Crv
+Umf6vtYt2RrdmC0p3plSoapOmfwM50F8+Cv2z2AKINmAQMDkNa0mu6IqykGTqdmK
+pE0C7kEPas+3ju3aA/mQaxl8+QhT/TvkZj+Uz1/CVoUUwEhJ6Xv+9hZUOkbFz5Uw
+RVU8SujUR2ovNQAoGTJTba9EVs7Cph9gIP1ydBDv8iYuodDwpmY=
+=zAIU
+-----END PGP SIGNATURE-----
diff --git a/libreoffice-help-7.5.5.2.tar.xz.asc b/libreoffice-help-7.5.5.2.tar.xz.asc
deleted file mode 100644
index 863fed4..0000000
--- a/libreoffice-help-7.5.5.2.tar.xz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmSu5lAACgkQ9DSh76/u
-rqPa0g/7BoGpKgEAL6s8Lf0YEmmotgwPjTyU3iBN46CUiBy0KSGzOosj7KeljodD
-VkjER7HiltchiHLoO1ho5cUS5WLSIbMteeDTVq/5C7tUzH3nyCO2vy5m+3mXGS59
-kDAna20J4orglpxbQi+65ceTQxAyMusVFp1PiQx17pFdIZCeV7aj2k8YGgqsW8r/
-cPMMmLbdMgHqA0LL+OeLnFb8H2pvqG6dNSnsyoYqDxCmscVMuqDGF9oDuIx+TbnN
-RU2IkyC+18De826taUcnaf7I+4Sa6MOsfcgX5Wv8nJjFncssEzo9kgczayspoX09
-zB+aB/v95arVLteyGN2FCjSo56c+DgTuTzixaMW92HgqcZ2FesZp1sB62PqIO1Wj
-nvkmBX8ZIQGLe+1z637g2+mEHXZeBxXw1pW8t7qgt3g/YHImGUAE4aG8YiOvABlF
-+Rgo2hVw4Kp2W9iDQNEPMVDEIPQ/+gPdvBJeZqD979Aqrb3Bl2poIu0R8QQfTHz0
-7lHLsE1wrCUnkv51mT93reyMVpfjFX7gufphpTe3DrTrTHcd0ZxcAIjuHtM3z4uJ
-WqBxHQ/7CfBbWGo2wJW672r0bTkSbd5sJ+d+tgqHprNVC8xIzsjfjkX36qVlnvha
-offRTWqHDAu4TDfJcve+Ni8mZv7wPiwUvGXprRXT0eLtiI8d7Oo=
-=wkyD
------END PGP SIGNATURE-----
diff --git a/libreoffice-translations-7.5.2.2.tar.xz.asc b/libreoffice-translations-7.5.2.2.tar.xz.asc
new file mode 100644
index 0000000..691bd05
--- /dev/null
+++ b/libreoffice-translations-7.5.2.2.tar.xz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmQd2TkACgkQ9DSh76/u
+rqMaOw/+IdxO06syjIjG5GQSEMt5AMmbOkhbuw4slcLT/HUOwceaQ//TF0aosNJ6
+b2+d8yFmLEm+qT05pet7YIpNZTd1EoSpZfN3KtRwZLUE1t4F+n8Ephb9VbTmo7vw
+oxqZmU5a7fKxWKKyTgU//OXOK5HdyKdPnN/pdGdi3MUV3U07C2Ti7urpgWW9q6j8
+SJic6mjhlmC6hmTS8PWr6IiJoVzhtKX78v5qJ7DwaAQVoXs2x+oIO8Q/j8QfS/yX
+AlPT0fz4AOE5WydKFKZbkb/sKteGvyW4xY0cscJeOTYXnSsnydpOpvSrNQTUsN6t
+8176G7Un+xEbDoE/TZZ5Dl+LmNoWUguRwpMO4dahY2FnJuL89Rpu7Q6jrnFWGWYR
+oU+q95nspg60f7wFv4AproCP9GoLIbjizFOmnVOEQJVQkKBtPlQHn82vLboKnpgP
++lb2hqu5VZFKeyQKu5ZFUpf+zO1F8awEnl3Kr91Rp3uXSscKrX3NSpnvScvsnRmL
+8FCW+Yos7Tnw4H7ueKRtYfd6MU32VXNouMjpGkIs52VVcuLWMJUeEB7nJzJqdPEy
+dv0BuLA6UkCCQc6jVEaMeoSCwVqqxyB8SyBtXU/P3Yl0cA3Om3N5PuoZQi/st0yd
+XBUbrv1s/CUwFKlFfSrHDkjep5vfjmTI50I03Lz6NT9EClU4jWU=
+=WQZx
+-----END PGP SIGNATURE-----
diff --git a/libreoffice-translations-7.5.5.2.tar.xz.asc b/libreoffice-translations-7.5.5.2.tar.xz.asc
deleted file mode 100644
index c83766a..0000000
--- a/libreoffice-translations-7.5.5.2.tar.xz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmSu5lEACgkQ9DSh76/u
-rqPY8hAAomedl8ofsiiP8fv+//OQ+90KoWMHkYgVtMRIUtSoqOHYL8mH27eo1yez
-pUx/WMKCMzZwBW/qpF7Iu6YbGMSe30lz1cGg2ktYR4atdmosyRUPNkyUyQZlwHWx
-YTKY+oL0i/fcv2Hmx9oCoqgUtf2XcvMOx4nfOiAHuSNqjQspuWfFHc7Hyj1OBfwQ
-1mDGpYML1C3ZliUYUxl7ozOr4fGP2WuPkbofDGAUwiPLdM5m1RIPl5qVkYuhkiZw
-7gqQn42IWIcADsH3Rl9rXylKWrOOdKinWtQy+p/ZQPZnRF44L1TUA2zTKhx6Ni3f
-Vaa4hy3oV/YXaiTScsxYm6KyUt0nuzdcdaPAY4TzcFzwuhOFQlAGlyQHzcSt2O26
-/0vQjWA+2FnfT6To2DRcWyHc//ykxiAf9+lygBMVghsSEgVcAF6wLpqBb850tni2
-YX/aAfTvOtEHvf7c/mijlIRT9IvVXkoilJYcfZgQugoDc9pC+R0n5l99B3RUOIwp
-PFDF4nUkhFtIw5tvmx016GurFF1v5ITorK/EXGDSG+yTSzWbi8Z/kVQBUKR/jtbZ
-jltztuRkOTrI9K6e2F08qCrSmUppeMSOHE3UT3NzJm7TWFXG9lUCeBtj5tkt8AQI
-0KJTpaPgq+jrEkCHKIO1cHw1oGTByGmqAB1KS52Cic312pGUcAw=
-=c4HH
------END PGP SIGNATURE-----
diff --git a/libreoffice.spec b/libreoffice.spec
index 8eb9881..659f96f 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.5.2
%global vendoroption --with-vendor="%{_vendor}"
%global libo_python python3
@@ -23,8 +23,8 @@
%global bundling_options %{nil}
Summary: Free Software Productivity Suite
-Epoch: 1
Name: libreoffice
+Epoch: 1
Version: %{libo_version}.2
Release: 1
# default new files are: MPLv2
@@ -130,14 +130,12 @@ Patch1: 0001-disble-tip-of-the-day-dialog-by-default.patch
Patch2: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch
# backported
Patch3: 0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch
-Patch4: 0001-default-to-sifr-for-gnome-light-mode.patch
+Patch4: 0001-Use-sifr-and-sifr_dark-for-gnome.patch
+Patch5: 0001-rhbz-2171265-Report-fatal-InitApplicationServiceMana.patch
+Patch6: 0001-rhbz-2171265-Filter-out-all-non-.rdb-files.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
+Patch7: 0001-aarch64-failing-here.patch
+Patch8: 0001-include-filename-if-the-test-fails.patch
# not upstreamed
Patch500: 0001-disable-libe-book-support.patch
@@ -840,6 +838,24 @@ sed -i -e /CppunitTest_sc_statistical_functions_test/d sc/Module_sc.mk # aarch64
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
+# del some tests
+#sed -i -e /CppunitTest_chart2_export2/d chart2/Module_chart2.mk
+#sed -i -e /CppunitTest_chart2_import2/d chart2/Module_chart2.mk
+#sed -i -e /CppunitTest_sdext_pdfimport/d sdext/Module_sdext.mk
+#sed -i -e /CppunitTest_vcl_text/d vcl/Module_vcl.mk
+#sed -i -e /CppunitTest_sd_layout_tests/d sd/Module_sd.mk
+#sed -i -e /CppunitTest_sc_subsequent_export_test2/d sc/Module_sc.mk
+#sed -i -e /CppunitTest_sw_ooxmlexport14/d sw/Module_sw.mk
+#sed -i -e /CppunitTest_sc_subsequent_filters_test2/d sc/Module_sc.mk
+#sed -i -e /CppunitTest_sd_export_tests-ooxml3/d sd/Module_sd.mk
+#sed -i -e /CppunitTest_sc_vba_macro_test/d sc/Module_sc.mk
+#sed -i -e /CppunitTest_sw_globalfilter/d sw/Module_sw.mk
+#sed -i -e /CppunitTest_sc_uicalc/d sc/Module_sc.mk
+#sed -i -e /CppunitTest_sw_ooxmlexport11/d sw/Module_sw.mk
+#sed -i -e /CppunitTest_sw_ooxmlexport12/d sw/Module_sw.mk
+#sed -i -e /CppunitTest_sw_ooxmlexport13/d sw/Module_sw.mk
+#sed -i -e /CppunitTest_sw_ooxmlexport16/d sw/Module_sw.mk
+#
git rm vcl/qa/cppunit/graphicfilter/data/tiff/fail/CVE-2017-9936-1.tiff
@@ -963,7 +979,7 @@ rm -rf $WORKDIR/CxxObject $WORKDIR/GenCxxObject $WORKDIR/HelpTarget $WORKDIR/Lin
export PRODUCTVERSIONSHORT PRODUCTVERSION
# installation
-
+export LC_ALL=C
install -m 0755 -d %{buildroot}%{instdir}
if ! make instsetoo_native PKGFORMAT=installed DISABLE_STRIP=1 EPM=not-used-but-must-be-set; then
echo - ---dump log start---
@@ -1984,5 +2000,5 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
%{_includedir}/LibreOfficeKit
%changelog
-* Wed Sep 06 2023 Darssin <2020303249@mail.nwpu.edu.cn> - 1:7.5.5.2-1
+* Wed Sep 06 2023 Darssin <2020303249@mail.nwpu.edu.cn> - 1:7.5.2.2-1
- Package init
diff --git a/sources b/sources
index 1eafbc6..a816a9c 100644
--- a/sources
+++ b/sources
@@ -4,13 +4,13 @@ a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.
889dc00db9612c6949a4ccf8115e0e6a dragonbox-1.1.3.tar.gz
4295bad62b2524793d8a7ba3e7385501 dtoa-20180411.tgz
09c7414a011363c72248c7bf3a23d758 f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
-d41d8cd98f00b204e9800998ecf8427e libreoffice-7.5.5.2.tar.xz
-f0e63963e57c0f1ffbfd779b44702e2e libreoffice-7.5.5.2.tar.xz.00
-96594ceb80c14865eb20f65c791ec7bd libreoffice-7.5.5.2.tar.xz.01
-1a1e709878053762c6e849c1679405fa libreoffice-7.5.5.2.tar.xz.02
-d41d8cd98f00b204e9800998ecf8427e libreoffice-help-7.5.5.2.tar.xz
-f2f075b8748199b521fbb905e785a219 libreoffice-help-7.5.5.2.tar.xz.00
-59c2a9b6dbe60f951dde5692bb48427f libreoffice-help-7.5.5.2.tar.xz.01
-d41d8cd98f00b204e9800998ecf8427e libreoffice-translations-7.5.5.2.tar.xz
-15b061b7123149d0ad54087c4a0ccbd4 libreoffice-translations-7.5.5.2.tar.xz.00
-989cc8af2f93295e03c58c94527c7006 libreoffice-translations-7.5.5.2.tar.xz.01
+d41d8cd98f00b204e9800998ecf8427e libreoffice-7.5.2.2.tar.xz
+b3c4e32b41115840a16c8d5579e9c03c libreoffice-7.5.2.2.tar.xz.00
+940ac2b2ec4b9922c1eaaaa27b4bf3b6 libreoffice-7.5.2.2.tar.xz.01
+72342943cfaba4cd445dd9b070c87c32 libreoffice-7.5.2.2.tar.xz.02
+d41d8cd98f00b204e9800998ecf8427e libreoffice-help-7.5.2.2.tar.xz
+bd2d63b4bd0349514738c8808c8601f1 libreoffice-help-7.5.2.2.tar.xz.00
+56ccb9cf82372067c587f336ebd0e0fb libreoffice-help-7.5.2.2.tar.xz.01
+d41d8cd98f00b204e9800998ecf8427e libreoffice-translations-7.5.2.2.tar.xz
+7a254510014b31c79e015ddd6decaa46 libreoffice-translations-7.5.2.2.tar.xz.00
+3287c8cba56dbb6ac303402fbd5b3d12 libreoffice-translations-7.5.2.2.tar.xz.01