[pkgsrc/trunk]: pkgsrc/misc/libreoffice libreoffice: Update to 6.4.5.2

[ryoon <ryoon%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/edb69c6c92a5
branches:  trunk
changeset: 435287:edb69c6c92a5
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Sat Jul 04 05:02:14 2020 +0000

description:
libreoffice: Update to 6.4.5.2

Changelog:
6.4.5.2
Bugs fixed compared to 6.4.5 rc1:

    ofz#20904 check bounds [Caolán McNamara]
    tdf#83309 FILEOPEN: NUMBERING: text paragraph indentation/tab stops in .DOCX displayed incorrectly with tab [Vasily Melenchuk]
    tdf#120394 FILEOPEN: Numbers appear in numbered list MSO created in attached DOC without visible number format [Vasily Melenchuk]
    tdf#121384 Crash of Writer opening any document with "invalid" python file in home directory (linux) [Caolán McNamara]
    tdf#130999 Greek dictionary cannot be loaded on Collabora Online (4.2.0.4) [Andras Timar]
    tdf#131353 Core build fails with poppler >= 0.86.0 [Martin Whitaker]
    tdf#131357 Help files lack syntax definition for some Calc functions [Steve Fanning]
    tdf#132093 Editing snap lines: dialog decreases entered values when drawing scale is 1:many [Stephan Bergmann]
    tdf#132254 When copying a block/rectangle, the pasted lines are in reverse order [Michael Stahl]
    tdf#132321 Deleting a paragraph at start or end of section deletes the object anchored to it [Michael Stahl]
    tdf#132326 CRASH: undoing paste of frames [Michael Stahl]
    tdf#132431 Crash: "vector::_M_fill_insert" with large sumifs [Luboš Luňák]
    tdf#132597 Crash in: swlo.dll [Michael Stahl]
    tdf#132725 Crash in: BigPtrArray::Index2Block(unsigned __int64) anchor to paragraph [Michael Stahl]
    tdf#132744 Images anchored to character in table not pasted [Michael Stahl]
    tdf#132754 DOCX import: invalid list start numbering with 0.0.0. [Vasily Melenchuk]
    tdf#133326 Crash after redo (steps in comment 5) [Noel Grandin]
    tdf#133629 FORMATTING: Calc crashes on setting borders to all cells on more than one sheet simultaneously [Noel Grandin]
    tdf#133641 CRASH: after clicking on a drop-down form [Michael Stahl]
    tdf#133862 Crash when trying to customize toolbar during embedded Equation editing [Caolán McNamara]
    tdf#133981 CRASH: Undoing deletion of selection [Michael Stahl]
    tdf#133982 CRASH: copying content in nested table [Michael Stahl]
    tdf#133985 "Merge and Center Cells" dialog: default (active) button is "Cancel" [Caolán McNamara]
    tdf#133990 CRASH: Undoing table deletion [Michael Stahl]
    tdf#134019 Calc FILEOPEN Crash in: sclo.dll [Caolán McNamara]
    tdf#134021 Crash swlo!SwFrame::CheckPageDescs+0x12d6: [Michael Stahl]
    tdf#134023 Select the table by dragging over the columns become harder [Justin Luth]
    tdf#134243 Hang launching mailmerge wizard with a specific file [Caolán McNamara]

6.4.5.1
Bugs fixed compared to 6.4.4 RC2

    deb#961473 set A4 in extras/source/shellnew templates [Rene Engelhard]
    rhbz#1844263 unchecked nullptr return from SfxViewFrame::Current() [Caolán McNamara]
    tdf#37268 Data Pilot and sheet local defined named range insert menu entry inactive [Julien Nabet]
    tdf#64690 EDITING: Process hang on find/replace in Basic code involving "\&" [Andreas Heinisch]
    tdf#78352 FILEOPEN: DOCX - Incorrect space between bullet and first line text due to wrong tab stop at value [Vasily Melenchuk]
    tdf#79082 FILESAVE: Tab positions not being retained in PPT and being lost in PPTX [Piet van Oostrum, Samuel Mehrbrodt]
    tdf#79998 FILESAVE: XLSX export breaks or some sheet names (sheet name length >31 characters) [Serge Krot]
    tdf#94628 Fileopen: Docx custom numbering triangle symbol incorrectly displayed as a dot [Vasily Melenchuk]
    tdf#95189 Paragraph numbering on one paragraph resets when it shouldn't [Vasily Melenchuk]
    tdf#97416 Editing: Database password properties in ODB file not re-settable via UI [Julien Nabet]
    tdf#97694 Base macros cannot be digitally signed [Samuel Mehrbrodt]
    tdf#101856 MAILMERGE Add conditional to expand / collapse bookmarks [Serge Krot]
    tdf#102625 Formula editor breaks surrogate pairs [Julien Nabet]
    tdf#103602 new documents fail ODF validation with Error: unexpected attribute "draw:fill" [Michael Stahl]
    tdf#104017 FILESAVE: DOC: New rows are displayed on table after RT [Justin Luth]
    tdf#106181 FILESAVE: Check boxes get lost when saving as .XLSX [Serge Krot]
    tdf#108496 FILEOPEN: DOCX file numbered list restarted from 1 following section break assumes previous numbered list sequence after 1 [Vasily Melenchuk]
    tdf#114258 BASIC: Bad select after scrolling in Object Catalog [Caolán McNamara]
    tdf#116883 FILEOPEN DOCX Numbering format shown as "1.1.1-" even though it should be "1-1-1-" [Vasily Melenchuk]
    tdf#120394 FILEOPEN: Numbers appear in numbered list MSO created in attached DOC without visible number format [Vasily Melenchuk]
    tdf#122408 linked subform shows empty when slave field is a function call [Lionel Elie Mamane]
    tdf#122461 SQL parser doesn't accept identifiers containing newlines [and gives a syntax error when Query Wizard correctly generates a query containing one] [Lionel Elie Mamane]
    tdf#123801 Small caps captions do not display the Figure/Illustration/etc. category label [Caolán McNamara]
    tdf#124790 Mailmerge: Background image in printed address labels not visible [Miklos Vajna]
    tdf#125609 radiobutton receives item status changed event after listbox value selection [Noel Grandin]
    tdf#125981 The "Default" button for quotes in AutoCorrect options doesn't reset the display of replacement [Caolán McNamara]
    tdf#126025 Extrusion on/off is faulty in saving for Fontwork favorite 40 [Stephan Bergmann]
    tdf#126468 Unable to deselect 'Visible' flags in Base query, if field is set for "sorting" [Julien Nabet]
    tdf#127778 FILEOPEN DOCX Margin setting is not considered if smaller than heading size [Miklos Vajna]
    tdf#127889 Can't unmerge cells using tabbed user interface [andreas kainz]
    tdf#128665 EDITING: Undo takes action on another shape [Vasily Melenchuk]
    tdf#128689 Request to Localize More Formatting Icons into Korean UI [Rizal Muttaqin]
    tdf#129620 Crash when I press down arrow in edit header dialog using e.g, Japanese keyboard [Caolán McNamara]
    tdf#129702 [UI] Smart tags wrongly listed in AutoCorrect options dialog [Caolán McNamara]
    tdf#130354 Cannot sign existing PDF, ' .tmp does not exist' from 6.4 [Miklos Vajna]
    tdf#130479 Inlined BMP fills do not render [Miklos Vajna]
    tdf#130770 Autofilter not updated on data change (automatically or manually) [scito]
    tdf#130792 Draw crashes when trying to add a point in a multiline ( steps in comment 8 ) [Noel Grandin]
    tdf#131076 UI: Text import dialogue default focus is 'Character set' instead of 'OK' [Caolán McNamara]
    tdf#131333 Cannot change data point icons in Calc's XY or points and lines chart [Caolán McNamara]
    tdf#131366 Crash when I type the letter "i" after the letter "f" in a paragraph with style "emphasis" and font "Linux Biolinum G" [Gabor Kelemen]
    tdf#131423 Function Wizard in Calc allows too many parameters [Eike Rathke]
    tdf#131684 Crash when doing undoing [Xisco Fauli, Michael Stahl]
    tdf#132169 Drawing line width changes randomly while changing [Caolán McNamara]
    tdf#132173 Function Wizard does not enter array formulas with inline arrays correctly [Eike Rathke]
    tdf#132187 For every repeated paste the page count (incl. content) doubles [Xisco Fauli]
    tdf#132236 Crash in: swlo.dll ( steps in comment 12) [Michael Stahl]
    tdf#132267 Scrollers for long menus are not shown / black [Miklos Vajna]
    tdf#132514 FILEOPEN DOCX Table character direct formatting not applied with another table in footer [László Németh]
    tdf#132594 No display of labels in pie charts if xlsx created with Excel 2007 (regression in 6.4 vs 6.0 and 5.2) [Tünde Tóth]
    tdf#132596 Crash in: SwPosition::SwPosition(SwPosition const &) [Michael Stahl]
    tdf#132623 Custom properties dialog contents don't expand to fill the dialog when resized [andreas kainz]
    tdf#132626 CAPTION DIALOG: Can't type dot in caption category [STrunning mail merge wizard for doc from tdf#119942 [Caolán McNamara]
    tdf#132730 Assertion if apply Ctrl+Shift+M on group [Julien Nabet]
    tdf#132732 Restart Numbering in Paragraph with chosen Number impossible (GTK3) [Caolán McNamara]
    tdf#13273iklos Vajna]
    tdf#132814 EDITING: Impossible to change an existing Integer primarykey in MySQL/MariaDB to AutoValue in GUI [Julien Nabet]
    tdf#132832 XLayoutConstrains.calcAdjustedSize doesn't return proper size for multiline checkbox and hyperlink ementary, Sifr, Sukapura: Wrong folder action icons in open dialog with gen backend 
[Rizal Muttaqin]
    tdf#133012 elementary: The gripper icon looks like a “More Options” menu [Rizal Muttaqin]
    tdf#133036 CRASH: customizing notebookbar (gen) [Caolán McNamara]
    tdf#133053 Crash in: x11::SelectionManager::handleDragEvent [Caolán McNamara]
    tdf#133250 Colibre: Inconsistent Icon for Red, Blue and Green [Rizal Muttaqin]
    tdf#133267 Undo inserting a row above extremely slow [Luboš Luňák]
    tdf#133270 MAILMERGE progress is not updated during export of many files [Serge Krot]
    tdf#133271 FILESAVE: Vertical text saves as horizontal to ODT (but OK to DOCX) [Miklos Vajna]
    tdf#133348 Crash when using undo 3 times in comment reply [Julien Nabet]
    tdf#133411 Replacing lots of cell styles consumes too much memory/CPU [Caolán McNamara]
    tdf#133426 Crash attempting to save mail merge to file multiple times in parallel [Michael Weghorn]
    tdf#133474 FILEOPEN: DOC: Images are not loaded [Miklos Vajna]
    tdf#133595 FILESAVE XLSX Excel gives invalid content error when opening file with shape [Serge Krot]
    tdf#133604 FILESAVE: DOCX: fields are not displayed in MSO after RT [Michael Stahl]
    tdf#133633 LO crashes with SuperNova Magnifier & ScreenReader [Michael Weghorn]

diffstat:

 misc/libreoffice/Makefile                                               |   10 +-
 misc/libreoffice/distinfo                                               |   39 +-
 misc/libreoffice/patches/patch-configure.ac                             |   15 +-
 misc/libreoffice/patches/patch-download.lst                             |   12 +-
 misc/libreoffice/patches/patch-sc_source_core_opencl_formulagroupcl.cxx |  798 ----------
 5 files changed, 34 insertions(+), 840 deletions(-)

diffs (truncated from 964 to 300 lines):

diff -r d81ea6575a58 -r edb69c6c92a5 misc/libreoffice/Makefile
--- a/misc/libreoffice/Makefile Fri Jul 03 22:54:01 2020 +0000
+++ b/misc/libreoffice/Makefile Sat Jul 04 05:02:14 2020 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.232 2020/06/02 08:24:21 adam Exp $
+# $NetBSD: Makefile,v 1.233 2020/07/04 05:02:14 ryoon Exp $
 
-VERREL=                6.4.4
+VERREL=                6.4.5
 VERRC=         2
 VER=           ${VERREL}.${VERRC}
 DISTNAME=      libreoffice-${VER}
-PKGREVISION=   1
 CATEGORIES=    misc
 MASTER_SITES=  http://download.documentfoundation.org/libreoffice/src/${VERREL}/
 EXTRACT_SUFX=  .tar.xz
@@ -18,6 +17,11 @@
 
 USE_LANGUAGES= c gnu++17
 
+# Do not use alloca(3) in libc at least on NetBSD.
+BUILDLINK_TRANSFORM+=  opt:-std=c++17:-std=gnu++17
+BUILDLINK_TRANSFORM+=  opt:-std=c++1z:-std=gnu++1z
+BUILDLINK_TRANSFORM+=  opt:-std=c++2a:-std=gnu++2a
+
 SUBST_CLASSES+=                        use-bash
 SUBST_STAGE.use-bash=          pre-configure
 SUBST_MESSAGE.use-bash=                Using bash for configure script
diff -r d81ea6575a58 -r edb69c6c92a5 misc/libreoffice/distinfo
--- a/misc/libreoffice/distinfo Fri Jul 03 22:54:01 2020 +0000
+++ b/misc/libreoffice/distinfo Sat Jul 04 05:02:14 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.100 2020/05/23 10:45:48 ryoon Exp $
+$NetBSD: distinfo,v 1.101 2020/07/04 05:02:14 ryoon Exp $
 
 SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
 RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
@@ -172,22 +172,22 @@
 RMD160 (libreoffice/libre-hebrew-1.0.tar.gz) = e44c35266105eb06023bd75d16f8f297c63e886d
 SHA512 (libreoffice/libre-hebrew-1.0.tar.gz) = 609c8ef29a1eab9b027ea04abf14949e9a204cf826fb0a792dadd8a83fc49ac9610a0b3a2bd4b8988e615688c63d0ec08a89436134980b2a9667e8966a75a795
 Size (libreoffice/libre-hebrew-1.0.tar.gz) = 531276 bytes
-SHA1 (libreoffice/libreoffice-6.4.4.2.tar.xz) = 108a5efe59ba5242bf70aced1fe61f09c1c88896
-RMD160 (libreoffice/libreoffice-6.4.4.2.tar.xz) = f0e314b44fbf3b5997833dd3ee6334822819c6a2
-SHA512 (libreoffice/libreoffice-6.4.4.2.tar.xz) = 8e2b6a2d34fbc182ce4ec0b6d6bfb30665ff5cee0a27a22551c71d4eddf63b812d676ea8dea9a2e4bb028a2365b5e23908679efbe4696032e1abeedecb85b8d3
-Size (libreoffice/libreoffice-6.4.4.2.tar.xz) = 231325236 bytes
-SHA1 (libreoffice/libreoffice-dictionaries-6.4.4.2.tar.xz) = d489e66e633ade95e10cc44ece0003aa2f03b475
-RMD160 (libreoffice/libreoffice-dictionaries-6.4.4.2.tar.xz) = 77c5de9384c14976c07639d12d98ffc80dbeac06
-SHA512 (libreoffice/libreoffice-dictionaries-6.4.4.2.tar.xz) = db90516f448bb67b0e36fb3d97589253261a6d349e6b33842e59d817d9f9c1a4c0f56113f676cf2028d476766bcfd6ad87c7c84b4e7f605b2482842ea77dba71
-Size (libreoffice/libreoffice-dictionaries-6.4.4.2.tar.xz) = 45910896 bytes
-SHA1 (libreoffice/libreoffice-help-6.4.4.2.tar.xz) = 9b3978dc5b7d8960a09db0bc917dee3e14e51977
-RMD160 (libreoffice/libreoffice-help-6.4.4.2.tar.xz) = 48960be9ba1c677ebca908d3a2dcf5accbdebe14
-SHA512 (libreoffice/libreoffice-help-6.4.4.2.tar.xz) = 7084428e63a458c4e35c135b16dd980fa98695be0ba974cac656a7ef6cb15b059a082891c3f74b72a62f92549afefe46c14ab30b5491fd9e3fea6d5923720b3d
-Size (libreoffice/libreoffice-help-6.4.4.2.tar.xz) = 88296340 bytes
-SHA1 (libreoffice/libreoffice-translations-6.4.4.2.tar.xz) = 4b481868cc08ea83e5b388746a519b7c30bc08c9
-RMD160 (libreoffice/libreoffice-translations-6.4.4.2.tar.xz) = e0e5731012449bb5d5b57df5be6514e5334d69ba
-SHA512 (libreoffice/libreoffice-translations-6.4.4.2.tar.xz) = 8d52f17c50202884c9d18f70d0162a6caee27caf9ec1c52b963f97dfb122433ccdc204da153245901a1f92ead2655582fabb6fa6b9a890dec5a3eca03c3c148b
-Size (libreoffice/libreoffice-translations-6.4.4.2.tar.xz) = 172568720 bytes
+SHA1 (libreoffice/libreoffice-6.4.5.2.tar.xz) = f608d5e74b8d1b36d44f4998e369dbeaa9bf1b5d
+RMD160 (libreoffice/libreoffice-6.4.5.2.tar.xz) = 5e7464c9511b4e1ed4b3d7028d8cc84081dd5f0c
+SHA512 (libreoffice/libreoffice-6.4.5.2.tar.xz) = f0a5ac37b9c8e46bfd50bf9137d193a83d55d8d451c5b27d86b7f257633e861eb79422e1e64f7c462ae4a9045e00827beed302ab6f0773f8864c03bb11d3b752
+Size (libreoffice/libreoffice-6.4.5.2.tar.xz) = 236255044 bytes
+SHA1 (libreoffice/libreoffice-dictionaries-6.4.5.2.tar.xz) = 25f6b8002953c6fdd9bd34e888c690c8088267a7
+RMD160 (libreoffice/libreoffice-dictionaries-6.4.5.2.tar.xz) = 512dfa2dda9c34310c616b87b518b7e1433cae7b
+SHA512 (libreoffice/libreoffice-dictionaries-6.4.5.2.tar.xz) = 4a4f9346bc5bb67a21c6d3499f8a5bb0a837f579c198cf45946a43a61fdbc073b2abd5a3b4fe2f6579934cd83bb409b2019459e6b8967472401011834b7b7a14
+Size (libreoffice/libreoffice-dictionaries-6.4.5.2.tar.xz) = 47237244 bytes
+SHA1 (libreoffice/libreoffice-help-6.4.5.2.tar.xz) = 5a54938998c11e7e4697c524bf9ab45004fa2724
+RMD160 (libreoffice/libreoffice-help-6.4.5.2.tar.xz) = 0434426a9c8d97fffd13289f153f1e2f6b37cf2c
+SHA512 (libreoffice/libreoffice-help-6.4.5.2.tar.xz) = fffa5338baa5ebd7bdf607f83b31440c66c19c42136b41505074fe1a7a4bb1630e080e4fc2dd114f8ab0654507f4a84d4190bb134a4756d895ec350cccc10e11
+Size (libreoffice/libreoffice-help-6.4.5.2.tar.xz) = 88376816 bytes
+SHA1 (libreoffice/libreoffice-translations-6.4.5.2.tar.xz) = 11eee572ccf23e98131c66a2d9896e7a862bdfc2
+RMD160 (libreoffice/libreoffice-translations-6.4.5.2.tar.xz) = 81b8efaf389facb148ce0457609a55bbb125267a
+SHA512 (libreoffice/libreoffice-translations-6.4.5.2.tar.xz) = a7bc0f95edbeeea36fd832f5ce91e38e3803d7be1b56a5b3626cc5251eb6e1a25ad482b2cc1fb61a463470237805eecebaaf3efd375cb44e65b6cc5187cc8bfe
+Size (libreoffice/libreoffice-translations-6.4.5.2.tar.xz) = 173031776 bytes
 SHA1 (libreoffice/lxml-4.1.1.tgz) = 154279bc5939d7099697887ea15c5ca921abeaeb
 RMD160 (libreoffice/lxml-4.1.1.tgz) = 9d093324e4dd188f9885f2e4d3c19988e709dbbc
 SHA512 (libreoffice/lxml-4.1.1.tgz) = 9542e5206f9b2f9e072c52ef8e6cf44d1aaae8ae3e7ca7e820c1fac12e716503308ccb3cebc52155b4c93799f3ebca247781fc491524d004378bd26f5cddb9d1
@@ -220,10 +220,10 @@
 SHA1 (patch-autogen.sh) = eedd0091745cf6a32ee9b33227502baaa661270e
 SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx) = 2eed9efc4a145687f409ba87806147dac2210c68
 SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx) = e664faa4044feaafe8214fdf42f7d008b9aa29fc
