pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/misc/libreoffice libreoffice: Fix building on NetBSD 9.x
details: https://anonhg.NetBSD.org/pkgsrc/rev/94dd7a614484
branches: trunk
changeset: 458028:94dd7a614484
user: nia <nia%pkgsrc.org@localhost>
date: Tue Sep 07 09:49:05 2021 +0000
description:
libreoffice: Fix building on NetBSD 9.x
diffstat:
misc/libreoffice/distinfo | 3 +-
misc/libreoffice/patches/patch-sw_source_uibase_config_usrpref.cxx | 19 ++++++++++
2 files changed, 21 insertions(+), 1 deletions(-)
diffs (40 lines):
diff -r e7da90fe898d -r 94dd7a614484 misc/libreoffice/distinfo
--- a/misc/libreoffice/distinfo Tue Sep 07 00:54:10 2021 +0000
+++ b/misc/libreoffice/distinfo Tue Sep 07 09:49:05 2021 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.117 2021/08/22 02:41:50 ryoon Exp $
+$NetBSD: distinfo,v 1.118 2021/09/07 09:49:05 nia Exp $
SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
@@ -253,6 +253,7 @@
SHA1 (patch-solenv_gbuild_platform_NETBSD_AARCH64_GCC.mk) = eda8dbd0e9394b2dde2f98c0df39e7e9888f49dc
SHA1 (patch-store_source_storbase.hxx) = 69c58db3984f22de45c7e32fdfd4f7c28340adf1
SHA1 (patch-sw_source_core_bastyp_calc.cxx) = 317f206500c88aea4a645a6f1dea8e0a837ad581
+SHA1 (patch-sw_source_uibase_config_usrpref.cxx) = 8f761c368e38435aea53bfcfcdc1f3aba0c73d03
SHA1 (patch-vcl_unx_generic_app_geninst.cxx) = 0bc6d8b22236ab60fce0aa1923514b7eec162ba6
SHA1 (patch-xmloff_source_draw_ximp3dscene.cxx) = bdd0b2563e54424dd468c2334e17ab23057a69fb
SHA1 (patch-xmlsecurity_source_gpg_CertificateImpl.hxx) = 56ac06159e0805edc1685d271b632f1af438be86
diff -r e7da90fe898d -r 94dd7a614484 misc/libreoffice/patches/patch-sw_source_uibase_config_usrpref.cxx
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/libreoffice/patches/patch-sw_source_uibase_config_usrpref.cxx Tue Sep 07 09:49:05 2021 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-sw_source_uibase_config_usrpref.cxx,v 1.1 2021/09/07 09:49:05 nia Exp $
+
+Disable unnecessary code to resolve "std::strcmp not found" problem on
+NetBSD 9.x
+
+--- sw/source/uibase/config/usrpref.cxx.orig 2021-09-07 09:44:19.193281013 +0000
++++ sw/source/uibase/config/usrpref.cxx
+@@ -109,11 +109,6 @@ Sequence<OUString> SwContentViewConfig::
+ "Display/ShowChangesInMargin", // 24
+ "Display/DefaultAnchor" // 25
+ };
+-#if defined(__GNUC__) && !defined(__clang__)
+- // clang 8.0.0 says strcmp isn't constexpr
+- static_assert(std::strcmp("Update/Link", aPropNames[g_UpdateLinkIndex]) == 0);
+- static_assert(std::strcmp("Display/DefaultAnchor", aPropNames[g_DefaultAnchor]) == 0);
+-#endif
+ const int nCount = m_bWeb ? 12 : SAL_N_ELEMENTS(aPropNames);
+ Sequence<OUString> aNames(nCount);
+ OUString* pNames = aNames.getArray();
Home |
Main Index |
Thread Index |
Old Index