From ffb73d2fd5c08516c88c08e2caaa6ff890d10c15 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Wed, 12 Apr 2023 20:51:04 +0200 Subject: [PATCH 1/1] - updated to 7.5.2.2 --- disable-failing-test.patch | 18 +++++++++--------- libreoffice.spec | 14 ++++++++------ 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/disable-failing-test.patch b/disable-failing-test.patch index ac31b09..ddebaad 100644 --- a/disable-failing-test.patch +++ b/disable-failing-test.patch @@ -1,13 +1,13 @@ ---- libreoffice-7.5.1.2/sd/qa/unit/import-tests.cxx.orig 2023-03-09 20:09:43.192750947 +0100 -+++ libreoffice-7.5.1.2/sd/qa/unit/import-tests.cxx 2023-03-09 20:11:34.780090894 +0100 -@@ -159,7 +159,6 @@ public: +--- libreoffice-7.5.2.2/sd/qa/unit/import-tests.cxx.orig 2023-03-09 20:09:43.192750947 +0100 ++++ libreoffice-7.5.2.2/sd/qa/unit/import-tests.cxx 2023-03-09 20:11:34.780090894 +0100 +@@ -82,7 +82,6 @@ public: + { + } - CPPUNIT_TEST_SUITE(SdImportTest); - -- CPPUNIT_TEST(testDocumentLayout); - CPPUNIT_TEST(testTdf152434); - CPPUNIT_TEST(testConnectors); - CPPUNIT_TEST(testTdf153036_resizedConnectorL); +- void testDocumentLayout(); + void testTdf152434(); + void testStandardConnectors(); + void testConnectors(); --- libreoffice-7.5.1.2/dbaccess/Module_dbaccess.mk.orig 2023-03-09 20:09:43.192750947 +0100 +++ libreoffice-7.5.1.2/dbaccess/Module_dbaccess.mk 2023-03-09 20:12:12.233650210 +0100 @@ -35,18 +35,6 @@ $(eval $(call gb_Module_add_targets,dbac diff --git a/libreoffice.spec b/libreoffice.spec index 76b807b..216bb1c 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -59,7 +59,7 @@ %define with_qt5 1 %endif -%define major_ver 7.5.1 +%define major_ver 7.5.2 %define qt5_ver 5.6 %define qt6_ver 6 @@ -70,17 +70,17 @@ Summary: LibreOffice - powerful office suite Summary(pl.UTF-8): LibreOffice - potężny pakiet biurowy Name: libreoffice Version: %{major_ver}.2 -Release: 2 +Release: 1 License: GPL/LGPL Group: X11/Applications Source0: http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-%{version}.tar.xz -# Source0-md5: 5a48583c5a224d6932ee138fbc3c23ff +# Source0-md5: 636a4fa94c7361d9d0fd0bf840783c27 Source1: http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-dictionaries-%{version}.tar.xz -# Source1-md5: 19a9eb99e64fa90c2a3a70fbafb11424 +# Source1-md5: 3a07567b1f23b8a68f79dff659de81d6 Source2: http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-help-%{version}.tar.xz -# Source2-md5: 0a1c39d42b120eff303bd787b266a159 +# Source2-md5: 4ed012102d394870279f6532f86d2e50 Source3: http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-translations-%{version}.tar.xz -# Source3-md5: 2b7a4abc1743551c742a3f07268e63a3 +# Source3-md5: d1cb0b5a68927eb066cc3e1b66de8a1a # make (download|fetch) DO_FETCH_TARBALLS=1 WGET=wget # but not sure if all are needed? @@ -3685,6 +3685,8 @@ fi %{_datadir}/%{name}/share/config/images_sifr_dark_svg.zip %{_datadir}/%{name}/share/config/images_sifr_svg.zip %{_datadir}/%{name}/share/config/images_sukapura.zip +%{_datadir}/%{name}/share/config/images_sukapura_dark.zip +%{_datadir}/%{name}/share/config/images_sukapura_dark_svg.zip %{_datadir}/%{name}/share/config/images_sukapura_svg.zip %dir %{_datadir}/%{name}/share/config/soffice.cfg %dir %{_datadir}/%{name}/share/config/soffice.cfg/cui -- 2.44.0