pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/misc/libreoffice



Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sat Aug 10 11:41:29 UTC 2019

Modified Files:
        pkgsrc/misc/libreoffice: Makefile PLIST PLIST.java distinfo options.mk
        pkgsrc/misc/libreoffice/patches: patch-configure.ac patch-download.lst
            patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk
            patch-external_postgresql_ExternalProject__postgresql.mk
            patch-store_source_storbase.hxx
            patch-vcl_Executable__visualbackendtest.mk
Added Files:
        pkgsrc/misc/libreoffice/patches: patch-sc_source_core_tool_math.cxx
            patch-sw_source_ui_index_cnttab.cxx
Removed Files:
        pkgsrc/misc/libreoffice/patches:
            patch-i18npool_source_transliteration_ignoreDiacritics_CTL.cxx
            patch-lotuswordpro_source_filter_localtime.cxx
            patch-sal_osl_unx_thread.cxx

Log Message:
Update to 6.3.0.4

* qt4 option is no longer provided

Changelog:
See: https://wiki.documentfoundation.org/ReleaseNotes/6.3 in detail

* Improve performances
* Improve file load an save performances in Writer
* Improve MS Office file supoort in Calc
* Use tabcompact UI by default
* Use context single mode for Writer and Draw
* Support PDF/A-2 export
* And many improvements and bugfixes


To generate a diff of this commit:
cvs rdiff -u -r1.202 -r1.203 pkgsrc/misc/libreoffice/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/misc/libreoffice/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/misc/libreoffice/PLIST.java
cvs rdiff -u -r1.83 -r1.84 pkgsrc/misc/libreoffice/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/misc/libreoffice/options.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/misc/libreoffice/patches/patch-configure.ac \
    pkgsrc/misc/libreoffice/patches/patch-download.lst
cvs rdiff -u -r1.6 -r1.7 \
    pkgsrc/misc/libreoffice/patches/patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/misc/libreoffice/patches/patch-external_postgresql_ExternalProject__postgresql.mk \
    pkgsrc/misc/libreoffice/patches/patch-store_source_storbase.hxx
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/misc/libreoffice/patches/patch-i18npool_source_transliteration_ignoreDiacritics_CTL.cxx \
    pkgsrc/misc/libreoffice/patches/patch-lotuswordpro_source_filter_localtime.cxx \
    pkgsrc/misc/libreoffice/patches/patch-sal_osl_unx_thread.cxx
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/misc/libreoffice/patches/patch-sc_source_core_tool_math.cxx \
    pkgsrc/misc/libreoffice/patches/patch-sw_source_ui_index_cnttab.cxx
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/misc/libreoffice/patches/patch-vcl_Executable__visualbackendtest.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/libreoffice/Makefile
diff -u pkgsrc/misc/libreoffice/Makefile:1.202 pkgsrc/misc/libreoffice/Makefile:1.203
--- pkgsrc/misc/libreoffice/Makefile:1.202      Tue Jul 23 17:19:59 2019
+++ pkgsrc/misc/libreoffice/Makefile    Sat Aug 10 11:41:29 2019
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.202 2019/07/23 17:19:59 wiz Exp $
+# $NetBSD: Makefile,v 1.203 2019/08/10 11:41:29 ryoon Exp $
 
-VERREL=                6.2.5
-VERRC=         2
+VERREL=                6.3.0
+VERRC=         4
 VER=           ${VERREL}.${VERRC}
 DISTNAME=      libreoffice-${VER}
-PKGREVISION=   3
 CATEGORIES=    misc
 MASTER_SITES=  http://download.documentfoundation.org/libreoffice/src/${VERREL}/
 EXTRACT_SUFX=  .tar.xz
@@ -60,8 +59,8 @@ MORE_DISTFILES= \
        liberation-fonts-ttf-2.00.4.tar.gz \
        907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz \
        edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz \
-       source-serif-font-2.007R.tar.gz \
-       xmlsec1-1.2.27.tar.gz \
+       source-serif-pro-3.000R.tar.gz \
+       xmlsec1-1.2.28.tar.gz \
        3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip \
        35c94d2df8893241173de1d16b6034c0-swingExSrc.zip \
        39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip \
@@ -107,8 +106,8 @@ DISTFILES+=         ${md}
 SITES.${md}=           https://dev-www.libreoffice.org/src/
 .endfor
 
-MORE_DISTFILES2+=              49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf
-SITES.49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf=   https://dev-www.libreoffice.org/extern/
+MORE_DISTFILES2+=              884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf
+SITES.884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf=   https://dev-www.libreoffice.org/extern/
 
 .include "../../graphics/librsvg/available.mk"
 .if ${LIBRSVG_TYPE} == "c" || make(distinfo) || make(mdi)

Index: pkgsrc/misc/libreoffice/PLIST
diff -u pkgsrc/misc/libreoffice/PLIST:1.31 pkgsrc/misc/libreoffice/PLIST:1.32
--- pkgsrc/misc/libreoffice/PLIST:1.31  Tue Feb 19 16:28:03 2019
+++ pkgsrc/misc/libreoffice/PLIST       Sat Aug 10 11:41:29 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.31 2019/02/19 16:28:03 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.32 2019/08/10 11:41:29 ryoon Exp $
 bin/libreoffice
 bin/lobase
 bin/localc
@@ -9,7 +9,6 @@ bin/loimpress
 bin/lomath
 bin/loweb
 bin/lowriter
-bin/libreoffice
 ${PKGNAME}/bin/libreoffice
 ${PKGNAME}/bin/lobase
 ${PKGNAME}/bin/localc
@@ -33,7 +32,6 @@ ${PKGNAME}/bin/soffice
 ${PKGNAME}/bin/unopkg
 ${PKGNAME}/lib/libreoffice/CREDITS.fodt
 ${PKGNAME}/lib/libreoffice/LICENSE
-${PKGNAME}/lib/libreoffice/LICENSE.fodt
 ${PKGNAME}/lib/libreoffice/LICENSE.html
 ${PKGNAME}/lib/libreoffice/NOTICE
 ${PKGNAME}/lib/libreoffice/help/idxcaption.xsl
@@ -114,9 +112,7 @@ ${PKGNAME}/lib/libreoffice/program/libdr
 ${PKGNAME}/lib/libreoffice/program/libeditenglo.so
 ${PKGNAME}/lib/libreoffice/program/libembobj.so
 ${PKGNAME}/lib/libreoffice/program/libemboleobj.so
-${PLIST.kde4}${PKGNAME}/lib/libreoffice/program/libkde4be1lo.so
 ${PKGNAME}/lib/libreoffice/program/libemfiolo.so
-${PLIST.gtk3}${PKGNAME}/lib/libreoffice/program/liblibreofficekitgtk.so
 ${PKGNAME}/lib/libreoffice/program/libevtattlo.so
 ${PKGNAME}/lib/libreoffice/program/libexpwraplo.so
 ${PKGNAME}/lib/libreoffice/program/libfilelo.so
@@ -170,6 +166,7 @@ ${PKGNAME}/lib/libreoffice/program/libms
 ${PKGNAME}/lib/libreoffice/program/libmsformslo.so
 ${PKGNAME}/lib/libreoffice/program/libmswordlo.so
 ${PKGNAME}/lib/libreoffice/program/libmtfrendererlo.so
+${PKGNAME}/lib/libreoffice/program/libmysql_jdbclo.so
 ${PKGNAME}/lib/libreoffice/program/libmysqlclo.so
 ${PKGNAME}/lib/libreoffice/program/libnamingservicelo.so
 ${PKGNAME}/lib/libreoffice/program/libnumbertextlo.so
@@ -191,7 +188,6 @@ ${PKGNAME}/lib/libreoffice/program/libpr
 ${PKGNAME}/lib/libreoffice/program/libproxyfaclo.so
 ${PKGNAME}/lib/libreoffice/program/libpythonloaderlo.so
 ${PKGNAME}/lib/libreoffice/program/libpyuno.so
-${PKGNAME}/lib/libreoffice/program/librecentfile.so
 ${PKGNAME}/lib/libreoffice/program/libreflectionlo.so
 ${PKGNAME}/lib/libreoffice/program/libreglo.so
 ${PKGNAME}/lib/libreoffice/program/libsal_textenclo.so
@@ -274,9 +270,7 @@ ${PKGNAME}/lib/libreoffice/program/libvb
 ${PKGNAME}/lib/libreoffice/program/libvclcanvaslo.so
 ${PKGNAME}/lib/libreoffice/program/libvcllo.so
 ${PKGNAME}/lib/libreoffice/program/libvclplug_genlo.so
-${PLIST.gtk3}${PKGNAME}/lib/libreoffice/program/libvclplug_gtk3lo.so
 ${PKGNAME}/lib/libreoffice/program/libvclplug_gtklo.so
-${PLIST.kde4}${PKGNAME}/lib/libreoffice/program/libvclplug_kde4lo.so
 ${PKGNAME}/lib/libreoffice/program/libwpftcalclo.so
 ${PKGNAME}/lib/libreoffice/program/libwpftdrawlo.so
 ${PKGNAME}/lib/libreoffice/program/libwpftimpresslo.so
