From 3a58716d4b777084b0451c220cc510eb5e197a58 Mon Sep 17 00:00:00 2001 From: Zhao Hang Date: Wed, 17 May 2023 17:52:18 +0800 Subject: [PATCH 1/4] update to libreoffice-7.1.8.1-7.el9 Signed-off-by: Zhao Hang --- ...81661-gtk-critical-gtk_tree_view_scr.patch | 51 ++++++++++++++ 0001-neon-fit-with-older-gnutls.patch | 70 ------------------- dist | 1 + download | 2 - libreoffice.spec | 58 ++++++--------- 5 files changed, 72 insertions(+), 110 deletions(-) create mode 100644 0001-Resolves-rhbz-2081661-gtk-critical-gtk_tree_view_scr.patch delete mode 100644 0001-neon-fit-with-older-gnutls.patch create mode 100644 dist diff --git a/0001-Resolves-rhbz-2081661-gtk-critical-gtk_tree_view_scr.patch b/0001-Resolves-rhbz-2081661-gtk-critical-gtk_tree_view_scr.patch new file mode 100644 index 0000000..6a40195 --- /dev/null +++ b/0001-Resolves-rhbz-2081661-gtk-critical-gtk_tree_view_scr.patch @@ -0,0 +1,51 @@ +From 1dbfd248524789efa4a84dc94d56a229c19bc0b9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Wed, 4 May 2022 11:52:58 +0100 +Subject: [PATCH] Resolves: rhbz#2081661 gtk-critical + gtk_tree_view_scroll_to_cell assertion + +Change-Id: I4c7c4caed907072ef3a73ccfafabe882d618fa0e +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133730 +Tested-by: Jenkins +Reviewed-by: Adolfo Jayme Barrientos +(cherry picked from commit 816435e4c2d52615462670464c48689bebdf1e55) +--- + cui/source/customize/SvxMenuConfigPage.cxx | 2 +- + cui/source/customize/SvxToolbarConfigPage.cxx | 6 ++++-- + 2 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/cui/source/customize/SvxMenuConfigPage.cxx b/cui/source/customize/SvxMenuConfigPage.cxx +index 34cee1368d7a..bf7457193f5c 100644 +--- a/cui/source/customize/SvxMenuConfigPage.cxx ++++ b/cui/source/customize/SvxMenuConfigPage.cxx +@@ -136,7 +136,7 @@ void SvxMenuConfigPage::Init() + + ReloadTopLevelListBox(); + +- m_xTopLevelListBox->set_active(0); ++ m_xTopLevelListBox->set_active(m_xTopLevelListBox->get_count() ? 0 : -1); + SelectElement(); + + m_xCommandCategoryListBox->Init(comphelper::getProcessComponentContext(), m_xFrame, +diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx b/cui/source/customize/SvxToolbarConfigPage.cxx +index 99a85d82f96e..d2284428d8f1 100644 +--- a/cui/source/customize/SvxToolbarConfigPage.cxx ++++ b/cui/source/customize/SvxToolbarConfigPage.cxx +@@ -246,10 +246,12 @@ void SvxToolbarConfigPage::Init() + + ReloadTopLevelListBox(); + +- sal_Int32 nPos = 0; ++ sal_Int32 nCount = m_xTopLevelListBox->get_count(); ++ sal_Int32 nPos = nCount > 0 ? 0 : -1; ++ + if (!m_aURLToSelect.isEmpty()) + { +- for (sal_Int32 i = 0, nCount = m_xTopLevelListBox->get_count(); i < nCount; ++i) ++ for (sal_Int32 i = 0; i < nCount; ++i) + { + SvxConfigEntry* pData + = reinterpret_cast(m_xTopLevelListBox->get_id(i).toInt64()); +-- +2.35.1 + diff --git a/0001-neon-fit-with-older-gnutls.patch b/0001-neon-fit-with-older-gnutls.patch deleted file mode 100644 index 56d6e58..0000000 --- a/0001-neon-fit-with-older-gnutls.patch +++ /dev/null @@ -1,70 +0,0 @@ -From d6fb4e010e18309373f4ba581f9fd74fd8212762 Mon Sep 17 00:00:00 2001 -From: Liwei Ge -Date: Mon, 18 Jul 2022 20:34:06 +0800 -Subject: [PATCH] neon: fit with older gnutls - ---- - external/neon/configs/config.h | 2 ++ - external/neon/neon_fit_with_older_gnutls.patch | 15 +++++++++++++++ - 2 files changed, 17 insertions(+) - create mode 100644 external/neon/neon_fit_with_older_gnutls.patch - -diff --git a/external/neon/configs/config.h b/external/neon/configs/config.h -index af8408ad9..662afc516 100644 ---- a/external/neon/configs/config.h -+++ b/external/neon/configs/config.h -@@ -83,6 +83,8 @@ - /* Define if GnuTLS support is enabled */ - #define HAVE_GNUTLS - -+#define HAVE_GNUTLS_CERTIFICATE_SET_RETRIEVE_FUNCTION2 -+ - /* Define to 1 if you have the `gnutls_certificate_get_x509_cas' function. */ - /* #undef HAVE_GNUTLS_CERTIFICATE_GET_X509_CAS */ - -diff --git a/external/neon/neon_fit_with_older_gnutls.patch b/external/neon/neon_fit_with_older_gnutls.patch -new file mode 100644 -index 000000000..4eda62a5b ---- /dev/null -+++ b/external/neon/neon_fit_with_older_gnutls.patch -@@ -0,0 +1,26 @@ -+diff -Nur src/ne_gnutls.h src/ne_gnutls.h -+--- src/ne_gnutls.c 2020-06-20 15:09:24.000000000 +0800 -++++ src/ne_gnutls.c 2022-07-18 11:22:00.000000000 +0800 -+@@ -32,6 +32,7 @@ -+ #include -+ -+ #include -++#include -+ #include -+ -+ #ifdef NE_HAVE_TS_SSL -+diff -Nur src/ne_privssl.h src/ne_privssl.h -+--- src/ne_privssl.h 2020-06-20 15:09:24.000000000 +0800 -++++ src/ne_privssl.h 2022-07-18 11:22:00.000000000 +0800 -+@@ -86,9 +86,11 @@ -+ -+ typedef gnutls_session_t ne_ssl_socket; -+ -++#ifdef HAVE_GNUTLS_PRIVKEY_IMPORT_EXT -+ NE_PRIVATE ne_ssl_client_cert * -+ ne__ssl_clicert_exkey_import(const unsigned char *der, size_t der_len, -+ gnutls_privkey_sign_func sign_func, void *userdata); -++#endif -+ -+ #endif /* HAVE_GNUTLS */ -+ -diff --git a/external/neon/UnpackedTarball_neon.mk b/external/neon/UnpackedTarball_neon.mk -index 73cdd81f2..bb15e3f48 100644 ---- a/external/neon/UnpackedTarball_neon.mk -+++ b/external/neon/UnpackedTarball_neon.mk -@@ -21,6 +21,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,neon,\ - external/neon/neon.patch \ - external/neon/neon_with_gnutls.patch \ - external/neon/neon_fix_lock_token_on_if.patch \ -+ external/neon/neon_fit_with_older_gnutls.patch \ - $(if $(filter WNT,$(OS)),external/neon/neon_fix_no_OPENSSL_Applink.patch) \ - )) - --- -2.27.0 diff --git a/dist b/dist new file mode 100644 index 0000000..89c1faf --- /dev/null +++ b/dist @@ -0,0 +1 @@ +an9 diff --git a/download b/download index 9557ca9..cfe5c0a 100644 --- a/download +++ b/download @@ -4,5 +4,3 @@ d66ae64561a9bccc27c8d0b9b3c691fd libreoffice-help-7.1.8.1.tar.xz ce3404913b8f0f93a1cb9dfdc4f30bf3 libreoffice-help-7.1.8.1.tar.xz.asc 566cabebe62d53a2a62e73a413b3daeb libreoffice-translations-7.1.8.1.tar.xz 92a1ff79401bb8be34de192bb409364e libreoffice-translations-7.1.8.1.tar.xz.asc -c871268f0ba365b71f1ec1bf068d6ab3 neon-0.31.2.tar.gz -b66ec21e0a0ac331afb4b1bc5c9ef966 xmlsec1-1.2.30.tar.gz diff --git a/libreoffice.spec b/libreoffice.spec index 03c478b..f50dacb 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1,4 +1,3 @@ -%define anolis_release .0.2 # download path contains version without the last (fourth) digit %global libo_version 7.1.8 # Should contain .alphaX / .betaX, if this is pre-release (actually @@ -8,11 +7,11 @@ # Should contain any suffix of release tarball name, e.g., -buildfix1. %global libo_buildfix %{nil} # rhbz#715152 state vendor -%if 0%{?anolis} -%global vendoroption --with-vendor="OpenAnolis Community" +%if 0%{?rhel} +%global vendoroption --with-vendor="Red Hat, Inc." %endif %if 0%{?fedora} -%global vendoroption --with-vendor="OpenAnolis Community" +%global vendoroption --with-vendor="The Fedora Project" %endif %global libo_python python3 %global libo_python_executable %{__python3} @@ -58,7 +57,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.1 -Release: 6%{?libo_prerelease}%{anolis_release}%{?dist} +Release: 7%{?libo_prerelease}%{?dist} License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0 URL: http://www.libreoffice.org/ @@ -84,9 +83,6 @@ Source13: %{external_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zi Source14: %{external_url}/../extern/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf %global bundling_options %{?bundling_options} --without-system-hsqldb -Source20: http://www.aleksey.com/xmlsec/download/xmlsec1-1.2.30.tar.gz -Source21: https://notroj.github.io/neon/neon-0.31.2.tar.gz - Provides: bundled(hsqldb) = 1.8.0 %if 0%{?fedora} Provides: bundled(rhino) = 1.5 @@ -219,7 +215,7 @@ BuildRequires: pkgconfig(harfbuzz) BuildRequires: pkgconfig(libeot) BuildRequires: pkgconfig(libepubgen-0.1) BuildRequires: pkgconfig(libqxp-0.0) -%if 0%{?fedora} > 33 || 0%{?rhel} > 8 || 0%{?anolis} >= 8 +%if 0%{?fedora} > 33 || 0%{?rhel} > 8 BuildRequires: pkgconfig(liborcus-0.16) %else BuildRequires: pkgconfig(liborcus-0.15) @@ -232,7 +228,7 @@ BuildRequires: ant %if 0%{?fedora} BuildRequires: bsh %endif -BuildRequires: java-11-devel +BuildRequires: java-devel BuildRequires: junit BuildRequires: pentaho-reporting-flow-engine @@ -277,10 +273,10 @@ Patch17: 0001-tdf-121546-sw-don-t-use-undo-array-s-m_pOutlineNodes.patch Patch18: 0001-annocheck-warning-about-missing-.note.gnu.property-s.patch Patch19: 0001-EditTextObjectImpl-copy-ctor-doesn-t-exactly-copy-Ed.patch Patch20: 0001-CVE-2021-25636.patch +Patch21: 0001-Resolves-rhbz-2081661-gtk-critical-gtk_tree_view_scr.patch # not upstreamed Patch500: 0001-disable-libe-book-support.patch -Patch1000: 0001-neon-fit-with-older-gnutls.patch %global instdir %{_libdir} %global baseinstdir %{instdir}/libreoffice @@ -576,7 +572,7 @@ Arch-independent part of %{name}-ure. Summary: Software Development Kit for LibreOffice Requires: %{name}-core%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-ure%{?_isa} = %{epoch}:%{version}-%{release} -Requires: unzip%{?_isa}, java-11-devel +Requires: unzip%{?_isa}, java-devel %description sdk The LibreOffice SDK is an add-on for the LibreOffice office suite. It provides @@ -1017,25 +1013,22 @@ rm -rf git-hooks */git-hooks %global __scm git_am %__scm_setup_git_am -#Customize Palette to add Anolis colours +#Customize Palette to add Red Hat colours (head -n -1 extras/source/palettes/standard.soc && \ - echo -e ' - - - - ' && \ - tail -n 1 extras/source/palettes/standard.soc) > anolis.soc -mv -f anolis.soc extras/source/palettes/standard.soc -git commit -q -a -m 'add Anolis colors to palette' + echo -e ' + + + + ' && \ + tail -n 1 extras/source/palettes/standard.soc) > redhat.soc +mv -f redhat.soc extras/source/palettes/standard.soc +git commit -q -a -m 'add Red Hat colors to palette' # apply patches %autopatch -M 99 %if 0%{?rhel} %apply_patch -q %{PATCH500} %endif -%if 0%{?anolis} -%apply_patch -q %{PATCH1000} -%endif 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 @@ -1145,11 +1138,7 @@ touch autogen.lastrun %{distrooptions} \ %{?bundling_options} \ %{?archoptions} \ - %{?flatpakoptions} \ - --with-jdk-home=/usr/lib/jvm/java-11-openjdk \ - --with-system-neon=no \ - --with-system-xmlsec=no - + %{?flatpakoptions} make verbose=true build-nocheck @@ -1562,9 +1551,6 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{baseinstdir}/help/main_transform.xsl %{baseinstdir}/presets %dir %{baseinstdir}/program -%if 0%{?anolis} -%{baseinstdir}/program/libneon.so -%endif %if 0%{?fedora} %{baseinstdir}/program/core.abignore %endif @@ -2284,12 +2270,8 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %{_includedir}/LibreOfficeKit %changelog -* Fri Jan 06 2023 Chang Gao - 1:7.1.8.1-6.0.2 -- Rebuild for libhunspell so version bump - -* Mon Jul 18 2022 Liwei Ge - 1:7.1.8.1-6.0.1 -- Add configuration file and vemdor for Anolis OS -- Fit build on Anolis OS 8 +* Tue May 10 2022 Caolán McNamara - 1:7.1.8.1-7 +- Resolves: rhbz#2081661 fix gtk_tree_view_scroll_to_cell assert * Tue Feb 22 2022 Caolán McNamara - 1:7.1.8.1-6 - Resolves: rhbz#2056412 merge in fedoa 34 changes -- Gitee From d739dad92d3f6b7cddc3ce723fd274bc4f923ba1 Mon Sep 17 00:00:00 2001 From: yangxiaoxuan Date: Tue, 2 Feb 2021 01:12:37 +0800 Subject: [PATCH 2/4] spec: add configuration file and vemdor for anolis Signed-off-by: yangxiaoxuan Change-Id: I7ab913f7f76a0f10d896c0902d2093dca662fb7d --- libreoffice.spec | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index f50dacb..3fae476 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1,3 +1,4 @@ +%define anolis_release .0.1 # download path contains version without the last (fourth) digit %global libo_version 7.1.8 # Should contain .alphaX / .betaX, if this is pre-release (actually @@ -7,11 +8,11 @@ # Should contain any suffix of release tarball name, e.g., -buildfix1. %global libo_buildfix %{nil} # rhbz#715152 state vendor -%if 0%{?rhel} -%global vendoroption --with-vendor="Red Hat, Inc." +%if 0%{?anolis} +%global vendoroption --with-vendor="OpenAnolis Community" %endif %if 0%{?fedora} -%global vendoroption --with-vendor="The Fedora Project" +%global vendoroption --with-vendor="OpenAnolis Community" %endif %global libo_python python3 %global libo_python_executable %{__python3} @@ -57,7 +58,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.1 -Release: 7%{?libo_prerelease}%{?dist} +Release: 7%{?libo_prerelease}%{anolis_release}%{?dist} License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0 URL: http://www.libreoffice.org/ @@ -1013,16 +1014,16 @@ rm -rf git-hooks */git-hooks %global __scm git_am %__scm_setup_git_am -#Customize Palette to add Red Hat colours +#Customize Palette to add Anolis colours (head -n -1 extras/source/palettes/standard.soc && \ - echo -e ' - - - - ' && \ - tail -n 1 extras/source/palettes/standard.soc) > redhat.soc -mv -f redhat.soc extras/source/palettes/standard.soc -git commit -q -a -m 'add Red Hat colors to palette' + echo -e ' + + + + ' && \ + tail -n 1 extras/source/palettes/standard.soc) > anolis.soc +mv -f anolis.soc extras/source/palettes/standard.soc +git commit -q -a -m 'add Anolis colors to palette' # apply patches %autopatch -M 99 @@ -2270,6 +2271,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %{_includedir}/LibreOfficeKit %changelog +* Thu May 18 2023 yangxiaoxuan 1:7.1.8.1-7.0.1 +- Add configuration file and vemdor for Anolis OS + * Tue May 10 2022 Caolán McNamara - 1:7.1.8.1-7 - Resolves: rhbz#2081661 fix gtk_tree_view_scroll_to_cell assert -- Gitee From 14d5e81c856a73b377e91eac32f0e66ca8c3370e Mon Sep 17 00:00:00 2001 From: Liwei Ge Date: Mon, 18 Jul 2022 20:44:51 +0800 Subject: [PATCH 3/4] build: bundle with neon-0.31.2 and xmlsec1-1.2.30 --- 0001-neon-fit-with-older-gnutls.patch | 70 +++++++++++++++++++++++++++ download | 2 + libreoffice.spec | 25 ++++++++-- 3 files changed, 92 insertions(+), 5 deletions(-) create mode 100644 0001-neon-fit-with-older-gnutls.patch diff --git a/0001-neon-fit-with-older-gnutls.patch b/0001-neon-fit-with-older-gnutls.patch new file mode 100644 index 0000000..56d6e58 --- /dev/null +++ b/0001-neon-fit-with-older-gnutls.patch @@ -0,0 +1,70 @@ +From d6fb4e010e18309373f4ba581f9fd74fd8212762 Mon Sep 17 00:00:00 2001 +From: Liwei Ge +Date: Mon, 18 Jul 2022 20:34:06 +0800 +Subject: [PATCH] neon: fit with older gnutls + +--- + external/neon/configs/config.h | 2 ++ + external/neon/neon_fit_with_older_gnutls.patch | 15 +++++++++++++++ + 2 files changed, 17 insertions(+) + create mode 100644 external/neon/neon_fit_with_older_gnutls.patch + +diff --git a/external/neon/configs/config.h b/external/neon/configs/config.h +index af8408ad9..662afc516 100644 +--- a/external/neon/configs/config.h ++++ b/external/neon/configs/config.h +@@ -83,6 +83,8 @@ + /* Define if GnuTLS support is enabled */ + #define HAVE_GNUTLS + ++#define HAVE_GNUTLS_CERTIFICATE_SET_RETRIEVE_FUNCTION2 ++ + /* Define to 1 if you have the `gnutls_certificate_get_x509_cas' function. */ + /* #undef HAVE_GNUTLS_CERTIFICATE_GET_X509_CAS */ + +diff --git a/external/neon/neon_fit_with_older_gnutls.patch b/external/neon/neon_fit_with_older_gnutls.patch +new file mode 100644 +index 000000000..4eda62a5b +--- /dev/null ++++ b/external/neon/neon_fit_with_older_gnutls.patch +@@ -0,0 +1,26 @@ ++diff -Nur src/ne_gnutls.h src/ne_gnutls.h ++--- src/ne_gnutls.c 2020-06-20 15:09:24.000000000 +0800 +++++ src/ne_gnutls.c 2022-07-18 11:22:00.000000000 +0800 ++@@ -32,6 +32,7 @@ ++ #include ++ ++ #include +++#include ++ #include ++ ++ #ifdef NE_HAVE_TS_SSL ++diff -Nur src/ne_privssl.h src/ne_privssl.h ++--- src/ne_privssl.h 2020-06-20 15:09:24.000000000 +0800 +++++ src/ne_privssl.h 2022-07-18 11:22:00.000000000 +0800 ++@@ -86,9 +86,11 @@ ++ ++ typedef gnutls_session_t ne_ssl_socket; ++ +++#ifdef HAVE_GNUTLS_PRIVKEY_IMPORT_EXT ++ NE_PRIVATE ne_ssl_client_cert * ++ ne__ssl_clicert_exkey_import(const unsigned char *der, size_t der_len, ++ gnutls_privkey_sign_func sign_func, void *userdata); +++#endif ++ ++ #endif /* HAVE_GNUTLS */ ++ +diff --git a/external/neon/UnpackedTarball_neon.mk b/external/neon/UnpackedTarball_neon.mk +index 73cdd81f2..bb15e3f48 100644 +--- a/external/neon/UnpackedTarball_neon.mk ++++ b/external/neon/UnpackedTarball_neon.mk +@@ -21,6 +21,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,neon,\ + external/neon/neon.patch \ + external/neon/neon_with_gnutls.patch \ + external/neon/neon_fix_lock_token_on_if.patch \ ++ external/neon/neon_fit_with_older_gnutls.patch \ + $(if $(filter WNT,$(OS)),external/neon/neon_fix_no_OPENSSL_Applink.patch) \ + )) + +-- +2.27.0 diff --git a/download b/download index cfe5c0a..9557ca9 100644 --- a/download +++ b/download @@ -4,3 +4,5 @@ d66ae64561a9bccc27c8d0b9b3c691fd libreoffice-help-7.1.8.1.tar.xz ce3404913b8f0f93a1cb9dfdc4f30bf3 libreoffice-help-7.1.8.1.tar.xz.asc 566cabebe62d53a2a62e73a413b3daeb libreoffice-translations-7.1.8.1.tar.xz 92a1ff79401bb8be34de192bb409364e libreoffice-translations-7.1.8.1.tar.xz.asc +c871268f0ba365b71f1ec1bf068d6ab3 neon-0.31.2.tar.gz +b66ec21e0a0ac331afb4b1bc5c9ef966 xmlsec1-1.2.30.tar.gz diff --git a/libreoffice.spec b/libreoffice.spec index 3fae476..fe3a534 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -84,6 +84,9 @@ Source13: %{external_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zi Source14: %{external_url}/../extern/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf %global bundling_options %{?bundling_options} --without-system-hsqldb +Source20: http://www.aleksey.com/xmlsec/download/xmlsec1-1.2.30.tar.gz +Source21: https://notroj.github.io/neon/neon-0.31.2.tar.gz + Provides: bundled(hsqldb) = 1.8.0 %if 0%{?fedora} Provides: bundled(rhino) = 1.5 @@ -216,7 +219,7 @@ BuildRequires: pkgconfig(harfbuzz) BuildRequires: pkgconfig(libeot) BuildRequires: pkgconfig(libepubgen-0.1) BuildRequires: pkgconfig(libqxp-0.0) -%if 0%{?fedora} > 33 || 0%{?rhel} > 8 +%if 0%{?fedora} > 33 || 0%{?rhel} > 8 || 0%{?anolis} >= 8 BuildRequires: pkgconfig(liborcus-0.16) %else BuildRequires: pkgconfig(liborcus-0.15) @@ -229,7 +232,7 @@ BuildRequires: ant %if 0%{?fedora} BuildRequires: bsh %endif -BuildRequires: java-devel +BuildRequires: java-11-devel BuildRequires: junit BuildRequires: pentaho-reporting-flow-engine @@ -278,6 +281,7 @@ Patch21: 0001-Resolves-rhbz-2081661-gtk-critical-gtk_tree_view_scr.patch # not upstreamed Patch500: 0001-disable-libe-book-support.patch +Patch1000: 0001-neon-fit-with-older-gnutls.patch %global instdir %{_libdir} %global baseinstdir %{instdir}/libreoffice @@ -573,7 +577,7 @@ Arch-independent part of %{name}-ure. Summary: Software Development Kit for LibreOffice Requires: %{name}-core%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-ure%{?_isa} = %{epoch}:%{version}-%{release} -Requires: unzip%{?_isa}, java-devel +Requires: unzip%{?_isa}, java-11-devel %description sdk The LibreOffice SDK is an add-on for the LibreOffice office suite. It provides @@ -1030,6 +1034,9 @@ git commit -q -a -m 'add Anolis colors to palette' %if 0%{?rhel} %apply_patch -q %{PATCH500} %endif +%if 0%{?anolis} +%apply_patch -q %{PATCH1000} +%endif 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 @@ -1139,7 +1146,11 @@ touch autogen.lastrun %{distrooptions} \ %{?bundling_options} \ %{?archoptions} \ - %{?flatpakoptions} + %{?flatpakoptions} \ + --with-jdk-home=/usr/lib/jvm/java-11-openjdk \ + --with-system-neon=no \ + --with-system-xmlsec=no + make verbose=true build-nocheck @@ -1552,6 +1563,9 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{baseinstdir}/help/main_transform.xsl %{baseinstdir}/presets %dir %{baseinstdir}/program +%if 0%{?anolis} +%{baseinstdir}/program/libneon.so +%endif %if 0%{?fedora} %{baseinstdir}/program/core.abignore %endif @@ -2271,8 +2285,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %{_includedir}/LibreOfficeKit %changelog -* Thu May 18 2023 yangxiaoxuan 1:7.1.8.1-7.0.1 +* Thu May 18 2023 Liwei Ge - 1:7.1.8.1-7.0.1 - Add configuration file and vemdor for Anolis OS +- Fit build on Anolis OS 8 * Tue May 10 2022 Caolán McNamara - 1:7.1.8.1-7 - Resolves: rhbz#2081661 fix gtk_tree_view_scroll_to_cell assert -- Gitee From 9f44c2824a6a518488df077f6d277617130bb66d Mon Sep 17 00:00:00 2001 From: Zhao Hang Date: Thu, 18 May 2023 16:28:59 +0800 Subject: [PATCH 4/4] spec: remove loongarch64 arch Signed-off-by: Zhao Hang --- libreoffice.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libreoffice.spec b/libreoffice.spec index fe3a534..693e443 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -61,6 +61,7 @@ Version: %{libo_version}.1 Release: 7%{?libo_prerelease}%{anolis_release}%{?dist} License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0 URL: http://www.libreoffice.org/ +Excludearch: loongarch64 Source0: %{source_url}/libreoffice-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz Source1: %{source_url}/libreoffice-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz.asc @@ -2288,6 +2289,7 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : * Thu May 18 2023 Liwei Ge - 1:7.1.8.1-7.0.1 - Add configuration file and vemdor for Anolis OS - Fit build on Anolis OS 8 +- Remove loongarch64 arch * Tue May 10 2022 Caolán McNamara - 1:7.1.8.1-7 - Resolves: rhbz#2081661 fix gtk_tree_view_scroll_to_cell assert -- Gitee