-SHA1 (patch-configure.ac) = 7683e2cc8466f84263d9ccf45dfe2e4e4f3daaff
+SHA1 (patch-configure.ac) = bd4ab656c4fb6cbbf7c44c6f1abbb963d1b208b8
 SHA1 (patch-desktop_scripts_soffice.sh) = e6342e08781ca8dac72a1f28407517d79155577c
 SHA1 (patch-desktop_unx_source_pagein.c) = 0aa2b289df6d0fa524bf057d532aa5f9ceb6dde5
-SHA1 (patch-download.lst) = 894718eae9d403178b2e5d3b39b06fba655b3678
+SHA1 (patch-download.lst) = 019ff9061a4a307f451e80db85e5da722fdf313e
 SHA1 (patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk) = 1c6e8355c473ddb16d25cb4b0ccd367326b1e9eb
 SHA1 (patch-external_mariadb-connector-c_UnpackedTarball__mariadb-connector-c.mk) = 01798842e3f573f627be31660195edbac802df89
 SHA1 (patch-external_mariadb-connector-c_netbsd.patch) = e20e0cc58153b865551a8dd2819fb141f20fcb8d
@@ -236,7 +236,6 @@
 SHA1 (patch-instsetoo__native_inc__openoffice_unix_find-requires-x11.sh) = e871e2096c367e742dc5758fe60ae819846def29
 SHA1 (patch-sal_osl_unx_system.hxx) = 478dd47dc512d283a554600951010bbaa10c2c0e
 SHA1 (patch-sal_rtl_cipher.cxx) = e5e46d0b96e25572be86bf26f0053436859736cd
