From b921f5937ab2a83006c08cdcc4ad0a4bdaf3f569db5e80c24954315279381729 Mon Sep 17 00:00:00 2001 From: Danilo Spinella Date: Thu, 15 Dec 2022 09:09:01 +0000 Subject: [PATCH 1/2] Accepting request 1043065 from LibreOffice:7.4 OBS-URL: https://build.opensuse.org/request/show/1043065 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=1049 --- libreoffice.changes | 6 ++++++ libreoffice.spec | 3 +++ use-fixmath-shared-library.patch | 13 +++++++++++++ 3 files changed, 22 insertions(+) create mode 100644 use-fixmath-shared-library.patch diff --git a/libreoffice.changes b/libreoffice.changes index 036c9b8..06b12a8 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Dec 13 17:25:49 UTC 2022 - Danilo Spinella + +- Use fixmath shared library + * use-fixmath-shared-library.patch + ------------------------------------------------------------------- Wed Nov 23 15:44:20 UTC 2022 - Danilo Spinella diff --git a/libreoffice.spec b/libreoffice.spec index 1f9ea0d..c401bf9 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -111,6 +111,8 @@ Patch11: fix_webp_on_sle12_sp5.patch Patch12: fix_harfbuzz_on_sle12_sp5.patch # PATCH-FIX-UPSTREAM remove egrep/fgrep calls Patch13: libreoffice-7.4.1.2-grep.patch +# PATCH-FIX-SUSE use fixmath shared library +Patch14: use-fixmath-shared-library.patch # Build with java 8 Patch101: 0001-Revert-java-9-changes.patch # try to save space by using hardlinks @@ -1034,6 +1036,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo %patch101 -p1 %endif %patch13 -p1 +%patch14 -p1 %patch990 -p1 %patch991 -p1 diff --git a/use-fixmath-shared-library.patch b/use-fixmath-shared-library.patch new file mode 100644 index 0000000..1bd6978 --- /dev/null +++ b/use-fixmath-shared-library.patch @@ -0,0 +1,13 @@ +Index: libreoffice-7.4.3.2/configure.ac +=================================================================== +--- libreoffice-7.4.3.2.orig/configure.ac ++++ libreoffice-7.4.3.2/configure.ac +@@ -10594,7 +10594,7 @@ if test "$with_system_libfixmath" = "yes + AC_LANG_PUSH([C++]) + AC_CHECK_HEADER([libfixmath/fix16.hpp], [], + [AC_MSG_ERROR([libfixmath/fix16.hpp not found. install libfixmath])], []) +- AC_CHECK_LIB([libfixmath], [fix16_mul], [:], [AC_MSG_ERROR(libfixmath lib not found or functional)], []) ++ AC_SEARCH_LIBS([fix16_mul], [fixmath, libfixmath], [], [AC_MSG_ERROR(libfixmath lib not found or functional)], []) + AC_LANG_POP([C++]) + else + AC_MSG_RESULT([internal]) From 45b243a90a2fbe4a28416a9171993121bb7c8a2549bd48cfbd95f15508765f05 Mon Sep 17 00:00:00 2001 From: Danilo Spinella Date: Thu, 15 Dec 2022 15:18:25 +0000 Subject: [PATCH 2/2] Accepting request 1043167 from LibreOffice:7.4 OBS-URL: https://build.opensuse.org/request/show/1043167 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=1050 --- use-fixmath-shared-library.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/use-fixmath-shared-library.patch b/use-fixmath-shared-library.patch index 1bd6978..0e10a2e 100644 --- a/use-fixmath-shared-library.patch +++ b/use-fixmath-shared-library.patch @@ -7,7 +7,7 @@ Index: libreoffice-7.4.3.2/configure.ac AC_CHECK_HEADER([libfixmath/fix16.hpp], [], [AC_MSG_ERROR([libfixmath/fix16.hpp not found. install libfixmath])], []) - AC_CHECK_LIB([libfixmath], [fix16_mul], [:], [AC_MSG_ERROR(libfixmath lib not found or functional)], []) -+ AC_SEARCH_LIBS([fix16_mul], [fixmath, libfixmath], [], [AC_MSG_ERROR(libfixmath lib not found or functional)], []) ++ AC_SEARCH_LIBS([fix16_mul], [fixmath libfixmath], [:], [AC_MSG_ERROR(libfixmath lib not found or functional)], []) AC_LANG_POP([C++]) else AC_MSG_RESULT([internal])