commit 9fc138ac41b30f7bbd6e86144d51d5ae7d625c27
Author: Jakub Bogusz <[email protected]>
Date: Sun Sep 1 08:17:05 2024 +0200
- updated to 7.6.7.2
disable-failing-test.patch | 31 --------------------
libreoffice-includes.patch | 10 -------
libreoffice-qt6.patch | 11 +++++++
libreoffice-types.patch | 53 ----------------------------------
libreoffice.spec | 72 ++++++++++++++++++++++------------------------
5 files changed, 46 insertions(+), 131 deletions(-)
---
diff --git a/libreoffice.spec b/libreoffice.spec
index 49db121..14fd151 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -7,12 +7,11 @@
# - system odfvalidator and officeotron?
# - xapian-omega support for help?
#
-# NOTE - FIXME FOR 3.4.3 !!!:
-# - normal build (i686) requires about 27 GB of disk space:
-# $BUILD_ROOT 7.0 GB
-# BUILD 18 GB
-# RPMS 1.8 GB
-# SRPMS 0.4 GB
+# NOTE: normal build (x86_64) requires about ? GB of disk space:
+# $BUILD_ROOT ? GB
+# BUILD 9 GB
+# RPMS 1.4 GB
+# SRPMS ? GB
#
# Conditional build:
%bcond_without java # Java support (required for help
support)
@@ -59,7 +58,7 @@
%define with_qt5 1
%endif
-%define major_ver 7.5.9
+%define major_ver 7.6.7
%define qt5_ver 5.6
%define qt6_ver 6
@@ -74,13 +73,13 @@ Release: 1
License: GPL/LGPL
Group: X11/Applications
Source0:
http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-%{version}.tar.xz
-# Source0-md5: 65d54bfe6e09ade61d40888a1a40488d
+# Source0-md5: 96b9685afc47e9cd61d0b70f7cf85af9
Source1:
http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-dictionaries-%{version}.tar.xz
-# Source1-md5: a354890a71a7c43f5fde0e6b6028cdaa
+# Source1-md5: c18d76ff8b261e3d22b6a0da0216c0e0
Source2:
http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-help-%{version}.tar.xz
-# Source2-md5: 4e0f841364041142887c88bfe4431b7b
+# Source2-md5: 43cf0788bea4f7af0b27382bdd35a190
Source3:
http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-translations-%{version}.tar.xz
-# Source3-md5: 3935d5a6bad3ca4ba53e3e8ef8289162
+# Source3-md5: f552a0c0ed718c7ffdef71a10682aa65
# make (download|fetch) DO_FETCH_TARBALLS=1 WGET=wget
# but not sure if all are needed?
@@ -104,14 +103,13 @@ Source30:
https://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9
# Source30-md5: 8249374c274932a21846fa7629c2aa9b
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
+Source32:
https://dev-www.libreoffice.org/src/skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz
+# Source32-md5: 373dd6a480f29505217d59b9adce274d
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
+Patch3: %{name}-qt6.patch
URL: https://www.documentfoundation.org/
BuildRequires: /usr/bin/getopt
%{?with_firebird:BuildRequires: Firebird-devel >= 3.0.0.0}
@@ -129,25 +127,26 @@ BuildRequires: bluez-libs-devel
BuildRequires: boost-devel >= 1.66
BuildRequires: box2d-devel >= 2.4.0
BuildRequires: cairo-devel >= 1.12.0
-%{?with_ccache:BuildRequires: ccache}
+%{?with_ccache:BuildRequires: ccache >= 3.7.2}
BuildRequires: clucene-core-devel >= 2.3
%{?with_system_coinmp:BuildRequires: coinmp-devel}
BuildRequires: cppunit-devel >= 1.14.0
BuildRequires: cups-devel
BuildRequires: curl-devel >= 7.68.0
-BuildRequires: dconf-devel >= 0.15.2
+BuildRequires: dconf-devel >= 0.40.0
BuildRequires: dbus-devel >= 0.60
BuildRequires: dragonbox-devel = 1.1.3
BuildRequires: expat-devel
BuildRequires: flex >= 2.6.0
BuildRequires: fontconfig-devel >= 2.4.1
-# pkgconfig(freetype2) >= 21.0.15
+# pkgconfig(freetype2) >= 21.0.15 (for skia)
BuildRequires: freetype-devel >= 1:2.8.1
+BuildRequires: frozen-devel
BuildRequires: gdb
BuildRequires: gettext-tools
BuildRequires: glib2-devel >= 1:2.38
%{?with_introspection:BuildRequires: gobject-introspection-devel >= 1.32.0}
-BuildRequires: gperf
+BuildRequires: gperf >= 3.1
BuildRequires: gpgme-c++-devel
BuildRequires: graphite2-devel >= 0.9.3
BuildRequires: gstreamer-devel >= 1.0
@@ -158,7 +157,7 @@ BuildRequires: harfbuzz-icu-devel >= 5.1.0
%{?with_system_hunspell:BuildRequires: hunspell-devel >= 1.2.2}
%{?with_system_hyphen:BuildRequires: hyphen-devel}
%{?with_icecream:BuildRequires: icecream}
-BuildRequires: icu
+BuildRequires: icu >= 4.6
%{?with_system_beanshell:BuildRequires: java-beanshell}
BuildRequires: java-commons-logging >= 1.1.2
BuildRequires: java-flow-engine >= 0.9.2
@@ -189,13 +188,13 @@ BuildRequires: libexttextcat-devel >= 3.4.1
BuildRequires: libfreehand-devel >= 0.1.0
BuildRequires: libicu-devel >= 4.6
BuildRequires: libjpeg-devel
-BuildRequires: liblangtag-devel >= 0.4.0
+BuildRequires: liblangtag-devel >= 0.5.5
BuildRequires: libmspub-devel >= 0.1
BuildRequires: libmwaw-devel >= 0.3.21
BuildRequires: libnumbertext-devel >= 1.0.6
BuildRequires: libodfgen-devel >= 0.1.1
-BuildRequires: liborcus-devel >= 0.17.2
-BuildRequires: liborcus-devel < 0.18
+BuildRequires: liborcus-devel >= 0.18.0
+BuildRequires: liborcus-devel < 0.19
BuildRequires: libpagemaker-devel >= 0.0.2
BuildRequires: libpng-devel
BuildRequires: libqxp-devel
@@ -211,16 +210,16 @@ BuildRequires: libvisio-devel >= 0.1
BuildRequires: libwebp-devel
BuildRequires: libwpd-devel >= 0.10.0
BuildRequires: libwpg-devel >= 0.3.0
-BuildRequires: libwps-devel >= 0.4.12
+BuildRequires: libwps-devel >= 0.4.14
BuildRequires: libxml2-devel >= 2.0
BuildRequires: libxml2-progs
BuildRequires: libxslt-devel
BuildRequires: libxslt-progs
BuildRequires: libzmf-devel
BuildRequires: lp_solve-devel >= 5.5
-BuildRequires: make >= 1:3.82
-BuildRequires: mdds-devel >= 2.0.0
-BuildRequires: mdds-devel < 2.1
+BuildRequires: make >= 1:4.0
+BuildRequires: mdds-devel >= 2.1.0
+BuildRequires: mdds-devel < 2.2
%{?with_mono:BuildRequires: mono-csharp >= 1.2.3}
%{?with_mono:BuildRequires: mono-static >= 1.2.3}
BuildRequires: mysql-devel >= 5
@@ -236,8 +235,8 @@ BuildRequires: perl-Archive-Zip
BuildRequires: perl-base >= 5
BuildRequires: perl-devel >= 5
BuildRequires: pkgconfig >= 1:0.9.0
-BuildRequires: poppler-cpp-devel >= 0.12.0
-BuildRequires: poppler-devel >= 0.12.0
+BuildRequires: poppler-cpp-devel >= 0.14
+BuildRequires: poppler-devel >= 0.14
%{?with_pgsql:BuildRequires: postgresql-devel >= 9.0}
BuildRequires: python3 >= 1:3.3
BuildRequires: python3-devel >= 1:3.3
@@ -450,7 +449,7 @@ Requires: %{name}-ure = %{version}-%{release}
Requires: cairo >= 1.12.0
Requires: clucene-core >= 2.3
Requires: curl-libs >= 7.68.0
-Requires: dconf >= 0.15.2
+Requires: dconf >= 0.40.0
Requires: fontconfig >= 2.4.1
Requires: fonts-TTF-OpenSymbol
Requires: freetype >= 1:2.8.1
@@ -459,11 +458,12 @@ Requires: graphite2 >= 0.9.3
Requires: harfbuzz-icu >= 5.1.0
Requires: hicolor-icon-theme
%{?with_system_beanshell:Requires: java-beanshell}
-%{?with_system_hsqldb:Requires: java-hsqldb}
+%{?with_system_hsqldb:Requires: java-hsqldb >= 1.8.0.9}
+%{?with_system_hsqldb:Requires: java-hsqldb < 1.8.1}
%{?with_system_cmis:Requires: libcmis >= 0.6.1}
Requires: libepoxy >= 1.2
Requires: libexttextcat >= 3.4.1
-Requires: liblangtag >= 0.4.0
+Requires: liblangtag >= 0.5.5
Requires: libmwaw >= 0.3.21
Requires: libodfgen >= 0.1.1
Requires: libpagemaker >= 0.0.2
@@ -648,7 +648,7 @@ Requires(post,postun): gtk-update-icon-cache
Requires: %{name}-core = %{version}-%{release}
Requires: hicolor-icon-theme
Requires: libe-book >= 0.1.2
-Requires: libwps >= 0.4.12
+Requires: libwps >= 0.4.14
Obsoletes: openoffice.org-writer < 1:4
%description writer
@@ -681,7 +681,7 @@ Requires(post,postun): gtk-update-icon-cache
Requires: %{name}-core = %{version}-%{release}
Requires: hicolor-icon-theme
Requires: libetonyek >= 0.1.10
-Requires: libwps >= 0.4.12
+Requires: libwps >= 0.4.14
Requires: lp_solve >= 5.5
Obsoletes: openoffice.org-calc < 1:4
@@ -2954,7 +2954,6 @@ Biblioteka do zagnieżdzania LibreOffice w aplikacjach
Java.
%prep
%setup -q -a1 -a2 -a3
-%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
@@ -3435,6 +3434,7 @@ fi
%attr(755,root,root) %{_libdir}/%{name}/program/libdict_ja.so
%attr(755,root,root) %{_libdir}/%{name}/program/libdict_zh.so
%attr(755,root,root) %{_libdir}/%{name}/program/libdlgprovlo.so
+%attr(755,root,root) %{_libdir}/%{name}/program/libdocmodello.so
%attr(755,root,root) %{_libdir}/%{name}/program/libdrawinglayercorelo.so
%attr(755,root,root) %{_libdir}/%{name}/program/libdrawinglayerlo.so
%attr(755,root,root) %{_libdir}/%{name}/program/libeditenglo.so
@@ -3442,7 +3442,6 @@ fi
%attr(755,root,root) %{_libdir}/%{name}/program/libemboleobj.so
%attr(755,root,root) %{_libdir}/%{name}/program/libemfiolo.so
%attr(755,root,root) %{_libdir}/%{name}/program/libevtattlo.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libexpwraplo.so
%attr(755,root,root) %{_libdir}/%{name}/program/libfilelo.so
%attr(755,root,root) %{_libdir}/%{name}/program/libfilterconfiglo.so
%{?with_firebird:%attr(755,root,root)
%{_libdir}/%{name}/program/libfirebird_sdbclo.so}
@@ -4035,7 +4034,6 @@ fi
%attr(755,root,root) %{_libdir}/%{name}/program/libOGLTranslo.so
%attr(755,root,root) %{_libdir}/%{name}/program/libanimcorelo.so
%attr(755,root,root) %{_libdir}/%{name}/program/libPresentationMinimizerlo.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libPresenterScreenlo.so
%attr(755,root,root) %{_libdir}/%{name}/program/libwpftimpresslo.so
%{_mandir}/man1/loimpress.1
%{_desktopdir}/libreoffice-impress.desktop
diff --git a/disable-failing-test.patch b/disable-failing-test.patch
deleted file mode 100644
index c9adaaf..0000000
--- a/disable-failing-test.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- 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();
---- 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
- ))
-
- ifneq ($(OS),iOS)
--ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)
--$(eval $(call gb_Module_add_check_targets,dbaccess,\
-- $(if $(ENABLE_JAVA),CppunitTest_dbaccess_hsqlbinary_import) \
-- $(if $(ENABLE_JAVA),CppunitTest_dbaccess_tdf119625) \
-- $(if $(ENABLE_JAVA),CppunitTest_dbaccess_tdf126268) \
--))
--
--$(eval $(call gb_Module_add_check_targets,dbaccess,\
-- CppunitTest_dbaccess_firebird_test \
--))
--endif
--
- ifneq ($(filter SCRIPTING,$(BUILD_TYPE)),)
- $(eval $(call gb_Module_add_check_targets,dbaccess,\
- CppunitTest_dbaccess_dialog_save \
diff --git a/libreoffice-includes.patch b/libreoffice-includes.patch
index 3661722..99887a4 100644
--- a/libreoffice-includes.patch
+++ b/libreoffice-includes.patch
@@ -8,13 +8,3 @@
#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-qt6.patch b/libreoffice-qt6.patch
new file mode 100644
index 0000000..45dc1b2
--- /dev/null
+++ b/libreoffice-qt6.patch
@@ -0,0 +1,11 @@
+--- libreoffice-7.6.7.2/configure.ac.orig 2024-05-07 19:55:09.000000000
+0200
++++ libreoffice-7.6.7.2/configure.ac 2024-08-30 05:29:04.258013249 +0200
+@@ -13157,7 +13157,7 @@ then
+ AC_MSG_ERROR([Qt Meta Object Compiler not found. Please specify
+ the root of your Qt installation by exporting QT6DIR before running
"configure".])
+ else
+- moc6_test_ver="`$MOC6 -v 2>&1 | $SED -n -e 's/^moc \(6.*\)/\1/p'`"
++ moc6_test_ver="`$MOC6 -v 2>&1 | $SED -n -e 's/^moc\(-qt6\)\?
\(6.*\)/\2/p'`"
+ if test -z "$moc6_test_ver"; then
+ AC_MSG_ERROR([Wrong moc for Qt6 found.])
+ fi
diff --git a/libreoffice-types.patch b/libreoffice-types.patch
deleted file mode 100644
index 77f1e67..0000000
--- a/libreoffice-types.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- 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/9fc138ac41b30f7bbd6e86144d51d5ae7d625c27
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