-SHA1 (patch-sc_source_core_opencl_formulagroupcl.cxx) = 1a589c8190a28f603671faf1d84cac022425849e
 SHA1 (patch-sc_source_core_tool_math.cxx) = dd665c6bbe3c18fca0b5fbf847a6ec1ff50d0bb9
 SHA1 (patch-solenv_gbuild_Module.mk) = cbd6ca3acae187458e49fe76d973e6475ed5fe1d
 SHA1 (patch-solenv_gbuild_platform_NETBSD_AARCH64_GCC.mk) = eda8dbd0e9394b2dde2f98c0df39e7e9888f49dc
diff -r d81ea6575a58 -r edb69c6c92a5 misc/libreoffice/patches/patch-configure.ac
--- a/misc/libreoffice/patches/patch-configure.ac       Fri Jul 03 22:54:01 2020 +0000
+++ b/misc/libreoffice/patches/patch-configure.ac       Sat Jul 04 05:02:14 2020 +0000
@@ -1,10 +1,8 @@
-$NetBSD: patch-configure.ac,v 1.15 2020/02/05 14:10:35 ryoon Exp $
+$NetBSD: patch-configure.ac,v 1.16 2020/07/04 05:02:14 ryoon Exp $
 
 * Add NetBSD/aarch64 support.
 * Disable freetype2 and fontconfig from pkgsrc explicitly.
   to fix X11_TYPE=native build and internal pdfium's internal freetype build.
