Tue Sep 7 09:49:06 2021 UTC ()
libreoffice: Fix building on NetBSD 9.x


(nia)
diff -r1.117 -r1.118 pkgsrc/misc/libreoffice/distinfo
diff -r0 -r1.1 pkgsrc/misc/libreoffice/patches/patch-sw_source_uibase_config_usrpref.cxx
cvs diff -r1.117 -r1.118 pkgsrc/misc/libreoffice/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/libreoffice/distinfo 2021/08/22 02:41:50 1.117
+++ pkgsrc/misc/libreoffice/distinfo 2021/09/07 09:49:05 1.118
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.117 2021/08/22 02:41:50 ryoon Exp $ 1$NetBSD: distinfo,v 1.118 2021/09/07 09:49:05 nia Exp $
2 2
3SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093 3SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
4RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b 4RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
5SHA512 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46 5SHA512 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46
6Size (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 96939 bytes 6Size (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 96939 bytes
7SHA1 (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = eb99dfe3b37e36f55f4b2053bcf6eb3e3b4ac72a 7SHA1 (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = eb99dfe3b37e36f55f4b2053bcf6eb3e3b4ac72a
8RMD160 (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = 8e3d713fc8b515116baebaa0a6904f1371fb96eb 8RMD160 (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = 8e3d713fc8b515116baebaa0a6904f1371fb96eb
9SHA512 (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = 2fa01482dd74fcb62176317f7dcda504472f28f7eda22882903e4e71272743228e5b9d7614fb554e6bd390c0dbcfd8a31dcdbb29a7f54266f376ff2ee376178f 9SHA512 (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = 2fa01482dd74fcb62176317f7dcda504472f28f7eda22882903e4e71272743228e5b9d7614fb554e6bd390c0dbcfd8a31dcdbb29a7f54266f376ff2ee376178f
10Size (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = 811606 bytes 10Size (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = 811606 bytes
11SHA1 (libreoffice/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip) = bdc4350b771c6c23e8a40b2413595d1055cff2ab 11SHA1 (libreoffice/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip) = bdc4350b771c6c23e8a40b2413595d1055cff2ab
12RMD160 (libreoffice/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip) = 4d9bcd7680c173333ddbe3fd3b386acc483322c1 12RMD160 (libreoffice/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip) = 4d9bcd7680c173333ddbe3fd3b386acc483322c1
13SHA512 (libreoffice/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip) = f5628efe484b6220d0bf8177aa826c28e7a36f0bcca2019e057c20f5915d579057f931377ec686dbfeebef05fcf6453472be77a21ef282bd9d8d0eaf62549a49 13SHA512 (libreoffice/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip) = f5628efe484b6220d0bf8177aa826c28e7a36f0bcca2019e057c20f5915d579057f931377ec686dbfeebef05fcf6453472be77a21ef282bd9d8d0eaf62549a49
14Size (libreoffice/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip) = 5522795 bytes 14Size (libreoffice/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip) = 5522795 bytes
@@ -243,17 +243,18 @@ SHA1 (patch-external_pdfium_pkgsrc.patch @@ -243,17 +243,18 @@ SHA1 (patch-external_pdfium_pkgsrc.patch
243SHA1 (patch-external_postgresql_ExternalProject__postgresql.mk) = 545a10100e439b996e3f235a8a5dff682fd48879 243SHA1 (patch-external_postgresql_ExternalProject__postgresql.mk) = 545a10100e439b996e3f235a8a5dff682fd48879
244SHA1 (patch-external_skia_Library__skia.mk) = bf97a0724bd8cb5e249b63e60e85e2e7217cfdad 244SHA1 (patch-external_skia_Library__skia.mk) = bf97a0724bd8cb5e249b63e60e85e2e7217cfdad
245SHA1 (patch-external_skia_UnpackedTarball__skia.mk) = 670eeb8c9a0fa0b15b1f192e7a3b9a7a749209f7 245SHA1 (patch-external_skia_UnpackedTarball__skia.mk) = 670eeb8c9a0fa0b15b1f192e7a3b9a7a749209f7
246SHA1 (patch-external_skia_netbsd.patch.0) = aee67c27c7507003bade1fe93d82bd56d0890840 246SHA1 (patch-external_skia_netbsd.patch.0) = aee67c27c7507003bade1fe93d82bd56d0890840
247SHA1 (patch-i18nutil_source_utility_unicode.cxx) = 014d48574a379f92f2d0afe3c91d2c2956708dd8 247SHA1 (patch-i18nutil_source_utility_unicode.cxx) = 014d48574a379f92f2d0afe3c91d2c2956708dd8
248SHA1 (patch-instsetoo__native_inc__openoffice_unix_find-requires-x11.sh) = e871e2096c367e742dc5758fe60ae819846def29 248SHA1 (patch-instsetoo__native_inc__openoffice_unix_find-requires-x11.sh) = e871e2096c367e742dc5758fe60ae819846def29
249SHA1 (patch-sal_osl_unx_system.hxx) = 478dd47dc512d283a554600951010bbaa10c2c0e 249SHA1 (patch-sal_osl_unx_system.hxx) = 478dd47dc512d283a554600951010bbaa10c2c0e
250SHA1 (patch-sal_rtl_cipher.cxx) = e5e46d0b96e25572be86bf26f0053436859736cd 250SHA1 (patch-sal_rtl_cipher.cxx) = e5e46d0b96e25572be86bf26f0053436859736cd
251SHA1 (patch-sc_source_core_tool_math.cxx) = 94ea14291d87ab7ad43a8f277738685e2743cb4a 251SHA1 (patch-sc_source_core_tool_math.cxx) = 94ea14291d87ab7ad43a8f277738685e2743cb4a
252SHA1 (patch-slideshow_source_engine_box2dtools.cxx) = b59a872552754af29ce6208fd9dd3e25633c9fba 252SHA1 (patch-slideshow_source_engine_box2dtools.cxx) = b59a872552754af29ce6208fd9dd3e25633c9fba
253SHA1 (patch-solenv_gbuild_platform_NETBSD_AARCH64_GCC.mk) = eda8dbd0e9394b2dde2f98c0df39e7e9888f49dc 253SHA1 (patch-solenv_gbuild_platform_NETBSD_AARCH64_GCC.mk) = eda8dbd0e9394b2dde2f98c0df39e7e9888f49dc
254SHA1 (patch-store_source_storbase.hxx) = 69c58db3984f22de45c7e32fdfd4f7c28340adf1 254SHA1 (patch-store_source_storbase.hxx) = 69c58db3984f22de45c7e32fdfd4f7c28340adf1
255SHA1 (patch-sw_source_core_bastyp_calc.cxx) = 317f206500c88aea4a645a6f1dea8e0a837ad581 255SHA1 (patch-sw_source_core_bastyp_calc.cxx) = 317f206500c88aea4a645a6f1dea8e0a837ad581
 256SHA1 (patch-sw_source_uibase_config_usrpref.cxx) = 8f761c368e38435aea53bfcfcdc1f3aba0c73d03
256SHA1 (patch-vcl_unx_generic_app_geninst.cxx) = 0bc6d8b22236ab60fce0aa1923514b7eec162ba6 257SHA1 (patch-vcl_unx_generic_app_geninst.cxx) = 0bc6d8b22236ab60fce0aa1923514b7eec162ba6
257SHA1 (patch-xmloff_source_draw_ximp3dscene.cxx) = bdd0b2563e54424dd468c2334e17ab23057a69fb 258SHA1 (patch-xmloff_source_draw_ximp3dscene.cxx) = bdd0b2563e54424dd468c2334e17ab23057a69fb
258SHA1 (patch-xmlsecurity_source_gpg_CertificateImpl.hxx) = 56ac06159e0805edc1685d271b632f1af438be86 259SHA1 (patch-xmlsecurity_source_gpg_CertificateImpl.hxx) = 56ac06159e0805edc1685d271b632f1af438be86
259SHA1 (patch-xmlsecurity_source_gpg_xmlsignature__gpgimpl.cxx) = 151ccef192a8491bca5d39f2a02d938b3e4fad67 260SHA1 (patch-xmlsecurity_source_gpg_xmlsignature__gpgimpl.cxx) = 151ccef192a8491bca5d39f2a02d938b3e4fad67
File Added: pkgsrc/misc/libreoffice/patches/patch-sw_source_uibase_config_usrpref.cxx
$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();