@@ -301,6 +295,7 @@ ${PKGNAME}/lib/libreoffice/program/msgbo
 ${PKGNAME}/lib/libreoffice/program/officehelper.py
 ${PKGNAME}/lib/libreoffice/program/oosplash
 ${PKGNAME}/lib/libreoffice/program/opencl/cl-test.ods
+${PKGNAME}/lib/libreoffice/program/opencltest
 ${PKGNAME}/lib/libreoffice/program/opengl/areaHashCRC64TFragmentShader.glsl
 ${PKGNAME}/lib/libreoffice/program/opengl/areaScaleFastFragmentShader.glsl
 ${PKGNAME}/lib/libreoffice/program/opengl/areaScaleFragmentShader.glsl
@@ -4684,6 +4679,7 @@ ${PKGNAME}/lib/libreoffice/share/config/
 ${PKGNAME}/lib/libreoffice/share/config/images_karasa_jaga.zip
 ${PKGNAME}/lib/libreoffice/share/config/images_sifr.zip
 ${PKGNAME}/lib/libreoffice/share/config/images_sifr_dark.zip
+${PKGNAME}/lib/libreoffice/share/config/images_sifr_svg.zip
 ${PKGNAME}/lib/libreoffice/share/config/images_tango.zip
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/cui/ui/aboutconfigdialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/cui/ui/aboutconfigvaluedialog.ui
@@ -4708,6 +4704,7 @@ ${PKGNAME}/lib/libreoffice/share/config/
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/cui/ui/borderbackgrounddialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/cui/ui/borderpage.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/cui/ui/breaknumberoption.ui
+${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/cui/ui/bulletandposition.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/cui/ui/calloutdialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/cui/ui/calloutpage.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/cui/ui/cellalignment.ui
@@ -4851,7 +4848,6 @@ ${PKGNAME}/lib/libreoffice/share/config/
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/cui/ui/searchattrdialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/cui/ui/searchformatdialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/cui/ui/securityoptionsdialog.ui
-${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/cui/ui/select_persona_dialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/cui/ui/selectpathdialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/cui/ui/shadowtabpage.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/cui/ui/showcoldialog.ui
@@ -4873,6 +4869,7 @@ ${PKGNAME}/lib/libreoffice/share/config/
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/cui/ui/textdialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/cui/ui/textflowpage.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/cui/ui/thesaurus.ui
+${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/cui/ui/tipofthedaydialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/cui/ui/transparencytabpage.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/cui/ui/tsaurldialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/cui/ui/twolinespage.ui
@@ -4951,6 +4948,7 @@ ${PKGNAME}/lib/libreoffice/share/config/
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/dbaccess/ui/userdetailspage.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/desktop/ui/dependenciesdialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/desktop/ui/extensionmanager.ui
+${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/desktop/ui/extensionmenu.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/desktop/ui/installforalldialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/desktop/ui/licensedialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/desktop/ui/showlicensedialog.ui
@@ -5134,7 +5132,6 @@ ${PKGNAME}/lib/libreoffice/share/config/
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/toolbar/insertcellsbar.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/toolbar/linesbar.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/toolbar/mediaobjectbar.xml
-${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/toolbar/moreformcontrols.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/toolbar/notebookbarshortcuts.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/toolbar/previewbar.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/toolbar/singlemode.xml
@@ -5149,6 +5146,7 @@ ${PKGNAME}/lib/libreoffice/share/config/
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/allheaderfooterdialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/analysisofvariancedialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/autoformattable.ui
+${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/autosum.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/cellprotectionpage.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/changesourcedialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/chardialog.ui
@@ -5170,7 +5168,7 @@ ${PKGNAME}/lib/libreoffice/share/config/
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/datafielddialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/datafieldoptionsdialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/dataform.ui
-${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/dataprovider.ui
+${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/dataformfragment.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/dataproviderdlg.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/dataproviderentry.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/datastreams.ui
@@ -5192,6 +5190,7 @@ ${PKGNAME}/lib/libreoffice/share/config/
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/footerdialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/formatcellsdialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/formulacalculationoptions.ui
+${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/fourieranalysisdialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/functionpanel.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/goalseekdlg.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/groupbydate.ui
@@ -5235,6 +5234,7 @@ ${PKGNAME}/lib/libreoffice/share/config/
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/pagetemplatedialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/paradialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/paratemplatedialog.ui
+${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/passfragment.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/pastespecial.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/pivotfielddialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/pivotfilterdialog.ui
@@ -5413,12 +5413,13 @@ ${PKGNAME}/lib/libreoffice/share/config/
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/sdraw/toolbar/linesbar.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/sdraw/toolbar/masterviewtoolbar.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/sdraw/toolbar/mediaobjectbar.xml
-${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/sdraw/toolbar/moreformcontrols.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/sdraw/toolbar/notebookbarshortcuts.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/sdraw/toolbar/optimizetablebar.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/sdraw/toolbar/optionsbar.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/sdraw/toolbar/positionbar.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/sdraw/toolbar/rectanglesbar.xml
+${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/sdraw/toolbar/redactedexportbar.xml
+${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/sdraw/toolbar/redactionbar.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/sdraw/toolbar/standardbar.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/sdraw/toolbar/starshapes.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/sdraw/toolbar/symbolshapes.xml
@@ -5442,8 +5443,10 @@ ${PKGNAME}/lib/libreoffice/share/config/
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/sdraw/ui/insertslidesdialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/sdraw/ui/namedesign.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/sdraw/ui/notebookbar.ui
+${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/sdraw/ui/notebookbar_compact.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/sdraw/ui/notebookbar_groupedbar_compact.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/sdraw/ui/notebookbar_groupedbar_full.ui
+${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/sdraw/ui/notebookbar_single.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/sdraw/ui/paranumberingtab.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/sdraw/ui/queryunlinkimagedialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/sdraw/ui/vectorize.ui
@@ -5489,7 +5492,6 @@ ${PKGNAME}/lib/libreoffice/share/config/
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/sglobal/toolbar/insertbar.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/sglobal/toolbar/insertobjectbar.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/sglobal/toolbar/mediaobjectbar.xml
-${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/sglobal/toolbar/moreformcontrols.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/sglobal/toolbar/numobjectbar.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/sglobal/toolbar/oleobjectbar.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/sglobal/toolbar/optimizetablebar.xml
@@ -5566,7 +5568,6 @@ ${PKGNAME}/lib/libreoffice/share/config/
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/simpress/toolbar/linesbar.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/simpress/toolbar/masterviewtoolbar.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/simpress/toolbar/mediaobjectbar.xml
-${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/simpress/toolbar/moreformcontrols.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/simpress/toolbar/notebookbarshortcuts.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/simpress/toolbar/optimizetablebar.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/simpress/toolbar/optionsbar.xml
@@ -5592,7 +5593,6 @@ ${PKGNAME}/lib/libreoffice/share/config/
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/simpress/ui/customanimationfragment.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/simpress/ui/customanimationproperties.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/simpress/ui/customanimationspanel.ui
-${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/simpress/ui/customanimationspanelhorizontal.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/simpress/ui/customanimationtexttab.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/simpress/ui/customanimationtimingtab.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/simpress/ui/customslideshows.ui
@@ -5613,6 +5613,7 @@ ${PKGNAME}/lib/libreoffice/share/config/
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/simpress/ui/mastermenu.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/simpress/ui/navigatorpanel.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/simpress/ui/notebookbar.ui
+${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/simpress/ui/notebookbar_compact.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/simpress/ui/notebookbar_groupedbar_compact.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/simpress/ui/notebookbar_groupedbar_full.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/simpress/ui/notebookbar_groups.ui
@@ -5653,7 +5654,6 @@ ${PKGNAME}/lib/libreoffice/share/config/
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/smath/ui/symdefinedialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/spropctrlr/ui/controlfontdialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/spropctrlr/ui/datatypedialog.ui
-${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/spropctrlr/ui/fieldlinkrow.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/spropctrlr/ui/formlinksdialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/spropctrlr/ui/labelselectiondialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/spropctrlr/ui/listselectdialog.ui
@@ -5748,7 +5748,6 @@ ${PKGNAME}/lib/libreoffice/share/config/
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swform/toolbar/insertobjectbar.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swform/toolbar/mailmerge.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swform/toolbar/mediaobjectbar.xml
-${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swform/toolbar/moreformcontrols.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swform/toolbar/numobjectbar.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swform/toolbar/oleobjectbar.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swform/toolbar/optimizetablebar.xml
@@ -5802,7 +5801,6 @@ ${PKGNAME}/lib/libreoffice/share/config/
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swreport/toolbar/insertobjectbar.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swreport/toolbar/mailmerge.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swreport/toolbar/mediaobjectbar.xml
-${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swreport/toolbar/moreformcontrols.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swreport/toolbar/numobjectbar.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swreport/toolbar/oleobjectbar.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swreport/toolbar/optimizetablebar.xml
@@ -5815,6 +5813,7 @@ ${PKGNAME}/lib/libreoffice/share/config/
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swreport/toolbar/toolbar.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swreport/toolbar/viewerbar.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/menubar/menubar.xml
+${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/menubar/mscompatibleformsmenu.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/popupmenu/anchor.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/popupmenu/annotation.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/popupmenu/draw.xml
@@ -5861,7 +5860,6 @@ ${PKGNAME}/lib/libreoffice/share/config/
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/toolbar/linesbar.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/toolbar/mailmerge.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/toolbar/mediaobjectbar.xml
-${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/toolbar/moreformcontrols.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/toolbar/navigationobjectbar.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/toolbar/notebookbarshortcuts.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/toolbar/numobjectbar.xml
@@ -5880,11 +5878,13 @@ ${PKGNAME}/lib/libreoffice/share/config/
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/abstractdialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/addentrydialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/addressblockdialog.ui
+${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/addressfragment.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/alreadyexistsdialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/annotationmenu.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/asciifilterdialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/asksearchdialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/assignfieldsdialog.ui
+${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/assignfragment.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/assignstylesdialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/attachnamedialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/authenticationsettingsdialog.ui
@@ -5914,6 +5914,7 @@ ${PKGNAME}/lib/libreoffice/share/config/
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/datasourcesunavailabledialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/dropcapspage.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/dropdownfielddialog.ui
+${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/dropdownformfielddialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/editcategories.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/editfielddialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/editsectiondialog.ui
@@ -6016,6 +6017,7 @@ ${PKGNAME}/lib/libreoffice/share/config/
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/paradialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/picturedialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/picturepage.ui
+${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/previewmenu.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/previewzoomdialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/printeroptions.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/printmergedialog.ui
@@ -6069,6 +6071,8 @@ ${PKGNAME}/lib/libreoffice/share/config/
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/tocindexpage.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/tocstylespage.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/tokenwidget.ui
+${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/toxbuttonwidget.ui
+${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/toxentrywidget.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/viewoptionspage.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/warndatasourcedialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/warnemaildialog.ui
@@ -6119,7 +6123,6 @@ ${PKGNAME}/lib/libreoffice/share/config/
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swxform/toolbar/insertobjectbar.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swxform/toolbar/mailmerge.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swxform/toolbar/mediaobjectbar.xml
-${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swxform/toolbar/moreformcontrols.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swxform/toolbar/numobjectbar.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swxform/toolbar/oleobjectbar.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swxform/toolbar/optimizetablebar.xml
@@ -6157,6 +6160,7 @@ ${PKGNAME}/lib/libreoffice/share/config/
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/sfx/ui/helpsearchpage.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/sfx/ui/inputdialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/sfx/ui/licensedialog.ui
+${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/sfx/ui/linefragment.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/sfx/ui/linkeditdialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/sfx/ui/loadtemplatedialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/sfx/ui/managestylepage.ui
@@ -6185,6 +6189,7 @@ ${PKGNAME}/lib/libreoffice/share/config/
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/simpress/transitions-ogl.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/simpress/transitions.xml
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/svt/ui/addresstemplatedialog.ui
+${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/svt/ui/datewindow.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/svt/ui/fileviewmenu.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/svt/ui/graphicexport.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/svt/ui/inputbox.ui
@@ -6272,6 +6277,7 @@ ${PKGNAME}/lib/libreoffice/share/config/
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/svx/ui/sidebararea.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/svx/ui/sidebargraphic.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/svx/ui/sidebarline.ui
+${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/svx/ui/sidebarlists.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/svx/ui/sidebarparagraph.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/svx/ui/sidebarpossize.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/svx/ui/sidebarshadow.ui
@@ -6295,10 +6301,12 @@ ${PKGNAME}/lib/libreoffice/share/config/
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/uui/ui/simplenameclash.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/uui/ui/sslwarndialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/uui/ui/unknownauthdialog.ui
+${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/vcl/ui/aboutbox.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/vcl/ui/cupspassworddialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/vcl/ui/editmenu.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/vcl/ui/errornocontentdialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/vcl/ui/errornoprinterdialog.ui
+${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/vcl/ui/moreoptionsdialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/vcl/ui/printdialog.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/vcl/ui/printerdevicepage.ui
 ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/vcl/ui/printerpaperpage.ui
@@ -6448,7 +6456,6 @@ ${PKGNAME}/lib/libreoffice/share/extensi
 ${PKGNAME}/lib/libreoffice/share/extensions/dict-ca/LICENSES-en.txt
 ${PKGNAME}/lib/libreoffice/share/extensions/dict-ca/LLICENCIES-ca.txt
 ${PKGNAME}/lib/libreoffice/share/extensions/dict-ca/META-INF/manifest.xml
-${PKGNAME}/lib/libreoffice/share/extensions/dict-ca/SC-logo.png
 ${PKGNAME}/lib/libreoffice/share/extensions/dict-ca/ca-valencia.aff
 ${PKGNAME}/lib/libreoffice/share/extensions/dict-ca/ca-valencia.dic
 ${PKGNAME}/lib/libreoffice/share/extensions/dict-ca/ca.aff
@@ -6456,6 +6463,7 @@ ${PKGNAME}/lib/libreoffice/share/extensi
 ${PKGNAME}/lib/libreoffice/share/extensions/dict-ca/description.xml
 ${PKGNAME}/lib/libreoffice/share/extensions/dict-ca/dictionaries.xcu
 ${PKGNAME}/lib/libreoffice/share/extensions/dict-ca/hyph_ca.dic
+${PKGNAME}/lib/libreoffice/share/extensions/dict-ca/images/SC-logo.png
 ${PKGNAME}/lib/libreoffice/share/extensions/dict-ca/th_ca_ES_v3.dat
 ${PKGNAME}/lib/libreoffice/share/extensions/dict-ca/th_ca_ES_v3.idx
 ${PKGNAME}/lib/libreoffice/share/extensions/dict-cs/META-INF/manifest.xml
@@ -8849,34 +8857,73 @@ ${PKGNAME}/lib/libreoffice/share/templat
 ${PKGNAME}/lib/libreoffice/share/template/common/wizard/styles/pool.ots
 ${PKGNAME}/lib/libreoffice/share/template/common/wizard/styles/pumpkin.ots
 ${PKGNAME}/lib/libreoffice/share/template/common/wizard/styles/xos.ots
-${PKGNAME}/lib/libreoffice/share/template/wizard/bitmap/Import_1.bmp
-${PKGNAME}/lib/libreoffice/share/template/wizard/bitmap/Import_3.bmp
-${PKGNAME}/lib/libreoffice/share/template/wizard/bitmap/Import_4.bmp
-${PKGNAME}/lib/libreoffice/share/template/wizard/bitmap/MS-Import_2-1.bmp
-${PKGNAME}/lib/libreoffice/share/template/wizard/bitmap/MS-Import_2-2.bmp
-${PKGNAME}/lib/libreoffice/share/template/wizard/bitmap/MS-Import_2-3.bmp
-${PKGNAME}/lib/libreoffice/share/template/wizard/bitmap/XML-Import_2-1.bmp
-${PKGNAME}/lib/libreoffice/share/template/wizard/bitmap/XML-Import_2-2.bmp
-${PKGNAME}/lib/libreoffice/share/template/wizard/bitmap/XML-Import_2-3.bmp
-${PKGNAME}/lib/libreoffice/share/template/wizard/bitmap/XML-Import_2-4.bmp
-${PKGNAME}/lib/libreoffice/share/template/wizard/bitmap/cancel_down.bmp
-${PKGNAME}/lib/libreoffice/share/template/wizard/bitmap/cancel_up.bmp
-${PKGNAME}/lib/libreoffice/share/template/wizard/bitmap/down.bmp
-${PKGNAME}/lib/libreoffice/share/template/wizard/bitmap/end.bmp
-${PKGNAME}/lib/libreoffice/share/template/wizard/bitmap/euro_1.bmp
-${PKGNAME}/lib/libreoffice/share/template/wizard/bitmap/euro_2.bmp
-${PKGNAME}/lib/libreoffice/share/template/wizard/bitmap/euro_3.bmp
+${PKGNAME}/lib/libreoffice/share/template/wizard/bitmap/Import_1.png
+${PKGNAME}/lib/libreoffice/share/template/wizard/bitmap/Import_3.png
+${PKGNAME}/lib/libreoffice/share/template/wizard/bitmap/Import_4.png
+${PKGNAME}/lib/libreoffice/share/template/wizard/bitmap/MS-Import_2-1.png
+${PKGNAME}/lib/libreoffice/share/template/wizard/bitmap/MS-Import_2-2.png
+${PKGNAME}/lib/libreoffice/share/template/wizard/bitmap/MS-Import_2-3.png
+${PKGNAME}/lib/libreoffice/share/template/wizard/bitmap/XML-Import_2-1.png
+${PKGNAME}/lib/libreoffice/share/template/wizard/bitmap/XML-Import_2-2.png
+${PKGNAME}/lib/libreoffice/share/template/wizard/bitmap/XML-Import_2-3.png
+${PKGNAME}/lib/libreoffice/share/template/wizard/bitmap/XML-Import_2-4.png
+${PKGNAME}/lib/libreoffice/share/template/wizard/bitmap/euro_1.png
+${PKGNAME}/lib/libreoffice/share/template/wizard/bitmap/euro_2.png
+${PKGNAME}/lib/libreoffice/share/template/wizard/bitmap/euro_3.png
 ${PKGNAME}/lib/libreoffice/share/template/wizard/bitmap/ftpconnected.gif
 ${PKGNAME}/lib/libreoffice/share/template/wizard/bitmap/ftpconnecting.gif
 ${PKGNAME}/lib/libreoffice/share/template/wizard/bitmap/ftperror.gif
 ${PKGNAME}/lib/libreoffice/share/template/wizard/bitmap/ftpunknown.gif
-${PKGNAME}/lib/libreoffice/share/template/wizard/bitmap/maximize.bmp
-${PKGNAME}/lib/libreoffice/share/template/wizard/bitmap/minimize.bmp
-${PKGNAME}/lib/libreoffice/share/template/wizard/bitmap/okay_down.bmp
-${PKGNAME}/lib/libreoffice/share/template/wizard/bitmap/okay_up.bmp
-${PKGNAME}/lib/libreoffice/share/template/wizard/bitmap/report.bmp
+${PKGNAME}/lib/libreoffice/share/template/wizard/bitmap/maximize.png
+${PKGNAME}/lib/libreoffice/share/template/wizard/bitmap/minimize.png
 ${PKGNAME}/lib/libreoffice/share/template/wizard/bitmap/tutorial_background.gif
-${PKGNAME}/lib/libreoffice/share/template/wizard/bitmap/up.bmp
+${PKGNAME}/lib/libreoffice/share/theme_definitions/ios/arrow-down.svg
+${PKGNAME}/lib/libreoffice/share/theme_definitions/ios/arrow-up.svg
+${PKGNAME}/lib/libreoffice/share/theme_definitions/ios/combobox-button-disabled.svg
+${PKGNAME}/lib/libreoffice/share/theme_definitions/ios/combobox-button.svg
+${PKGNAME}/lib/libreoffice/share/theme_definitions/ios/combobox-disabled.svg
+${PKGNAME}/lib/libreoffice/share/theme_definitions/ios/combobox.svg
+${PKGNAME}/lib/libreoffice/share/theme_definitions/ios/common-rect-disabled.svg
+${PKGNAME}/lib/libreoffice/share/theme_definitions/ios/common-rect-focus-slim.svg
+${PKGNAME}/lib/libreoffice/share/theme_definitions/ios/common-rect-focus.svg
+${PKGNAME}/lib/libreoffice/share/theme_definitions/ios/common-rect.svg
+${PKGNAME}/lib/libreoffice/share/theme_definitions/ios/definition.xml
+${PKGNAME}/lib/libreoffice/share/theme_definitions/ios/pushbutton-default.svg
+${PKGNAME}/lib/libreoffice/share/theme_definitions/ios/pushbutton-disabled.svg
+${PKGNAME}/lib/libreoffice/share/theme_definitions/ios/pushbutton-rollover.svg
+${PKGNAME}/lib/libreoffice/share/theme_definitions/ios/scrollbar-horizontal.svg
+${PKGNAME}/lib/libreoffice/share/theme_definitions/ios/scrollbar-vertical.svg
+${PKGNAME}/lib/libreoffice/share/theme_definitions/ios/slider-button-disabled.svg
+${PKGNAME}/lib/libreoffice/share/theme_definitions/ios/slider-button.svg
+${PKGNAME}/lib/libreoffice/share/theme_definitions/ios/spinbox-left-disabled.svg
+${PKGNAME}/lib/libreoffice/share/theme_definitions/ios/spinbox-left-pressed.svg
+${PKGNAME}/lib/libreoffice/share/theme_definitions/ios/spinbox-left.svg
+${PKGNAME}/lib/libreoffice/share/theme_definitions/ios/spinbox-right-disabled.svg
+${PKGNAME}/lib/libreoffice/share/theme_definitions/ios/spinbox-right-pressed.svg
+${PKGNAME}/lib/libreoffice/share/theme_definitions/ios/spinbox-right.svg
+${PKGNAME}/lib/libreoffice/share/theme_definitions/ios/switch-off-disabled.svg
+${PKGNAME}/lib/libreoffice/share/theme_definitions/ios/switch-off-pressed.svg
+${PKGNAME}/lib/libreoffice/share/theme_definitions/ios/switch-off.svg
+${PKGNAME}/lib/libreoffice/share/theme_definitions/ios/switch-on-disabled.svg
+${PKGNAME}/lib/libreoffice/share/theme_definitions/ios/switch-on-pressed.svg
+${PKGNAME}/lib/libreoffice/share/theme_definitions/ios/switch-on.svg
+${PKGNAME}/lib/libreoffice/share/theme_definitions/ios/tabitem-first-selected.svg
+${PKGNAME}/lib/libreoffice/share/theme_definitions/ios/tabitem-first.svg
+${PKGNAME}/lib/libreoffice/share/theme_definitions/ios/tabitem-last-selected.svg
+${PKGNAME}/lib/libreoffice/share/theme_definitions/ios/tabitem-last.svg
+${PKGNAME}/lib/libreoffice/share/theme_definitions/ios/tabitem-middle-selected.svg
+${PKGNAME}/lib/libreoffice/share/theme_definitions/ios/tabitem-middle.svg
+${PKGNAME}/lib/libreoffice/share/theme_definitions/ios/tick-off-disabled.svg
+${PKGNAME}/lib/libreoffice/share/theme_definitions/ios/tick-off-pressed.svg
+${PKGNAME}/lib/libreoffice/share/theme_definitions/ios/tick-off.svg
+${PKGNAME}/lib/libreoffice/share/theme_definitions/ios/tick-on-disabled.svg
+${PKGNAME}/lib/libreoffice/share/theme_definitions/ios/tick-on-pressed.svg
+${PKGNAME}/lib/libreoffice/share/theme_definitions/ios/tick-on.svg
+${PKGNAME}/lib/libreoffice/share/tipoftheday/tipoftheday.png
+${PKGNAME}/lib/libreoffice/share/tipoftheday/tipoftheday_c.png
+${PKGNAME}/lib/libreoffice/share/tipoftheday/tipoftheday_d.png
+${PKGNAME}/lib/libreoffice/share/tipoftheday/tipoftheday_i.png
+${PKGNAME}/lib/libreoffice/share/tipoftheday/tipoftheday_w.png
 ${PKGNAME}/lib/libreoffice/share/wizards/resources_af.properties
 ${PKGNAME}/lib/libreoffice/share/wizards/resources_am.properties
 ${PKGNAME}/lib/libreoffice/share/wizards/resources_ar.properties
@@ -10160,3 +10207,86 @@ share/icons/locolor/32x32/mimetypes/libr
 share/mime-info/libreoffice.keys
 share/mime-info/libreoffice.mime
 share/mime/packages/libreoffice.xml
+@pkgdir ${PKGNAME}/lib/libreoffice/share/uno_packages/cache/uno_packages
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/zu
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/xh
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/vec
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/ve
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/uz
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/uk
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/ug
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/tt
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/ts
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/tn
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/th
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/tg
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/te
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/ta
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/sw-TZ
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/st
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/ss
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/sr-Latn
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/sr
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/sq
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/sid
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/si
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/sd
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/sat
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/sa-IN
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/rw
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/pa-IN
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/or
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/om
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/oc
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/nso
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/nr
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/nn
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/ne
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/nb
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/my
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/mr
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/mni
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/ml
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/mk
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/mai
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/lv
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/lo
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/lb
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/ks
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/kok
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/kn
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/kmr-Latn
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/kk
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/kab
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/ka
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/id
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/hsb
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/hi
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/he
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/gug
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/gu
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/gl
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/gd
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/ga
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/fy
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/eu
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/et
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/eo
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/el
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/dz
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/dsb
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/dgo
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/cy
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/ca-valencia
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/bs
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/brx
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/br
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/bo
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/bn-IN
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/bn
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/be
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/ast
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/as
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/ar
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/am
+@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/af

Index: pkgsrc/misc/libreoffice/PLIST.java
diff -u pkgsrc/misc/libreoffice/PLIST.java:1.9 pkgsrc/misc/libreoffice/PLIST.java:1.10
--- pkgsrc/misc/libreoffice/PLIST.java:1.9      Tue Feb 19 16:28:03 2019
+++ pkgsrc/misc/libreoffice/PLIST.java  Sat Aug 10 11:41:29 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.java,v 1.9 2019/02/19 16:28:03 ryoon Exp $
+@comment $NetBSD: PLIST.java,v 1.10 2019/08/10 11:41:29 ryoon Exp $
 ${PKGNAME}/lib/libreoffice/program/JREProperties.class
 ${PKGNAME}/lib/libreoffice/program/classes/ScriptFramework.jar
 ${PKGNAME}/lib/libreoffice/program/classes/ScriptProviderForBeanShell.jar
@@ -49,7 +49,6 @@ ${PKGNAME}/lib/libreoffice/program/libju
 ${PKGNAME}/lib/libreoffice/program/libjuhx.so
 ${PKGNAME}/lib/libreoffice/program/libjvmaccesslo.so
 ${PKGNAME}/lib/libreoffice/program/libjvmfwklo.so
-${PKGNAME}/lib/libreoffice/program/libmysql_jdbclo.so
 ${PKGNAME}/lib/libreoffice/program/libofficebean.so
 ${PKGNAME}/lib/libreoffice/program/librptlo.so
 ${PKGNAME}/lib/libreoffice/program/librptuilo.so

Index: pkgsrc/misc/libreoffice/distinfo
diff -u pkgsrc/misc/libreoffice/distinfo:1.83 pkgsrc/misc/libreoffice/distinfo:1.84
--- pkgsrc/misc/libreoffice/distinfo:1.83       Mon Jul  8 17:56:20 2019
+++ pkgsrc/misc/libreoffice/distinfo    Sat Aug 10 11:41:29 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.83 2019/07/08 17:56:20 ryoon Exp $
+$NetBSD: distinfo,v 1.84 2019/08/10 11:41:29 ryoon Exp $
 
 SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
 RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
@@ -32,14 +32,14 @@ SHA1 (libreoffice/3bdf40c0d199af31923e90
 RMD160 (libreoffice/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip) = 229deeb4c533422466c16eaf490c08103be21fc8
 SHA512 (libreoffice/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip) = 
8eaa9eed3bff16a16483d0754756c181089eb705ea34ded7f9f6db90a591cbce3f0551f28d097bd2f44de813cb818720c430e79e516939e0398b72bf4614f4cd
 Size (libreoffice/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip) = 5750610 bytes
-SHA1 (libreoffice/49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf) = ad0f4351a484ac9b5422beae749719299bdfcfb8
-RMD160 (libreoffice/49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf) = 1aa8f75e4e85030ea3c080946b1d39b577a97064
-SHA512 (libreoffice/49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf) = 
359ba0314a0e5094aa2a10067e5613b10cb9044dca04d49bae68afd8a49d88e070b9a5321b77fd15ef5685109f664409ae1af24d40edd7b462f1366a1967b0e2
-Size (libreoffice/49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf) = 207400 bytes
 SHA1 (libreoffice/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip) = 8a90669029e107b61953b90ba11545fef586c2ca
 RMD160 (libreoffice/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip) = 68e248ec03675458f0536282ef250efa42c4c154
 SHA512 (libreoffice/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip) = ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
 Size (libreoffice/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip) = 1521926 bytes
+SHA1 (libreoffice/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf) = d336802a36ed2c87dd243e7c2f1d0542dace5cca
+RMD160 (libreoffice/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf) = 00b1e296adf2caad44c49ad9743e5da7c771e480
+SHA512 (libreoffice/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf) = 
ce7e23e750f2c6f7ff2e590cc8941caa18eaae2727c9ca31313ab72ab19278055bd9393d38b0b5b685594e2f04ee15cb83b3bbb25d09665fe7383d7f26bf2ae8
+Size (libreoffice/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf) = 207544 bytes
 SHA1 (libreoffice/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip) = a637c0c3ad3be32d6814972e1c45e547c5f6359d
 RMD160 (libreoffice/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip) = 3235b45b4065750b0b2df4735a57ca1f815dfc69
 SHA512 (libreoffice/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip) = 
12ab17a4db3f7c834b21e59ff6f6f6456630d8626db7fb908867b20204295d4fba8969e79a3694ca66cb24e9f0e5a0fa4b9d2d3f748691b7f93985f9e666ce5f
@@ -172,22 +172,22 @@ SHA1 (libreoffice/libre-hebrew-1.0.tar.g
 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.2.5.2.tar.xz) = 7890dc1cc99571c3e0c1fbc35c589f47fc99ee9d
-RMD160 (libreoffice/libreoffice-6.2.5.2.tar.xz) = 4cd077aa8984877a160b016564321838206cfa1e
-SHA512 (libreoffice/libreoffice-6.2.5.2.tar.xz) = b46b6731c415ab354ad7d876cb8905cb9eae2ca71639abf049ea7f5930601c957cc0eb04a2cd06949073ba5e94778ecdb449692ed8bbfbd95b05f6e7980d8d10
-Size (libreoffice/libreoffice-6.2.5.2.tar.xz) = 215008848 bytes
-SHA1 (libreoffice/libreoffice-dictionaries-6.2.5.2.tar.xz) = 6e21a54d8b6455e04a514e52aaa3945aa07aaeae
-RMD160 (libreoffice/libreoffice-dictionaries-6.2.5.2.tar.xz) = 8c6e46fc34ced615c8727f42ca2d58cb5fe4e70e
-SHA512 (libreoffice/libreoffice-dictionaries-6.2.5.2.tar.xz) = 458e4b3156b415058a759df100ecab40efdb89917aea4d5164e292e46e3555422c49c95b82b1530aa90344a96c7bb1fa8fcf545eef6241e8c87195763c826303
-Size (libreoffice/libreoffice-dictionaries-6.2.5.2.tar.xz) = 45050876 bytes
-SHA1 (libreoffice/libreoffice-help-6.2.5.2.tar.xz) = 5097b2ea96ac208dd8f642f5711c33f39627ec93
-RMD160 (libreoffice/libreoffice-help-6.2.5.2.tar.xz) = f732eb12ed557cd9bfc6de7cd1b2176371e3590a
-SHA512 (libreoffice/libreoffice-help-6.2.5.2.tar.xz) = 14f964161bd827a5846ec667ae1dac80d1485450e172da44010103e31f3872df62595e8b1b1d45c720caac9256d2adaf8f5a0bb80d059d35f1c560b533eb764c
-Size (libreoffice/libreoffice-help-6.2.5.2.tar.xz) = 13023680 bytes
-SHA1 (libreoffice/libreoffice-translations-6.2.5.2.tar.xz) = 774602b810d954ecdbf537214e63ab50b9a3f189
-RMD160 (libreoffice/libreoffice-translations-6.2.5.2.tar.xz) = 2dc40a797a00644759191beaa9dc77dc0c8a6a15
-SHA512 (libreoffice/libreoffice-translations-6.2.5.2.tar.xz) = 64297ccfe4a219764364434eab167947a75441a978c0564efae2f2f975bcae7ebfade70504641145ff4c25258276261dc1ad4aefdc930f20726c8bf7c381adf2
-Size (libreoffice/libreoffice-translations-6.2.5.2.tar.xz) = 141992032 bytes
+SHA1 (libreoffice/libreoffice-6.3.0.4.tar.xz) = d694b6fc8055252731f076135b0fe5eab710c6f3
+RMD160 (libreoffice/libreoffice-6.3.0.4.tar.xz) = d47837cbee1e2fe18a07039e58c186b4044f7d18
+SHA512 (libreoffice/libreoffice-6.3.0.4.tar.xz) = 508beebf1e687e9ff668a82682561b639bd98ab85406178855b4301c7060147e1b5bea330e88d3bd7ef8de8f065d6a15d658eb436af0b03208c75d83a4deae40
+Size (libreoffice/libreoffice-6.3.0.4.tar.xz) = 224504440 bytes
+SHA1 (libreoffice/libreoffice-dictionaries-6.3.0.4.tar.xz) = da87bd5cd94de13e0916cafe5ae08d22a3e26bb7
+RMD160 (libreoffice/libreoffice-dictionaries-6.3.0.4.tar.xz) = 15928a87ce1618604f7c70e308ecc41affdef1f6
+SHA512 (libreoffice/libreoffice-dictionaries-6.3.0.4.tar.xz) = a84f6f543b5cb5861c02321034d82467ba038d3d81ec6bdc9a78aaa3aa22b913a60d880bec16213763b0ac41e0a6ca8bda7083d6b94f643ea258e05043939723
+Size (libreoffice/libreoffice-dictionaries-6.3.0.4.tar.xz) = 45890248 bytes
+SHA1 (libreoffice/libreoffice-help-6.3.0.4.tar.xz) = b54c01a235f36072edb9a626cfff9dd70128619e
+RMD160 (libreoffice/libreoffice-help-6.3.0.4.tar.xz) = 22c7ccfcfc1a5bf4762118528b6a7d4bf7fbeebc
+SHA512 (libreoffice/libreoffice-help-6.3.0.4.tar.xz) = 1f197abb10d140037f10eb43b571b9e8f7b74b502f5bb91f4a3b4b388cd31aa81175df410321b9b401432c5ac02f9d08c7d681f07d68dd1733fb0536a1551ce8
+Size (libreoffice/libreoffice-help-6.3.0.4.tar.xz) = 13191436 bytes
+SHA1 (libreoffice/libreoffice-translations-6.3.0.4.tar.xz) = 56f2bcdf2762ff1108832a403266c863e9406ea2
+RMD160 (libreoffice/libreoffice-translations-6.3.0.4.tar.xz) = a2eb0166fa9739d0b889b35f4d14ff9319c9da69
+SHA512 (libreoffice/libreoffice-translations-6.3.0.4.tar.xz) = e45957a35a325fb1314196e780c4eaa0465cef8cbdb279813f1a1b648594570cade1a3f18c5c555f821fd6043b2c900ff4dfb353eef963af494876449e1af469
+Size (libreoffice/libreoffice-translations-6.3.0.4.tar.xz) = 146252828 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
@@ -200,45 +200,44 @@ SHA1 (libreoffice/postgresql-9.2.24.tar.
 RMD160 (libreoffice/postgresql-9.2.24.tar.bz2) = 2fc1b9c37cfefd5fae5bd02f974484c5fc680c08
 SHA512 (libreoffice/postgresql-9.2.24.tar.bz2) = a6f043e5ef5e12e23c1c43b26a5ecafce62f3a86f38b5b85e7cb0cb7aa376d40e460a526baf67ae40de40525e4744fb5e48650ee5e007db4ce9742fcf548bd56
 Size (libreoffice/postgresql-9.2.24.tar.bz2) = 16552576 bytes
-SHA1 (libreoffice/source-serif-font-2.007R.tar.gz) = c618454641720164ebd0cd7ad1f38c37ea115d12
-RMD160 (libreoffice/source-serif-font-2.007R.tar.gz) = 8fa0211db142feaae268b4f8567d62bad093de82
-SHA512 (libreoffice/source-serif-font-2.007R.tar.gz) = 4f450e6d036e052f660eb73158f15bfeb7f54d667ee698d2afb8b16850063d4a05f9ab5e74e7c21bfe1d427fb22213f4f48fbb2cefd4d236ec37e95c267e3478
-Size (libreoffice/source-serif-font-2.007R.tar.gz) = 820083 bytes
+SHA1 (libreoffice/source-serif-pro-3.000R.tar.gz) = daeeab2dde96e4e5a725657d1fd44600387816b2
+RMD160 (libreoffice/source-serif-pro-3.000R.tar.gz) = 40f66007d53a8e18970a26f0d59c60d77864a55c
+SHA512 (libreoffice/source-serif-pro-3.000R.tar.gz) = abbae601e8b91c095d7421c9c1fd0fad2d482816d23cdca83b0cff36c8bc9ef2116c256cc4967aefcb6166dcd4eb63733e0603086d1e4cf1f5b65a1660ebbee3
+Size (libreoffice/source-serif-pro-3.000R.tar.gz) = 1135588 bytes
 SHA1 (libreoffice/ttf-kacst_2.01+mry.tar.gz) = 1d699ebd588cf03d4181ded9d04acff84bf7ca65
 RMD160 (libreoffice/ttf-kacst_2.01+mry.tar.gz) = a34d054a40290d3439b218fff283f43e75dc423a
 SHA512 (libreoffice/ttf-kacst_2.01+mry.tar.gz) = b77f1c2ed1b8a5702c12829e7281e4fd7a64648eb4fb4cbe9c3ca93c413ee9e6a48de190f7be088cde0d07ceafa3761dfd13dd56fa0182e837f257e24b82413e
 Size (libreoffice/ttf-kacst_2.01+mry.tar.gz) = 407400 bytes
-SHA1 (libreoffice/xmlsec1-1.2.27.tar.gz) = 11a3329bd6b0b910c5d60d4562e3a152588942f8
-RMD160 (libreoffice/xmlsec1-1.2.27.tar.gz) = 0d49f995732b6f95f94eb752121a6a32de422c4e
-SHA512 (libreoffice/xmlsec1-1.2.27.tar.gz) = 01f7231d7d7ac8037aecc1f922acc572cbfe0903abf5bd5879d836438c36684e23402b803d20806fff6b1cdc5ad9af114d1341b10b336f71c0bce28b4716f920
-Size (libreoffice/xmlsec1-1.2.27.tar.gz) = 2013651 bytes
+SHA1 (libreoffice/xmlsec1-1.2.28.tar.gz) = e75580df2f638ef7e99743eb54d7f8015bc8c812
+RMD160 (libreoffice/xmlsec1-1.2.28.tar.gz) = 0371280acea535849ab259925be6ce3b69aa6e5d
+SHA512 (libreoffice/xmlsec1-1.2.28.tar.gz) = 17fa59e4ffee5e024caa4895e8ed21d1435f14e3a37d0ed781b1dd216333ae3b6099c460efd45d4a8097d0202522150b7b0ad543b47c1596d8473b6922270480
+Size (libreoffice/xmlsec1-1.2.28.tar.gz) = 1995599 bytes
 SHA1 (patch-Makefile.in) = c16214631f0e40af4b366c790c7b84e0e11a892e
 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) = c9b10c86e809961f9312d1dbd925c6bc77042f56
+SHA1 (patch-configure.ac) = 16ee821b40cc9fc272da42324f3922ffbdb3d0a5
 SHA1 (patch-desktop_scripts_soffice.sh) = e6342e08781ca8dac72a1f28407517d79155577c
 SHA1 (patch-desktop_unx_source_pagein.c) = 0aa2b289df6d0fa524bf057d532aa5f9ceb6dde5
-SHA1 (patch-download.lst) = 67ce8ba0ff3fe376f862d6ed603cd56af8a96646
-SHA1 (patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk) = 5c5d965558f3c431cde6fc280438b23494b22607
+SHA1 (patch-download.lst) = a2daa977fee0024176ebe7e180e92931a15fe8c6
+SHA1 (patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk) = 90e46a519fe587c5ac0022f84e5d94cf9e15c232
 SHA1 (patch-external_mariadb-connector-c_UnpackedTarball__mariadb-connector-c.mk) = 01798842e3f573f627be31660195edbac802df89
 SHA1 (patch-external_mariadb-connector-c_netbsd.patch) = e20e0cc58153b865551a8dd2819fb141f20fcb8d
-SHA1 (patch-external_postgresql_ExternalProject__postgresql.mk) = 7c94155221025fe3c89217341d81e279943078ce
+SHA1 (patch-external_postgresql_ExternalProject__postgresql.mk) = 48e68ff43b971996f81985ee79d71f7b83cce428
 SHA1 (patch-i18npool_source_breakiterator_breakiterator_unicode.cxx) = 0a784bced0874b3ef7cc3b6ff19a865e0d64ce49
 SHA1 (patch-i18npool_source_collator_collator_unicode.cxx) = 853367cf9a4be70c5d0de44a82e6fadc70e40ea6
 SHA1 (patch-i18npool_source_collator_gencoll_rule.cxx) = d4599017226a6bbf6b03f099bc499d6b9c99916f
 SHA1 (patch-i18npool_source_ordinalsuffix_ordinalsuffix.cxx) = 6019a57f8dbf849a503935a3208449b99451488c
-SHA1 (patch-i18npool_source_transliteration_ignoreDiacritics_CTL.cxx) = 50c810957b48db3cac46f87b6c777c5acb9466a5
 SHA1 (patch-i18nutil_source_utility_unicode.cxx) = 106186c9e199cd6fc68742b8f85d35c721826f5e
-SHA1 (patch-lotuswordpro_source_filter_localtime.cxx) = 8db23e81f54b5a71e331dfccb57cceb8aab92d2a
 SHA1 (patch-opencl_source_openclconfig.cxx) = 2178f73aa08148cfd54d9a8c79eb29bf535f2e6b
 SHA1 (patch-sal_osl_unx_system.hxx) = 478dd47dc512d283a554600951010bbaa10c2c0e
-SHA1 (patch-sal_osl_unx_thread.cxx) = b356ab15cf0e69052db94dfdf85101ce88bb2883
 SHA1 (patch-sal_rtl_cipher.cxx) = e5e46d0b96e25572be86bf26f0053436859736cd
+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
-SHA1 (patch-store_source_storbase.hxx) = 0c2aa20c6986466c2ddd3eac7694c9e16f181cff
-SHA1 (patch-vcl_Executable__visualbackendtest.mk) = 2db5f3e7daabb2a79181de5e136de019d5264b58
+SHA1 (patch-store_source_storbase.hxx) = 69c58db3984f22de45c7e32fdfd4f7c28340adf1
+SHA1 (patch-sw_source_ui_index_cnttab.cxx) = b057874090d95308e97e4cac900cbba93f86a418
+SHA1 (patch-vcl_Executable__visualbackendtest.mk) = 6ccabb5db4ba01d6d95355a034a912fe29595dbc
 SHA1 (patch-vcl_inc_scrptrun.h) = 52877f7f6c867e2baeed525c200ce7d75a97574a
 SHA1 (patch-xmloff_source_draw_ximp3dscene.cxx) = bdd0b2563e54424dd468c2334e17ab23057a69fb
 SHA1 (patch-xmlsecurity_source_gpg_CertificateImpl.hxx) = a4220a027da6b56692862c9c9cc51e12d68e4a41

Index: pkgsrc/misc/libreoffice/options.mk
diff -u pkgsrc/misc/libreoffice/options.mk:1.5 pkgsrc/misc/libreoffice/options.mk:1.6
--- pkgsrc/misc/libreoffice/options.mk:1.5      Tue Aug  1 11:57:36 2017
+++ pkgsrc/misc/libreoffice/options.mk  Sat Aug 10 11:41:29 2019
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.5 2017/08/01 11:57:36 ryoon Exp $
+# $NetBSD: options.mk,v 1.6 2019/08/10 11:41:29 ryoon Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.libreoffice
-PKG_SUPPORTED_OPTIONS= java debug kde4 gtk3 cups
+PKG_SUPPORTED_OPTIONS= java debug gtk3 cups # kde4 
 
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS"
@@ -10,7 +10,7 @@ PKG_SUGGESTED_OPTIONS+=       java
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=   java kde4 gtk3 cups
+PLIST_VARS+=   java gtk3 cups # kde4 
 
 .if !empty(PKG_OPTIONS:Mjava)
 .include "../../mk/java-env.mk"
@@ -51,14 +51,14 @@ PLIST.gtk3=         yes
 CONFIGURE_ARGS+=       --disable-gtk3
 .endif
 
-.if !empty(PKG_OPTIONS:Mkde4)
-CONFIGURE_ARGS+=       --enable-kde4
-CONFIGURE_ENV+=                KDE4DIR="${LOCALBASE}"
-PLIST.kde4=            yes
-.include "../../x11/kdelibs4/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=       --disable-kde4
-.endif
+#.if !empty(PKG_OPTIONS:Mkde4)
+#CONFIGURE_ARGS+=      --enable-kde4
+#CONFIGURE_ENV+=               KDE4DIR="${LOCALBASE}"
+#PLIST.kde4=           yes
+#.include "../../x11/kdelibs4/buildlink3.mk"
+#.else
+#CONFIGURE_ARGS+=      --disable-kde4
+#.endif
 
 .if empty(PKG_OPTIONS:Mcups)
 CONFIGURE_ARGS+=       --disable-cups

Index: pkgsrc/misc/libreoffice/patches/patch-configure.ac
diff -u pkgsrc/misc/libreoffice/patches/patch-configure.ac:1.13 pkgsrc/misc/libreoffice/patches/patch-configure.ac:1.14
--- pkgsrc/misc/libreoffice/patches/patch-configure.ac:1.13     Tue Feb 19 16:28:03 2019
+++ pkgsrc/misc/libreoffice/patches/patch-configure.ac  Sat Aug 10 11:41:29 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure.ac,v 1.13 2019/02/19 16:28:03 ryoon Exp $
+$NetBSD: patch-configure.ac,v 1.14 2019/08/10 11:41:29 ryoon Exp $
 
 add arm64 support.
 
@@ -6,10 +6,13 @@ fix __cxa_exception check.
 
 fix wrong default paths.
 
+Remove c++2a checks.
 
---- configure.ac.orig  2019-01-23 19:35:25.000000000 +0000
+NetBSD has no math_errhandling support yet.
+
+--- configure.ac.orig  2019-08-06 17:26:35.000000000 +0000
 +++ configure.ac
-@@ -4314,6 +4314,11 @@ linux-android*)
+@@ -4293,6 +4293,11 @@ haiku*)
      P_SEP=:
  
      case "$host_cpu" in
@@ -21,7 +24,7 @@ fix wrong default paths.
      i*86)
          CPUNAME=INTEL
          RTL_ARCH=x86
-@@ -6015,14 +6020,14 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG
+@@ -6236,14 +6241,14 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG
          ], [AC_MSG_RESULT([no])])
      AC_LANG_POP([C++])
  
@@ -39,7 +42,28 @@ fix wrong default paths.
              AC_MSG_RESULT([yes])
          ], [AC_MSG_RESULT([no])])
      AC_LANG_POP([C++])
-@@ -7782,7 +7787,7 @@ else
+@@ -6405,7 +6410,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=gnu++2a -std=c++2a -std=gnu++17 -std=gnu++1z -std=c++17 -std=c++1z'
++    my_flags='-std=gnu++17 -std=gnu++1z -std=c++17 -std=c++1z'
+     for flag in $my_flags; do
+         if test "$COM" = MSC; then
+             flag="-Xclang $flag"
+@@ -6474,7 +6479,11 @@ elif test "$GCC" = "yes" -o "$COM_IS_CLA
+             // solenv/gbuild/platform/LINUX_INTEL_GCC.mk), std=gnu* would cause math_errhandling to
+             // get undef'ed in /usr/include/bits/mathinline.h, while std=c* keeps it defined (as
+             // needed by sc/source/core/tool/math.cxx):
++#if defined(__NetBSD__)
++            int g() { return 1; }
++#else
+             int g() { return math_errhandling; }
++#endif
+             ]])],[CXXFLAGS_CXX11=$flag $my_float128hack])
+         AC_LANG_POP([C++])
+         CXXFLAGS=$save_CXXFLAGS
+@@ -8017,7 +8026,7 @@ else
      if test "$COM" = "MSC"; then
          LIBJPEG_LIBS="${WORKDIR}/UnpackedTarball/libjpeg-turbo/.libs/libjpeg.lib"
      else
@@ -48,7 +72,7 @@ fix wrong default paths.
      fi
  
      case "$host_cpu" in
-@@ -9333,11 +9338,11 @@ dnl HarfBuzz
+@@ -9586,11 +9595,11 @@ dnl HarfBuzz
  dnl ===================================================================
  libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 0.9.3],
                           ["-I${WORKDIR}/UnpackedTarball/graphite/include -DGRAPHITE2_STATIC"],
@@ -62,7 +86,7 @@ fix wrong default paths.
  
  if test "$COM" = "MSC"; then # override the above
      GRAPHITE_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/graphite.lib"
-@@ -10554,7 +10559,7 @@ elif test "$enable_mpl_subset" = "yes"; 
+@@ -10825,7 +10834,7 @@ elif test "$enable_mpl_subset" = "yes"; 
  elif test "$enable_fuzzers" = "yes"; then
      AC_MSG_CHECKING([whether gpgmepp should be disabled due to oss-fuzz])
      AC_MSG_RESULT([yes])
@@ -71,7 +95,7 @@ fix wrong default paths.
      dnl ===================================================================
      dnl Check for system gpgme
      dnl ===================================================================
-@@ -10564,7 +10569,7 @@ elif test "$_os" = "Linux" -o "$_os" = "
+@@ -10835,7 +10844,7 @@ elif test "$_os" = "Linux" -o "$_os" = "
          SYSTEM_GPGMEPP=TRUE
  
          # C++ library doesn't come with fancy gpgmepp-config, check for headers the old-fashioned way
@@ -80,7 +104,7 @@ fix wrong default paths.
              [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
-@@ -11897,8 +11902,8 @@ EOF
+@@ -11885,8 +11894,8 @@ EOF
      dnl Checking for ant.jar
      if test "$ANT_HOME" != "NO_ANT_HOME"; then
          AC_MSG_CHECKING([Ant lib directory])
Index: pkgsrc/misc/libreoffice/patches/patch-download.lst
diff -u pkgsrc/misc/libreoffice/patches/patch-download.lst:1.13 pkgsrc/misc/libreoffice/patches/patch-download.lst:1.14
--- pkgsrc/misc/libreoffice/patches/patch-download.lst:1.13     Tue Jul  2 13:03:11 2019
+++ pkgsrc/misc/libreoffice/patches/patch-download.lst  Sat Aug 10 11:41:29 2019
@@ -1,13 +1,13 @@
-$NetBSD: patch-download.lst,v 1.13 2019/07/02 13:03:11 ryoon Exp $
+$NetBSD: patch-download.lst,v 1.14 2019/08/10 11:41:29 ryoon Exp $
 
---- download.lst.orig  2019-01-23 19:35:25.000000000 +0000
+--- download.lst.orig  2019-08-06 17:26:35.000000000 +0000
 +++ download.lst
 @@ -96,8 +96,8 @@ export GPGME_SHA256SUM := 1b29fedb8bfad7
  export GPGME_TARBALL := gpgme-1.9.0.tar.bz2
- export GRAPHITE_SHA256SUM := aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9
- export GRAPHITE_TARBALL := graphite2-minimal-1.3.10.tgz
--export HARFBUZZ_SHA256SUM := 3c592f86fa0da69e2e0e98cae9f5d5b61def3bb7948aa00ca45748f27fa545fd
--export HARFBUZZ_TARBALL := harfbuzz-1.8.4.tar.bz2
+ export GRAPHITE_SHA256SUM := d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36
+ export GRAPHITE_TARBALL := graphite2-minimal-1.3.13.tgz
+-export HARFBUZZ_SHA256SUM := f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468
+-export HARFBUZZ_TARBALL := harfbuzz-2.3.1.tar.bz2
 +export HARFBUZZ_SHA256SUM := fed00dc797b7ba3ca943225f0a854baaed4c1640fff8a31d455cd3b5caec855c
 +export HARFBUZZ_TARBALL := harfbuzz-2.5.3.tar.xz
  export HSQLDB_SHA256SUM := d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370

Index: pkgsrc/misc/libreoffice/patches/patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk
diff -u pkgsrc/misc/libreoffice/patches/patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk:1.6 pkgsrc/misc/libreoffice/patches/patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk:1.7
--- pkgsrc/misc/libreoffice/patches/patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk:1.6    Tue Feb 19 16:28:03 2019
+++ pkgsrc/misc/libreoffice/patches/patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk        Sat Aug 10 11:41:29 2019
@@ -1,24 +1,15 @@
-$NetBSD: patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk,v 1.6 2019/02/19 16:28:03 ryoon Exp $
+$NetBSD: patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk,v 1.7 2019/08/10 11:41:29 ryoon Exp $
 
---- external/harfbuzz/UnpackedTarball_harfbuzz.mk.orig 2019-01-23 19:35:25.000000000 +0000
+--- external/harfbuzz/UnpackedTarball_harfbuzz.mk.orig 2019-08-06 17:26:35.000000000 +0000
 +++ external/harfbuzz/UnpackedTarball_harfbuzz.mk
-@@ -15,19 +15,10 @@ $(eval $(call gb_UnpackedTarball_update_
+@@ -15,10 +15,4 @@ $(eval $(call gb_UnpackedTarball_update_
  
  $(eval $(call gb_UnpackedTarball_set_patchlevel,harfbuzz,0))
  
+-# * external/harfbuzz/msvc.patch sent upstream as <https://github.com/harfbuzz/harfbuzz/pull/1605>
+-#   "Fix hb_atomic_* variants based on C++11 atomics":
 -$(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
--    external/harfbuzz/clang-cl.patch \
--    external/harfbuzz/ubsan.patch \
--))
--
- ifneq ($(ENABLE_RUNTIME_OPTIMIZATIONS),TRUE)
- $(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
-     external/harfbuzz/harfbuzz-rtti.patch \
- ))
- endif
- 
--$(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
--    external/harfbuzz/harfbuzz-ios.patch \
+-    external/harfbuzz/msvc.patch \
 -))
 -
  # vim: set noet sw=4 ts=4:

Index: pkgsrc/misc/libreoffice/patches/patch-external_postgresql_ExternalProject__postgresql.mk
diff -u pkgsrc/misc/libreoffice/patches/patch-external_postgresql_ExternalProject__postgresql.mk:1.1 pkgsrc/misc/libreoffice/patches/patch-external_postgresql_ExternalProject__postgresql.mk:1.2
--- pkgsrc/misc/libreoffice/patches/patch-external_postgresql_ExternalProject__postgresql.mk:1.1        Tue Dec  6 15:21:00 2016
+++ pkgsrc/misc/libreoffice/patches/patch-external_postgresql_ExternalProject__postgresql.mk    Sat Aug 10 11:41:29 2019
@@ -1,15 +1,15 @@
-$NetBSD: patch-external_postgresql_ExternalProject__postgresql.mk,v 1.1 2016/12/06 15:21:00 ryoon Exp $
+$NetBSD: patch-external_postgresql_ExternalProject__postgresql.mk,v 1.2 2019/08/10 11:41:29 ryoon Exp $
 
 * Do not try to link NSPR/NSS libraries. They are not required really.
 
---- external/postgresql/ExternalProject_postgresql.mk.orig     2016-07-28 22:11:19.000000000 +0000
+--- external/postgresql/ExternalProject_postgresql.mk.orig     2019-08-06 17:26:35.000000000 +0000
 +++ external/postgresql/ExternalProject_postgresql.mk
-@@ -60,7 +60,7 @@ $(call gb_ExternalProject_get_state_targ
-                               $(if $(WITH_GSSAPI),--with-gssapi)) \
+@@ -67,7 +67,7 @@ $(call gb_ExternalProject_get_state_targ
+                               $(if $(ENABLE_LDAP),,--with-ldap=no) \
                        CPPFLAGS="$(postgresql_CPPFLAGS)" \
                        LDFLAGS="$(postgresql_LDFLAGS)" \
--                      EXTRA_LDAP_LIBS="-llber -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4" \
-+                      EXTRA_LDAP_LIBS="-llber" \
+-                      $(if $(ENABLE_LDAP),EXTRA_LDAP_LIBS="-llber -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4") \
++                      $(if $(ENABLE_LDAP),EXTRA_LDAP_LIBS="-llber") \
                && cd src/interfaces/libpq \
                && MAKEFLAGS= && $(MAKE) all-static-lib)
  
Index: pkgsrc/misc/libreoffice/patches/patch-store_source_storbase.hxx
diff -u pkgsrc/misc/libreoffice/patches/patch-store_source_storbase.hxx:1.1 pkgsrc/misc/libreoffice/patches/patch-store_source_storbase.hxx:1.2
--- pkgsrc/misc/libreoffice/patches/patch-store_source_storbase.hxx:1.1 Mon Feb 25 14:12:53 2019
+++ pkgsrc/misc/libreoffice/patches/patch-store_source_storbase.hxx     Sat Aug 10 11:41:29 2019
@@ -1,12 +1,12 @@
-$NetBSD: patch-store_source_storbase.hxx,v 1.1 2019/02/25 14:12:53 tnn Exp $
+$NetBSD: patch-store_source_storbase.hxx,v 1.2 2019/08/10 11:41:29 ryoon Exp $
 
 include <cstdlib> for std::free()
 
---- store/source/storbase.hxx.orig     2019-01-23 19:35:25.000000000 +0000
+--- store/source/storbase.hxx.orig     2019-08-06 17:26:35.000000000 +0000
 +++ store/source/storbase.hxx
-@@ -38,6 +38,7 @@
- #include <stddef.h>
- #include <string.h>
+@@ -35,6 +35,7 @@
+ 
+ #include <memory>
  #include <utility>
 +#include <cstdlib>
  

Index: pkgsrc/misc/libreoffice/patches/patch-vcl_Executable__visualbackendtest.mk
diff -u pkgsrc/misc/libreoffice/patches/patch-vcl_Executable__visualbackendtest.mk:1.2 pkgsrc/misc/libreoffice/patches/patch-vcl_Executable__visualbackendtest.mk:1.3
--- pkgsrc/misc/libreoffice/patches/patch-vcl_Executable__visualbackendtest.mk:1.2      Tue Aug  1 11:57:37 2017
+++ pkgsrc/misc/libreoffice/patches/patch-vcl_Executable__visualbackendtest.mk  Sat Aug 10 11:41:29 2019
@@ -1,8 +1,8 @@
-$NetBSD: patch-vcl_Executable__visualbackendtest.mk,v 1.2 2017/08/01 11:57:37 ryoon Exp $
+$NetBSD: patch-vcl_Executable__visualbackendtest.mk,v 1.3 2019/08/10 11:41:29 ryoon Exp $
 
 * Fix build on non-Linux Unix-like OSes
 
---- vcl/Executable_visualbackendtest.mk.orig   2017-07-25 20:26:39.000000000 +0000
+--- vcl/Executable_visualbackendtest.mk.orig   2019-08-06 17:26:35.000000000 +0000
 +++ vcl/Executable_visualbackendtest.mk
 @@ -41,10 +41,10 @@ $(eval $(call gb_Executable_use_static_l
      vclmain \
@@ -14,6 +14,6 @@ $NetBSD: patch-vcl_Executable__visualbac
        -lm \
 -      -ldl \
 +      $(DLOPEN_LIBS) \
-       -lpthread \
      -lX11 \
  ))
+ 

Added files:

Index: pkgsrc/misc/libreoffice/patches/patch-sc_source_core_tool_math.cxx
diff -u /dev/null pkgsrc/misc/libreoffice/patches/patch-sc_source_core_tool_math.cxx:1.1
--- /dev/null   Sat Aug 10 11:41:29 2019
+++ pkgsrc/misc/libreoffice/patches/patch-sc_source_core_tool_math.cxx  Sat Aug 10 11:41:29 2019
@@ -0,0 +1,32 @@
+$NetBSD: patch-sc_source_core_tool_math.cxx,v 1.1 2019/08/10 11:41:29 ryoon Exp $
+
+NetBSD has no math_errhandling support yet.
+
+--- sc/source/core/tool/math.cxx.orig  2019-08-06 17:26:35.000000000 +0000
++++ sc/source/core/tool/math.cxx
+@@ -18,7 +18,9 @@ static double err_pow( const double& fVa
+ {
+     // pow() is expected to set domain error or pole error or range error (or
+     // flag them via exceptions) or return NaN or Inf.
++#if !defined(__NetBSD__)
+     assert((math_errhandling & (MATH_ERRNO | MATH_ERREXCEPT)) != 0);
++#endif
+     std::feclearexcept(FE_ALL_EXCEPT);
+     errno = 0;
+     return pow( fVal1, fVal2);
+@@ -49,10 +51,15 @@ double power( const double& fVal1, const
+         fPow = err_pow( fVal1, fVal2);
+     }
+     // The pow() call must had been the most recent call to check errno or exception.
++#if defined(__NetBSD__)
++    if ((errno == EDOM || errno == ERANGE)
++            || !rtl::math::isFinite(fPow))
++#else
+     if ((((math_errhandling & MATH_ERRNO) != 0) && (errno == EDOM || errno == ERANGE))
+             || (((math_errhandling & MATH_ERREXCEPT) != 0)
+                 && std::fetestexcept( FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW | FE_UNDERFLOW))
+             || !rtl::math::isFinite(fPow))
++#endif
+     {
+         fPow = CreateDoubleError( FormulaError::IllegalFPOperation);
+     }
Index: pkgsrc/misc/libreoffice/patches/patch-sw_source_ui_index_cnttab.cxx
diff -u /dev/null pkgsrc/misc/libreoffice/patches/patch-sw_source_ui_index_cnttab.cxx:1.1
--- /dev/null   Sat Aug 10 11:41:29 2019
+++ pkgsrc/misc/libreoffice/patches/patch-sw_source_ui_index_cnttab.cxx Sat Aug 10 11:41:29 2019
@@ -0,0 +1,13 @@
+$NetBSD: patch-sw_source_ui_index_cnttab.cxx,v 1.1 2019/08/10 11:41:29 ryoon Exp $
+
+--- sw/source/ui/index/cnttab.cxx.orig 2019-08-06 17:26:35.000000000 +0000
++++ sw/source/ui/index/cnttab.cxx
+@@ -1554,7 +1554,7 @@ void SwTOXEdit::AdjustSize()
+ {
+     auto nWidth = m_xEntry->get_pixel_size(GetText()).Width();
+     float fChars = nWidth / m_xEntry->get_approximate_digit_width();
+-    m_xEntry->set_width_chars(std::max(1.0f, ceil(fChars)));
++    m_xEntry->set_width_chars(std::max((double)1.0f, (double)ceil(fChars)));
+ }
+ 
+ class SwTOXButton : public SwTOXWidget



Home | Main Index | Thread Index | Old Index