-* Exclude c++2a to avoid some C++ errors. And c++17 causes alloca(3) problem.
-  Use gnu++17 dialect instead.
 * Fix some static links.
 * Include header files from gpgme correctly.
 * Find pkgsrc/devel/apache-ant.
@@ -31,15 +29,6 @@
  if test "$test_fontconfig" = "yes"; then
      PKG_CHECK_MODULES([FONTCONFIG], [fontconfig >= 2.4.1])
      SYSTEM_FONTCONFIG=TRUE
-@@ -6446,7 +6452,7 @@ CXXFLAGS_CXX11=
- if test "$COM" = MSC -a "$COM_IS_CLANG" != TRUE; then
-     CXXFLAGS_CXX11='-std:c++17 -Zc:__cplusplus'
- elif test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
--    my_flags='-std=c++2a -std=c++17 -std=c++1z'
-+    my_flags='-std=gnu++17 -std=gnu++1z'
-     for flag in $my_flags; do
-         if test "$COM" = MSC; then
-             flag="-Xclang $flag"
 @@ -8097,7 +8103,7 @@ else
      if test "$COM" = "MSC"; then
          LIBJPEG_LIBS="${WORKDIR}/UnpackedTarball/libjpeg-turbo/.libs/libjpeg.lib"
@@ -85,7 +74,7 @@
  
          # C++ library doesn't come with fancy gpgmepp-config, check for headers the old-fashioned way
 -        AC_CHECK_HEADER(gpgme++/gpgmepp_version.h, [ GPGMEPP_CFLAGS=-I/usr/include/gpgme++ ],
-+        AC_CHECK_HEADER(gpgme++/gpgmepp_version.h, [ GPGMEPP_CFLAGS=-I/usr/pkg/include/gpgme++ ],
++        AC_CHECK_HEADER(gpgme++/gpgmepp_version.h, [ GPGMEPP_CFLAGS=-I@PREFIX@/include/gpgme++ ],
              [AC_MSG_ERROR([gpgmepp headers not found, install gpgmepp development package])], [])
          # progress_callback is the only func with plain C linkage
          # checking for it also filters out older, KDE-dependent libgpgmepp versions
diff -r d81ea6575a58 -r edb69c6c92a5 misc/libreoffice/patches/patch-download.lst
--- a/misc/libreoffice/patches/patch-download.lst       Fri Jul 03 22:54:01 2020 +0000
+++ b/misc/libreoffice/patches/patch-download.lst       Sat Jul 04 05:02:14 2020 +0000
@@ -1,15 +1,15 @@
-$NetBSD: patch-download.lst,v 1.15 2020/02/05 14:10:35 ryoon Exp $
+$NetBSD: patch-download.lst,v 1.16 2020/07/04 05:02:14 ryoon Exp $
 
---- download.lst.orig  2020-01-22 23:14:16.000000000 +0000
+--- download.lst.orig  2020-06-24 20:35:34.000000000 +0000
 +++ download.lst
 @@ -97,8 +97,8 @@ export GPGME_TARBALL := gpgme-1.9.0.tar.
- export GRAPHITE_SHA256SUM := d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36
- export GRAPHITE_TARBALL := graphite2-minimal-1.3.13.tgz
+ export GRAPHITE_SHA256SUM := b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc
+ export GRAPHITE_TARBALL := graphite2-minimal-1.3.14.tgz
  export HARFBUZZ_SHA256SUM := 9cf7d117548265f95ca884e2f4c9fafaf4e17d45a67b11107147b79eed76c966
 -export HARFBUZZ_TARBALL := harfbuzz-2.6.0.tar.xz
 -export HSQLDB_SHA256SUM := d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
-+export HARFBUZZ_TARBALL := harfbuzz-2.6.4.tar.xz
-+export HSQLDB_SHA256SUM := 9413b8d96132d699687ef914ebb8c50440efc87b3f775d25856d7ec347c03c12
++export HARFBUZZ_TARBALL := harfbuzz-2.6.8.tar.xz
++export HSQLDB_SHA256SUM := 6648a571a27f186e47094121f0095e1b809e918b3037c630c7f38ffad86e3035
  export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
  export HUNSPELL_SHA256SUM := 57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951
  export HUNSPELL_TARBALL := hunspell-1.7.0.tar.gz
diff -r d81ea6575a58 -r edb69c6c92a5 misc/libreoffice/patches/patch-sc_source_core_opencl_formulagroupcl.cxx
--- a/misc/libreoffice/patches/patch-sc_source_core_opencl_formulagroupcl.cxx   Fri Jul 03 22:54:01 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,798 +0,0 @@
-$NetBSD: patch-sc_source_core_opencl_formulagroupcl.cxx,v 1.1 2020/04/20 13:00:48 joerg Exp $
-
---- sc/source/core/opencl/formulagroupcl.cxx.orig      2020-04-20 00:48:10.479759827 +0000
-+++ sc/source/core/opencl/formulagroupcl.cxx
-@@ -1335,185 +1335,7 @@ public:
-     }
- 
-     /// Emit the definition for the auxiliary reduction kernel
--    virtual void GenSlidingWindowFunction( std::stringstream& ss )
--    {
--        if (!dynamic_cast<OpAverage*>(mpCodeGen.get()))
--        {
--            std::string name = Base::GetName();
--            ss << "__kernel void " << name;
--            ss << "_reduction(__global double* A, "
--                "__global double *result,int arrayLength,int windowSize){\n";
--            ss << "    double tmp, current_result =" <<
--                mpCodeGen->GetBottom();
--            ss << ";\n";
--            ss << "    int writePos = get_group_id(1);\n";
--            ss << "    int lidx = get_local_id(0);\n";
--            ss << "    __local double shm_buf[256];\n";
--            if (mpDVR->IsStartFixed())
--                ss << "    int offset = 0;\n";
--            else // if (!mpDVR->IsStartFixed())
--                ss << "    int offset = get_group_id(1);\n";
--            if (mpDVR->IsStartFixed() && mpDVR->IsEndFixed())
--                ss << "    int end = windowSize;\n";
--            else if (!mpDVR->IsStartFixed() && !mpDVR->IsEndFixed())
--                ss << "    int end = offset + windowSize;\n";
--            else if (mpDVR->IsStartFixed() && !mpDVR->IsEndFixed())
--                ss << "    int end = windowSize + get_group_id(1);\n";
--            else if (!mpDVR->IsStartFixed() && mpDVR->IsEndFixed())
--                ss << "    int end = windowSize;\n";
--            ss << "    end = min(end, arrayLength);\n";
--
--            ss << "    barrier(CLK_LOCAL_MEM_FENCE);\n";
--            ss << "    int loop = arrayLength/512 + 1;\n";
--            ss << "    for (int l=0; l<loop; l++){\n";
--            ss << "    tmp = " << mpCodeGen->GetBottom() << ";\n";
--            ss << "    int loopOffset = l*512;\n";
--            ss << "    if((loopOffset + lidx + offset + 256) < end) {\n";
--            ss << "        tmp = legalize(" << mpCodeGen->Gen2(
--                "A[loopOffset + lidx + offset]", "tmp") << ", tmp);\n";
--            ss << "        tmp = legalize(" << mpCodeGen->Gen2(
--                "A[loopOffset + lidx + offset + 256]", "tmp") << ", tmp);\n";
--            ss << "    } else if ((loopOffset + lidx + offset) < end)\n";
--            ss << "        tmp = legalize(" << mpCodeGen->Gen2(
--                "A[loopOffset + lidx + offset]", "tmp") << ", tmp);\n";
--            ss << "    shm_buf[lidx] = tmp;\n";
--            ss << "    barrier(CLK_LOCAL_MEM_FENCE);\n";
--            ss << "    for (int i = 128; i >0; i/=2) {\n";
--            ss << "        if (lidx < i)\n";
--            ss << "            shm_buf[lidx] = ";
--            // Special case count
--            if (dynamic_cast<OpCount*>(mpCodeGen.get()))
--                ss << "shm_buf[lidx] + shm_buf[lidx + i];\n";
--            else
--                ss << mpCodeGen->Gen2("shm_buf[lidx]", "shm_buf[lidx + i]") << ";\n";
--            ss << "        barrier(CLK_LOCAL_MEM_FENCE);\n";
--            ss << "    }\n";
--            ss << "        if (lidx == 0)\n";
--            ss << "            current_result =";
--            if (dynamic_cast<OpCount*>(mpCodeGen.get()))
--                ss << "current_result + shm_buf[0]";
--            else
--                ss << mpCodeGen->Gen2("current_result", "shm_buf[0]");
--            ss << ";\n";
--            ss << "        barrier(CLK_LOCAL_MEM_FENCE);\n";
--            ss << "    }\n";
--            ss << "    if (lidx == 0)\n";
--            ss << "        result[writePos] = current_result;\n";
--            ss << "}\n";
--        }
--        else
--        {
--            std::string name = Base::GetName();
--            /*sum reduction*/
--            ss << "__kernel void " << name << "_sum";
--            ss << "_reduction(__global double* A, "
--                "__global double *result,int arrayLength,int windowSize){\n";
--            ss << "    double tmp, current_result =" <<
--                mpCodeGen->GetBottom();
--            ss << ";\n";
--            ss << "    int writePos = get_group_id(1);\n";
--            ss << "    int lidx = get_local_id(0);\n";
--            ss << "    __local double shm_buf[256];\n";
--            if (mpDVR->IsStartFixed())
--                ss << "    int offset = 0;\n";
--            else // if (!mpDVR->IsStartFixed())
--                ss << "    int offset = get_group_id(1);\n";
--            if (mpDVR->IsStartFixed() && mpDVR->IsEndFixed())
--                ss << "    int end = windowSize;\n";
--            else if (!mpDVR->IsStartFixed() && !mpDVR->IsEndFixed())
--                ss << "    int end = offset + windowSize;\n";
--            else if (mpDVR->IsStartFixed() && !mpDVR->IsEndFixed())
--                ss << "    int end = windowSize + get_group_id(1);\n";
--            else if (!mpDVR->IsStartFixed() && mpDVR->IsEndFixed())
--                ss << "    int end = windowSize;\n";
--            ss << "    end = min(end, arrayLength);\n";
--            ss << "    barrier(CLK_LOCAL_MEM_FENCE);\n";
--            ss << "    int loop = arrayLength/512 + 1;\n";
--            ss << "    for (int l=0; l<loop; l++){\n";
--            ss << "    tmp = " << mpCodeGen->GetBottom() << ";\n";
--            ss << "    int loopOffset = l*512;\n";
--            ss << "    if((loopOffset + lidx + offset + 256) < end) {\n";
--            ss << "        tmp = legalize(";
--            ss << "(A[loopOffset + lidx + offset]+ tmp)";
--            ss << ", tmp);\n";
--            ss << "        tmp = legalize((A[loopOffset + lidx + offset + 256]+ tmp)";
--            ss << ", tmp);\n";
--            ss << "    } else if ((loopOffset + lidx + offset) < end)\n";
--            ss << "        tmp = legalize((A[loopOffset + lidx + offset] + tmp)";
--            ss << ", tmp);\n";
--            ss << "    shm_buf[lidx] = tmp;\n";
--            ss << "    barrier(CLK_LOCAL_MEM_FENCE);\n";
--            ss << "    for (int i = 128; i >0; i/=2) {\n";
--            ss << "        if (lidx < i)\n";
--            ss << "            shm_buf[lidx] = ";
--            ss << "shm_buf[lidx] + shm_buf[lidx + i];\n";
--            ss << "        barrier(CLK_LOCAL_MEM_FENCE);\n";
--            ss << "    }\n";
--            ss << "        if (lidx == 0)\n";
--            ss << "            current_result =";
--            ss << "current_result + shm_buf[0]";
--            ss << ";\n";
--            ss << "        barrier(CLK_LOCAL_MEM_FENCE);\n";
--            ss << "    }\n";
--            ss << "    if (lidx == 0)\n";
--            ss << "        result[writePos] = current_result;\n";
--            ss << "}\n";
--            /*count reduction*/
--            ss << "__kernel void " << name << "_count";
--            ss << "_reduction(__global double* A, "