[packages/libreoffice] - updated to 7.5.9
qboosh
qboosh at pld-linux.org
Wed Aug 28 18:43:54 CEST 2024
commit c65efc574df5955e614fb0639f6e170b740a52f2
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Wed Aug 28 18:21:58 2024 +0200
- updated to 7.5.9
disable-failing-test.patch | 6 +++---
libreoffice-includes.patch | 20 +++++++++++++++++
libreoffice-types.patch | 53 ++++++++++++++++++++++++++++++++++++++++++++++
libreoffice.spec | 29 +++++++++++++------------
4 files changed, 92 insertions(+), 16 deletions(-)
---
diff --git a/libreoffice.spec b/libreoffice.spec
index 62f129c..49db121 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -59,7 +59,7 @@
%define with_qt5 1
%endif
-%define major_ver 7.5.2
+%define major_ver 7.5.9
%define qt5_ver 5.6
%define qt6_ver 6
@@ -70,22 +70,22 @@ Summary: LibreOffice - powerful office suite
Summary(pl.UTF-8): LibreOffice - potężny pakiet biurowy
Name: libreoffice
Version: %{major_ver}.2
-Release: 4
+Release: 1
License: GPL/LGPL
Group: X11/Applications
Source0: http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-%{version}.tar.xz
-# Source0-md5: 636a4fa94c7361d9d0fd0bf840783c27
+# Source0-md5: 65d54bfe6e09ade61d40888a1a40488d
Source1: http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-dictionaries-%{version}.tar.xz
-# Source1-md5: 3a07567b1f23b8a68f79dff659de81d6
+# Source1-md5: a354890a71a7c43f5fde0e6b6028cdaa
Source2: http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-help-%{version}.tar.xz
-# Source2-md5: 4ed012102d394870279f6532f86d2e50
+# Source2-md5: 4e0f841364041142887c88bfe4431b7b
Source3: http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-translations-%{version}.tar.xz
-# Source3-md5: d1cb0b5a68927eb066cc3e1b66de8a1a
+# Source3-md5: 3935d5a6bad3ca4ba53e3e8ef8289162
# make (download|fetch) DO_FETCH_TARBALLS=1 WGET=wget
# but not sure if all are needed?
-Source20: http://dev-www.libreoffice.org/src/pdfium-5408.tar.bz2
-# Source20-md5: a8ae777e121a0fb63f4e8b6779d68ada
+Source20: http://dev-www.libreoffice.org/src/pdfium-5778.tar.bz2
+# Source20-md5: 32a897e227d0d56f991e1beeb0f9af37
Source21: http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
# Source21-md5: 17410483b5b5f267aa18b7e00b65e6e0
Source22: http://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz
@@ -106,10 +106,12 @@ Source31: https://dev-www.libreoffice.org/src/dtoa-20180411.tgz
# Source31-md5: 4295bad62b2524793d8a7ba3e7385501
Source32: https://dev-www.libreoffice.org/src/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz
# Source32-md5: 0a0013856ea701b3023ca4b00f147c72
-Source33: https://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz
-# Source33-md5: 3653bc54e1bcd17ae09a1a7086daa38b
+Source33: https://dev-www.libreoffice.org/src/libcmis-0.6.1.tar.xz
+# Source33-md5: 4d6d131ae64f5d3122962ed39f9f209b
Patch0: disable-failing-test.patch
Patch1: jvm-path.patch
+Patch2: %{name}-includes.patch
+Patch3: %{name}-types.patch
URL: https://www.documentfoundation.org/
BuildRequires: /usr/bin/getopt
%{?with_firebird:BuildRequires: Firebird-devel >= 3.0.0.0}
@@ -177,7 +179,7 @@ BuildRequires: java-sac
BuildRequires: lcms2-devel >= 2
BuildRequires: libabw-devel >= 0.1.0
BuildRequires: libcdr-devel >= 0.1
-%{?with_system_cmis:BuildRequires: libcmis-devel >= 0.5.2}
+%{?with_system_cmis:BuildRequires: libcmis-devel >= 0.6.1}
BuildRequires: libe-book-devel >= 0.1.2
%{?with_eot:BuildRequires: libeot-devel >= 0.01}
BuildRequires: libepoxy-devel >= 1.2
@@ -458,7 +460,7 @@ Requires: harfbuzz-icu >= 5.1.0
Requires: hicolor-icon-theme
%{?with_system_beanshell:Requires: java-beanshell}
%{?with_system_hsqldb:Requires: java-hsqldb}
-%{?with_system_cmis:Requires: libcmis >= 0.5.2}
+%{?with_system_cmis:Requires: libcmis >= 0.6.1}
Requires: libepoxy >= 1.2
Requires: libexttextcat >= 3.4.1
Requires: liblangtag >= 0.4.0
@@ -2954,6 +2956,8 @@ Biblioteka do zagnieżdzania LibreOffice w aplikacjach Java.
%setup -q -a1 -a2 -a3
%patch0 -p1
%patch1 -p1
+%patch2 -p1
+%patch3 -p1
for dir in *-%{version}; do
[ -f $dir/ChangeLog ] && %{__mv} $dir/ChangeLog ChangeLog-$dir
@@ -3063,7 +3067,6 @@ export PATH=$PATH:%{_libdir}/interbase/bin
--enable-scripting-javascript \
--enable-split-app-modules \
--enable-split-opt-features \
- --with-build-version=%{version}-%{release} \
--with-external-dict-dir=%{_datadir}/myspell \
--with-external-tar=$(pwd)/ext_sources \
--with-extra-buildid="%{name}-%{epoch}:%{version}-%{release}" \
diff --git a/disable-failing-test.patch b/disable-failing-test.patch
index ddebaad..c9adaaf 100644
--- a/disable-failing-test.patch
+++ b/disable-failing-test.patch
@@ -1,13 +1,13 @@
---- 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
+--- libreoffice-7.5.9.2/sd/qa/unit/import-tests.cxx.orig 2024-08-27 19:24:27.557188992 +0200
++++ libreoffice-7.5.9.2/sd/qa/unit/import-tests.cxx 2024-08-27 19:26:12.767773974 +0200
@@ -82,7 +82,6 @@ public:
{
}
- void testDocumentLayout();
+ void testTdf154363();
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-includes.patch b/libreoffice-includes.patch
new file mode 100644
index 0000000..3661722
--- /dev/null
+++ b/libreoffice-includes.patch
@@ -0,0 +1,20 @@
+--- libreoffice-7.5.9.2/store/source/storbase.hxx.orig 2023-11-28 13:23:01.000000000 +0100
++++ libreoffice-7.5.9.2/store/source/storbase.hxx 2024-08-27 21:47:41.542381010 +0200
+@@ -32,6 +32,7 @@
+
+ #include <store/types.h>
+
++#include <cstdlib>
+ #include <memory>
+ #include <utility>
+
+--- libreoffice-7.5.9.2/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx.orig 2023-11-28 13:23:01.000000000 +0100
++++ libreoffice-7.5.9.2/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx 2024-08-27 22:07:28.036053320 +0200
+@@ -16,6 +16,7 @@
+
+ #include <LibreOfficeKit/LibreOfficeKitGtk.h>
+
++#include <algorithm>
+ #include <fstream>
+ #include <map>
+ #include <memory>
diff --git a/libreoffice-types.patch b/libreoffice-types.patch
new file mode 100644
index 0000000..77f1e67
--- /dev/null
+++ b/libreoffice-types.patch
@@ -0,0 +1,53 @@
+--- libreoffice-7.5.9.2/helpcompiler/source/HelpLinker.cxx.orig 2023-11-28 13:23:01.000000000 +0100
++++ libreoffice-7.5.9.2/helpcompiler/source/HelpLinker.cxx 2024-08-28 06:18:11.666316788 +0200
+@@ -815,7 +815,7 @@ static const HelpProcessingException* Gp
+
+ extern "C" {
+
+-static void StructuredXMLErrorFunction(SAL_UNUSED_PARAMETER void *, xmlErrorPtr error)
++static void StructuredXMLErrorFunction(SAL_UNUSED_PARAMETER void *, const xmlError *error)
+ {
+ std::string aErrorMsg = error->message;
+ std::string aXMLParsingFile;
+--- libreoffice-7.5.9.2/sax/source/fastparser/fastparser.cxx.orig 2023-11-28 13:23:01.000000000 +0100
++++ libreoffice-7.5.9.2/sax/source/fastparser/fastparser.cxx 2024-08-28 06:19:49.893307939 +0200
+@@ -579,7 +579,7 @@ Event& Entity::getEvent( CallbackType aT
+ OUString lclGetErrorMessage( xmlParserCtxtPtr ctxt, std::u16string_view sSystemId, sal_Int32 nLine )
+ {
+ const char* pMessage;
+- xmlErrorPtr error = xmlCtxtGetLastError( ctxt );
++ const xmlError* error = xmlCtxtGetLastError( ctxt );
+ if( error && error->message )
+ pMessage = error->message;
+ else
+--- libreoffice-7.5.9.2/filter/source/xsltfilter/LibXSLTTransformer.cxx.orig 2023-11-28 13:23:01.000000000 +0100
++++ libreoffice-7.5.9.2/filter/source/xsltfilter/LibXSLTTransformer.cxx 2024-08-28 06:22:44.304452124 +0200
+@@ -333,7 +333,7 @@ namespace XSLT
+ }
+ else
+ {
+- xmlErrorPtr lastErr = xmlGetLastError();
++ const xmlError* lastErr = xmlGetLastError();
+ OUString msg;
+ if (lastErr)
+ msg = OStringToOUString(lastErr->message, RTL_TEXTENCODING_UTF8);
+--- libreoffice-7.5.9.2/unoxml/source/xpath/xpathapi.cxx.orig 2023-11-28 13:23:01.000000000 +0100
++++ libreoffice-7.5.9.2/unoxml/source/xpath/xpathapi.cxx 2024-08-28 06:28:58.787726580 +0200
+@@ -217,7 +217,7 @@ namespace XPath
+ return selectSingleNode(contextNode, expr);
+ }
+
+- static OUString make_error_message(xmlErrorPtr pError)
++ static OUString make_error_message(const xmlError *pError)
+ {
+ OUStringBuffer buf;
+ if (pError) {
+@@ -263,7 +263,7 @@ namespace XPath
+ SAL_WARN("unoxml", "libxml2 error: " << str);
+ }
+
+- static void structured_error_func(void *, xmlErrorPtr error)
++ static void structured_error_func(void *, const xmlError *error)
+ {
+ SAL_WARN("unoxml", "libxml2 error: " << make_error_message(error));
+ }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libreoffice.git/commitdiff/c65efc574df5955e614fb0639f6e170b740a52f2
More information about the pld-cvs-commit
mailing list