libreoffice: rebuild on x86 (#6609)

* libreoffice: fixed build on x86
2026-04-09 05:10:05 +02:00 · 2022-02-20 09:47:49 -08:00
parent 5212f28802
commit b9af1ec7df
2 changed files with 104 additions and 25 deletions
--- a/app-office/libreoffice/libreoffice-6.4.7.2.recipe
+++ b/app-office/libreoffice/libreoffice-6.4.7.2.recipe
@@ -17,7 +17,7 @@ and Open Source office suite on the market:
 HOMEPAGE="https://www.libreoffice.org/"
 COPYRIGHT="2000-2020 LibreOffice contributors"
 LICENSE="MPL v2.0"
-REVISION="7"
+REVISION="8"

 SOURCE_URI="https://github.com/LibreOffice/core/archive/libreoffice-$portVersion.tar.gz"
 SOURCE_DIR="core-libreoffice-$portVersion"
--- a/app-office/libreoffice/patches/libreoffice-6.4.7.2.patchset
+++ b/app-office/libreoffice/patches/libreoffice-6.4.7.2.patchset
@@ -1,4 +1,4 @@
-From c03536371bc767970d464a0bde4dc30970421e8e Mon Sep 17 00:00:00 2001
+From 48ac97a8b3f1c45aec5c4da6697271271a40447b Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Sat, 15 Feb 2020 14:52:59 +0300
 Subject: Make Elementary the default on Haiku
@@ -19,10 +19,10 @@ index 225414f..a971e11 100644
     OUString r;
     if ( desktopEnvironment.equalsIgnoreAsciiCase("plasma5") ||
 -- 
-2.26.0
+2.30.2


-From 9b04dafc3824d3d433b42d3fe66ac1848d53d58f Mon Sep 17 00:00:00 2001
+From fd45d44ed4bf5ae2e2bf5133d717d06bdb02e80f Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Wed, 24 Oct 2018 17:01:09 +0300
 Subject: Show used vcl backend on Haiku
@@ -42,10 +42,10 @@ index c4c3be9..119380d 100644
     aDetails.append( GetToolkitName() );
     aDetails.append( "; " );
 -- 
-2.26.0
+2.30.2


-From 1053d9e72ecc2d89410bc877c6b667b2048035b9 Mon Sep 17 00:00:00 2001
+From 4cb5c782004fad268369ae122a2bf768fef8afa4 Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Wed, 24 Oct 2018 17:01:34 +0300
 Subject: Identify Haiku in about window
@@ -65,10 +65,10 @@ index b661163..329265a 100644
     return aKernelVer;
 }
 -- 
-2.26.0
+2.30.2


-From e63502e45d5c100a5bbd80269c9dc9f14d2c1b8b Mon Sep 17 00:00:00 2001
+From f7bb3b40c0db4cb585ff3194d56851cc198a85a1 Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Wed, 24 Oct 2018 17:02:04 +0300
 Subject: Workaround a crash on quit. See Haiku #13159
@@ -102,10 +102,10 @@ index 643c42a..d4b47cb 100644
     return ret;
 }
 -- 
-2.26.0
+2.30.2


-From e96b7cda0014ad783122c456a76cde523b5c8cc5 Mon Sep 17 00:00:00 2001
+From 6d24f90e27eded9fb6ce8e810ce2204f281d4cd3 Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Sat, 15 Feb 2020 15:04:53 +0300
 Subject: Implement ShellExec on Haiku
@@ -126,10 +126,10 @@ index 3daea4a..d114d79 100644
         // Just use xdg-open on non-Mac
         aBuffer.append("/usr/bin/xdg-open");
 -- 
-2.26.0
+2.30.2


-From 5299c0b1c26ecce9ee151b89f85a710b5f710a1f Mon Sep 17 00:00:00 2001
+From 100bbddc67616bec1cea5c1e3026bf5d92400b27 Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Sat, 20 Jul 2019 01:18:50 +0300
 Subject: Comment out linking with pthread
@@ -153,10 +153,10 @@ index 8854aab..f0489a8 100644
 gb_CXXFLAGS := \
 	$(gb_CXXFLAGS_COMMON) \
 -- 
-2.26.0
+2.30.2


-From 9d72216b26b85f0a5abbd8e29485b66364f202ef Mon Sep 17 00:00:00 2001
+From de8ccf90be170c93118a8ca834f6be76299647d2 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Sun, 11 Aug 2019 11:46:49 +1000
 Subject: Workaround for ambiguous methods
@@ -198,10 +198,10 @@ index 8636d6b..0defdfc 100644
                         pPatternAttr->GetItemSet().Put( aItem );
                         SetPatternArea( nTempStartRow, nTempEndRow, std::move(pPatternAttr), true );
 -- 
-2.26.0
+2.30.2


-From 2c1bab9663a4338ef01868308d6cd5b601510e23 Mon Sep 17 00:00:00 2001
+From 6f74461991764e2aa85a6398f98f70cd68f1dd84 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Sun, 11 Aug 2019 11:47:40 +1000
 Subject: Add XP_HAIKU defs for xmlsec
@@ -242,10 +242,10 @@ index bd2cb6a..9d6a90c 100644
 $(eval $(call gb_Library_add_libs,xsec_xmlsec,\
 	$(call gb_UnpackedTarball_get_dir,xmlsec)/src/nss/.libs/libxmlsec1-nss.a \
 -- 
-2.26.0
+2.30.2


-From 632ddc27944cfa8be5db73aa0d0be9b62970a487 Mon Sep 17 00:00:00 2001
+From 279237b4cf6bed4d76fb77bd23bbf1eb5ff9a4a7 Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Sat, 15 Feb 2020 15:08:51 +0300
 Subject: Cast to boolean
@@ -344,10 +344,10 @@ index 8a57f55..4835901 100644
     jcopy_markers_execute(&aSourceInfo, &aDestinationInfo, aCopyOption);
     jtransform_execute_transformation(&aSourceInfo, &aDestinationInfo, aSourceCoefArrays, &aTransformOption);
 -- 
-2.26.0
+2.30.2


-From e116706a86fc12824929f9d769b72a89d08841f8 Mon Sep 17 00:00:00 2001
+From fff5e4c77ae219e8130cda8e02d7a552e9a3d9ce Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Sat, 15 Feb 2020 17:45:08 +0300
 Subject: Revert fstack-protector check removal in
@@ -355,7 +355,7 @@ Subject: Revert fstack-protector check removal in


 diff --git a/config_host.mk.in b/config_host.mk.in
-index e47ca61..3c3eb35 100644
+index 1b5fa47..0e4d79e 100644
 --- a/config_host.mk.in
 +++ b/config_host.mk.in
@@ -244,6 +244,7 @@ export USING_X11=@USING_X11@
@@ -367,10 +367,10 @@ index e47ca61..3c3eb35 100644
 export HAVE_GCC_BUILTIN_FFS=@HAVE_GCC_BUILTIN_FFS@
 export HAVE_GCC_FNO_ENFORCE_EH_SPECS=@HAVE_GCC_FNO_ENFORCE_EH_SPECS@
 diff --git a/configure.ac b/configure.ac
-index c0a09f1..b3a1eec 100644
+index 388bee3..352aa6a 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -6203,6 +6203,17 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
+@@ -6213,6 +6213,17 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
         AC_MSG_RESULT([no])
     fi
 
@@ -388,7 +388,7 @@ index c0a09f1..b3a1eec 100644
     AC_MSG_CHECKING([whether $CC_BASE supports atomic functions])
     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[
     int v = 0;
-@@ -6374,6 +6385,7 @@ AC_LANG_POP([C++])
+@@ -6384,6 +6395,7 @@ AC_LANG_POP([C++])
 fi
 
 AC_SUBST(HAVE_GCC_AVX)
@@ -429,5 +429,84 @@ index 712a61d..2c3d5f1 100644
 ifneq ($(ENABLE_PCH),)
 ifeq ($(COM_IS_CLANG),TRUE)
 -- 
-2.26.0
+2.30.2
+
+
+From f549994ffcc7ff9f6e6ed0439eea9f14c764f849 Mon Sep 17 00:00:00 2001
+From: Ken Mays <kmays2000@gmail.com>
+Date: Tue, 9 Feb 2021 12:15:02 +0300
+Subject: Add CSTDDEF include to O3TL
+
+
+diff --git a/include/o3tl/lru_map.hxx b/include/o3tl/lru_map.hxx
+index e822fde..33a1487 100644
+--- a/include/o3tl/lru_map.hxx
+++ b/include/o3tl/lru_map.hxx
+@@ -14,6 +14,7 @@
+ #include <cassert>
+ #include <list>
+ #include <unordered_map>
+#include <cstddef>
+ 
+ namespace o3tl
+ {
+-- 
+2.30.2
+
+
+From f21b6bd70c6ae4f8e035443f9131d076064b67e1 Mon Sep 17 00:00:00 2001
+From: Ken Mays <kmays2000@gmail.com>
+Date: Tue, 9 Feb 2021 12:26:19 +0300
+Subject: Fix Bison 3.8 issue with SQLbison.y
+
+
+diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
+index c9d423e..b444277 100644
+--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
+@@ -74,10 +74,15 @@ inline connectivity::OSQLInternalNode* newNode(const OUString& _newValue,
+ 
+ // yyi is the internal number of the rule that is currently being reduced
+ // This can be mapped to external rule number via the yyrmap.
+#if YYBISON >= 30800
+#define SQL_NEW_RULE 			newNode("", SQLNodeType::Rule, yyr1[yyrule])
+#define SQL_NEW_LISTRULE 		newNode("", SQLNodeType::ListRule, yyr1[yyrule])
+#define SQL_NEW_COMMALISTRULE   newNode("", SQLNodeType::CommaListRule, yyr1[yynrule])
+#else
+ #define SQL_NEW_RULE 			newNode("", SQLNodeType::Rule, yyr1[yyn])
+ #define SQL_NEW_LISTRULE 		newNode("", SQLNodeType::ListRule, yyr1[yyn])
+ #define SQL_NEW_COMMALISTRULE   newNode("", SQLNodeType::CommaListRule, yyr1[yyn])
+-
+#endif
+ 
+ extern connectivity::OSQLParser* xxx_pGLOBAL_SQLPARSER;
+ 
+-- 
+2.30.2
+
+
+From 4b0704963393ad3fd3a814f3d96d62b1e4ddbb9c Mon Sep 17 00:00:00 2001
+From: Ken Mays <kmays2000@gmail.com>
+Date: Tue, 9 Feb 2021 13:15:24 +0300
+Subject: Fix GCC11/12 issue with SAL_STREAM
+
+
+diff --git a/include/sal/log.hxx b/include/sal/log.hxx
+index 00d533a..f85c7d8 100644
+--- a/include/sal/log.hxx
+++ b/include/sal/log.hxx
+@@ -161,7 +161,10 @@ inline char const * unwrapStream(SAL_UNUSED_PARAMETER StreamIgnore const &) {
+ 
+     @since LibreOffice 3.5
+ */
+-#if defined _LIBCPP_VERSION || (defined _MSC_VER && _MSC_VER >= 1915)
+#if defined _LIBCPP_VERSION \
+    || (defined _GLIBCXX_RELEASE \
+        && (_GLIBCXX_RELEASE >= 12 || (_GLIBCXX_RELEASE == 11 && __GLIBCXX__ > 20210428))) \
+    || (defined _MSC_VER && _MSC_VER >= 1915)
+ #define SAL_STREAM(stream) \
+     (::std::ostringstream() << stream).str()
+ #else
+-- 
+2.30.2