summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorryoon <ryoon@pkgsrc.org>2022-08-22 13:58:32 +0000
committerryoon <ryoon@pkgsrc.org>2022-08-22 13:58:32 +0000
commitfcb7a7c4d2e1c0d24c52c06c867509df3129d595 (patch)
tree8d008dfcb80bad4c895d8874b8ee4d58ebbff0ac /misc
parentcbe782aa42bf1765186100eae25d4bbcbf8ac67e (diff)
downloadpkgsrc-fcb7a7c4d2e1c0d24c52c06c867509df3129d595.tar.gz
libreoffice: Update to 7.4.0.3
Changelog: Most Significant New Features GENERAL * Support for WebP images and EMZ/WMZ files * Help pages for the ScriptForge scripting library * Search field for the Extension Manager * Performance and compatibility improvements WRITER * Better change tracking in the footnote area * Edited lists show original numbers in change tracking * New typographic settings for hyphenation CALC * Support for 16,384 columns in spreadsheets * Extra functions in drop-down AutoSum widget * New menu item to search for sheet names IMPRESS * New support for document themes
Diffstat (limited to 'misc')
-rw-r--r--misc/libreoffice/Makefile51
-rw-r--r--misc/libreoffice/PLIST40
-rw-r--r--misc/libreoffice/PLIST.java2
-rw-r--r--misc/libreoffice/distinfo59
-rw-r--r--misc/libreoffice/patches/patch-configure.ac53
-rw-r--r--misc/libreoffice/patches/patch-external_pdfium_pkgsrc.patch.139
-rw-r--r--misc/libreoffice/patches/patch-external_skia_UnpackedTarball__skia.mk14
-rw-r--r--misc/libreoffice/patches/patch-external_skia_netbsd.patch.024
-rw-r--r--misc/libreoffice/patches/patch-i18nutil_source_utility_unicode.cxx8
-rw-r--r--misc/libreoffice/patches/patch-vcl_unx_generic_app_geninst.cxx20
10 files changed, 174 insertions, 136 deletions
diff --git a/misc/libreoffice/Makefile b/misc/libreoffice/Makefile
index 940b0186535..42d931dd03a 100644
--- a/misc/libreoffice/Makefile
+++ b/misc/libreoffice/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.288 2022/08/11 05:09:03 gutteridge Exp $
+# $NetBSD: Makefile,v 1.289 2022/08/22 13:58:32 ryoon Exp $
-VERREL= 7.3.3
-VERRC= 2
+VERREL= 7.4.0
+VERRC= 3
VER= ${VERREL}.${VERRC}
DISTNAME= libreoffice-${VER}
-PKGREVISION= 3
CATEGORIES= misc
MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/${VERREL}/
EXTRACT_SUFX= .tar.xz
@@ -30,11 +29,17 @@ SUBST_MESSAGE.use-bash= Using bash for configure script
SUBST_FILES.use-bash+= autogen.sh
SUBST_VARS.use-bash+= BASH
-SUBST_CLASSES+= zxing
-SUBST_STAGE.zxing= pre-configure
-SUBST_MESSAGE.zxing= Include zxing header files
-SUBST_FILES.zxing+= configure.ac
-SUBST_SED.zxing+= -e 's,ZXING_CFLAGS=-I/usr/include/ZXing,ZXING_CFLAGS=-I${BUILDLINK_PREFIX.zxing-cpp}/include/ZXing,'
+#SUBST_CLASSES+= zxing
+#SUBST_STAGE.zxing= pre-configure
+#SUBST_MESSAGE.zxing= Include zxing header files
+#SUBST_FILES.zxing+= configure.ac
+#SUBST_SED.zxing+= -e 's,ZXING_CFLAGS=-I/usr/include/ZXing,ZXING_CFLAGS=-I${BUILDLINK_PREFIX.zxing-cpp}/include/ZXing,'
+
+SUBST_CLASSES+= dragonbox
+SUBST_STAGE.dragonbox= pre-configure
+SUBST_MESSAGE.dragonbox= Include dragonbox header files
+SUBST_FILES.dragonbox+= configure.ac
+SUBST_SED.dragonbox+= -e 's,/usr/include/dragonbox-1.0.0,${BUILDLINK_PREFIX.dragonbox}/include/dragonbox-1.1.3,'
SUBST_CLASSES+= font-path
SUBST_STAGE.font-path= pre-configure
@@ -48,7 +53,7 @@ BUILD_TARGET= build
.include "../../mk/bsd.prefs.mk"
pre-build:
- # Workaround for internal libjpeg-turbo
+ # Workaround for external openldap
${MKDIR} ${WRKSRC}/workdir/ExternalProject
.if ${OPSYS} == "NetBSD"
cd ${WRKSRC} && \
@@ -85,7 +90,7 @@ MORE_DISTFILES= \
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-pro-3.000R.tar.gz \
- xmlsec1-1.2.33.tar.gz \
+ xmlsec1-1.2.34.tar.gz \
3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip \
35c94d2df8893241173de1d16b6034c0-swingExSrc.zip \
39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip \
@@ -112,7 +117,6 @@ MORE_DISTFILES= \
graphite2-minimal-1.3.14.tgz \
1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip \
EmojiOneColor-SVGinOT-1.3.tar.gz \
- libjpeg-turbo-2.1.1.tar.gz \
alef-1.001.tar.gz \
c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz \
culmus-0.133.tar.gz \
@@ -123,12 +127,14 @@ MORE_DISTFILES= \
lxml-4.1.1.tgz \
Amiri-0.111.zip \
ReemKufi-0.7.zip \
- pdfium-4699.tar.bz2 \
+ pdfium-5058.tar.bz2 \
dtoa-20180411.tgz \
- skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz \
+ skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz \
libcmis-0.5.2.tar.xz \
libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz
+# libjpeg-turbo-2.1.1.tar.gz
+
.for md in ${MORE_DISTFILES}
DISTFILES+= ${md}
SITES.${md}= https://dev-www.libreoffice.org/src/
@@ -174,7 +180,7 @@ USE_LIBTOOL= yes
# Use GNU find from findutils.
TOOLS_PLATFORM.find= # empty
# GUN tar is really needed. Some Makefiles depends on GNUTAR.
-USE_TOOLS+= automake bash bison gmake gtar
+USE_TOOLS+= automake bash bison gmake gsed gtar
USE_TOOLS+= msgfmt perl pkg-config unzip zip
PTHREAD_OPTS+= require
@@ -185,7 +191,7 @@ CXXFLAGS.NetBSD+= -DNO_CPLUSPLUS_ALLOCA
# Do not use /tmp, outside of WRKSRC.
CONFIGURE_ENV+= TMPDIR=${WRKSRC}/tmp
-CONFIGURE_ENV+= ANT_LIB=${LOCALBASE}/lib/java/ant
+CONFIGURE_ENV+= ANT_LIB=${PREFIX}/lib/java/ant
MAKE_JOBS_SAFE= no # --with-parallelism conficts with -jN
.if !empty(MAKE_JOBS.${PKGPATH})
@@ -214,11 +220,13 @@ CONFIGURE_ARGS+= --enable-python=system
CONFIGURE_ARGS+= --enable-ext-wiki-publisher
CONFIGURE_ARGS+= --enable-ext-nlpsolver
CONFIGURE_ARGS+= --with-system-gpgmepp
-CONFIGURE_ARGS+= --without-system-jpeg
+#CONFIGURE_ARGS+= --without-system-jpeg
+CONFIGURE_ARGS+= --with-system-jpeg
CONFIGURE_ARGS+= --without-system-postgresql
CONFIGURE_ARGS+= --without-system-mariadb
CONFIGURE_ARGS+= --without-system-xmlsec # Needs NSS support
CONFIGURE_ARGS+= --with-system-zxing
+CONFIGURE_ENV+= CPLUS_INCLUDE_PATH=${BUILDLINK_PREFIX.zxing-cpp}/include
# Internal libcmis-0.5.2 is patched. Do not libcmis-0.5.2nb13 from net/libcmis.
CONFIGURE_ARGS+= --without-system-libcmis
CONFIGURE_ARGS+= --with-compat-oowrappers
@@ -231,6 +239,7 @@ CONFIGURE_ARGS+= --with-system-libs
CONFIGURE_ARGS+= --with-system-dicts
CONFIGURE_ARGS+= --with-vendor="pkgsrc"
CONFIGURE_ARGS+= --with-tls="nss"
+CONFIGURE_ARGS+= --with-system-nss
CONFIGURE_ARGS+= --without-doxygen
CONFIGURE_ARGS+= --without-junit
CONFIGURE_ARGS+= --without-krb5
@@ -277,7 +286,7 @@ CONFIGURE_SCRIPT= ${WRKSRC}/autogen.sh
MAKE_ENV+= ROOT_USER=${ROOT_USER}
MAKE_ENV+= ROOT_GROUP=${ROOT_GROUP}
-MAKE_ENV+= SHELL=${BASH}
+MAKE_ENV+= SHELL=${BASH:Q}
# configure script should use `pkg-config --cflags xzing`
#MAKE_ENV+= LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
BUILD_MAKE_FLAGS+= VERBOSE=true
@@ -381,8 +390,7 @@ BUILDLINK_API_DEPENDS.libetonyek+= libetonyek>=0.1.2
.include "../../graphics/box2d/buildlink3.mk"
.include "../../graphics/graphite2/buildlink3.mk"
.endif
-# Requires JCS_EXT_BGRA
-#.include "../../mk/jpeg.buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
.include "../../graphics/cairo/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/gdk-pixbuf2-xlib/buildlink3.mk"
@@ -392,6 +400,7 @@ BUILDLINK_API_DEPENDS.libetonyek+= libetonyek>=0.1.2
.include "../../graphics/lcms2/buildlink3.mk"
.include "../../graphics/libepoxy/buildlink3.mk"
.include "../../graphics/librsvg/buildlink3.mk"
+.include "../../graphics/libwebp/buildlink3.mk"
.include "../../graphics/openjpeg/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/zxing-cpp/buildlink3.mk"
@@ -403,6 +412,8 @@ BUILDLINK_API_DEPENDS.libetonyek+= libetonyek>=0.1.2
BUILDLINK_INCDIRS.${PYPKGPREFIX:S/py/python/}= # empty
.include "../../lang/python/tool.mk"
.include "../../math/coinmp/buildlink3.mk"
+.include "../../math/dragonbox/buildlink3.mk"
+.include "../../math/libfixmath/buildlink3.mk"
BUILDLINK_API_DEPENDS.libnumbertext+= libnumbertext>=1.0.6
.include "../../math/libnumbertext/buildlink3.mk"
.include "../../math/lp_solve/buildlink3.mk"
diff --git a/misc/libreoffice/PLIST b/misc/libreoffice/PLIST
index 96f87e8b199..573b54c0d51 100644
--- a/misc/libreoffice/PLIST
+++ b/misc/libreoffice/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.48 2022/03/04 13:47:01 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.49 2022/08/22 13:58:32 ryoon Exp $
bin/libreoffice
bin/lobase
bin/localc
@@ -5259,6 +5259,7 @@ ${PKGNAME}/lib/libreoffice/program/gengal.bin
${PKGNAME}/lib/libreoffice/program/intro-highres.png
${PKGNAME}/lib/libreoffice/program/intro.png
${PKGNAME}/lib/libreoffice/program/java-set-classpath
+${PKGNAME}/lib/libreoffice/program/libLanguageToollo.so
${PKGNAME}/lib/libreoffice/program/libOGLTranslo.so
${PKGNAME}/lib/libreoffice/program/libPresentationMinimizerlo.so
${PKGNAME}/lib/libreoffice/program/libPresenterScreenlo.so
@@ -5307,6 +5308,7 @@ ${PKGNAME}/lib/libreoffice/program/libdesktopbe1lo.so
${PKGNAME}/lib/libreoffice/program/libdict_ja.so
${PKGNAME}/lib/libreoffice/program/libdict_zh.so
${PKGNAME}/lib/libreoffice/program/libdlgprovlo.so
+${PKGNAME}/lib/libreoffice/program/libdrawinglayercorelo.so
${PKGNAME}/lib/libreoffice/program/libdrawinglayerlo.so
${PKGNAME}/lib/libreoffice/program/libeditenglo.so
${PKGNAME}/lib/libreoffice/program/libembobj.so
@@ -10110,6 +10112,13 @@ ${PKGNAME}/lib/libreoffice/share/basic/SFDocuments/SF_Writer.xba
${PKGNAME}/lib/libreoffice/share/basic/SFDocuments/__License.xba
${PKGNAME}/lib/libreoffice/share/basic/SFDocuments/dialog.xlb
${PKGNAME}/lib/libreoffice/share/basic/SFDocuments/script.xlb
+${PKGNAME}/lib/libreoffice/share/basic/SFUnitTests/SF_Register.xba
+${PKGNAME}/lib/libreoffice/share/basic/SFUnitTests/SF_UnitTest.xba
+${PKGNAME}/lib/libreoffice/share/basic/SFUnitTests/__License.xba
+${PKGNAME}/lib/libreoffice/share/basic/SFUnitTests/dialog.xlb
+${PKGNAME}/lib/libreoffice/share/basic/SFUnitTests/script.xlb
+${PKGNAME}/lib/libreoffice/share/basic/SFWidgets/SF_Menu.xba
+${PKGNAME}/lib/libreoffice/share/basic/SFWidgets/SF_MenuListener.xba
${PKGNAME}/lib/libreoffice/share/basic/SFWidgets/SF_PopupMenu.xba
${PKGNAME}/lib/libreoffice/share/basic/SFWidgets/SF_Register.xba
${PKGNAME}/lib/libreoffice/share/basic/SFWidgets/__License.xba
@@ -10125,6 +10134,7 @@ ${PKGNAME}/lib/libreoffice/share/basic/ScriptForge/SF_FileSystem.xba
${PKGNAME}/lib/libreoffice/share/basic/ScriptForge/SF_L10N.xba
${PKGNAME}/lib/libreoffice/share/basic/ScriptForge/SF_Platform.xba
${PKGNAME}/lib/libreoffice/share/basic/ScriptForge/SF_PythonHelper.xba
+${PKGNAME}/lib/libreoffice/share/basic/ScriptForge/SF_Region.xba
${PKGNAME}/lib/libreoffice/share/basic/ScriptForge/SF_Root.xba
${PKGNAME}/lib/libreoffice/share/basic/ScriptForge/SF_Services.xba
${PKGNAME}/lib/libreoffice/share/basic/ScriptForge/SF_Session.xba
@@ -10187,6 +10197,8 @@ ${PKGNAME}/lib/libreoffice/share/config/images_breeze_dark.zip
${PKGNAME}/lib/libreoffice/share/config/images_breeze_dark_svg.zip
${PKGNAME}/lib/libreoffice/share/config/images_breeze_svg.zip
${PKGNAME}/lib/libreoffice/share/config/images_colibre.zip
+${PKGNAME}/lib/libreoffice/share/config/images_colibre_dark.zip
+${PKGNAME}/lib/libreoffice/share/config/images_colibre_dark_svg.zip
${PKGNAME}/lib/libreoffice/share/config/images_colibre_svg.zip
${PKGNAME}/lib/libreoffice/share/config/images_elementary.zip
${PKGNAME}/lib/libreoffice/share/config/images_elementary_svg.zip
@@ -10287,6 +10299,7 @@ ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/cui/ui/insertoleobject.ui
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/cui/ui/insertrowcolumn.ui
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/cui/ui/javaclasspathdialog.ui
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/cui/ui/javastartparametersdialog.ui
+${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/cui/ui/langtoolconfigpage.ui
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/cui/ui/linedialog.ui
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/cui/ui/lineendstabpage.ui
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/cui/ui/linestyletabpage.ui
@@ -10394,6 +10407,7 @@ ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/cui/ui/textattrtabpage.ui
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/cui/ui/textcolumnstabpage.ui
${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/themetabpage.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/toolbarmodedialog.ui
@@ -10650,6 +10664,7 @@ ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/popupmenu/prev
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/popupmenu/row_operations.xml
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/popupmenu/rowheader.xml
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/popupmenu/sheettab.xml
+${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/popupmenu/sparkline.xml
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/statusbar/statusbar.xml
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/toolbar/alignmentbar.xml
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/toolbar/arrowsbar.xml
@@ -10746,6 +10761,7 @@ ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/formulacalc
${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/gotosheetdialog.ui
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/groupbydate.ui
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/groupbynumber.ui
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/groupdialog.ui
@@ -10845,6 +10861,8 @@ ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/sortkey.ui
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/sortoptionspage.ui
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/sorttransformationentry.ui
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/sortwarning.ui
+${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/sparklinedatarangedialog.ui
+${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/sparklinedialog.ui
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/splitcolumnentry.ui
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/standardfilterdialog.ui
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/statisticsinfopage.ui
@@ -11216,6 +11234,7 @@ ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/simpress/ui/sidebars
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/simpress/ui/slidecontextmenu.ui
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/simpress/ui/slidedesigndialog.ui
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/simpress/ui/slidetransitionspanel.ui
+${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/simpress/ui/snapmenu.ui
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/simpress/ui/tabledesignpanel.ui
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/simpress/ui/tabviewbar.ui
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/simpress/ui/templatedialog.ui
@@ -11236,6 +11255,8 @@ ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/smath/ui/fonttypedia
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/smath/ui/mathwindow.ui
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/smath/ui/printeroptions.ui
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/smath/ui/savedefaultsdialog.ui
+${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/smath/ui/sidebarelements_math.ui
+${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/smath/ui/sidebarproperties_math.ui
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/smath/ui/smathsettings.ui
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/smath/ui/spacingdialog.ui
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/smath/ui/symdefinedialog.ui
@@ -11516,6 +11537,10 @@ ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/columnwid
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/combobox.ui
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/comboboxfragment.ui
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/conditionpage.ui
+${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/contentcontrolcalendar.ui
+${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/contentcontroldlg.ui
+${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/contentcontroldropdown.ui
+${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/contentcontrollistitemdlg.ui
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/converttexttable.ui
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/createaddresslist.ui
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/createauthorentry.ui
@@ -11544,7 +11569,6 @@ ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/flddocume
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/fldfuncpage.ui
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/fldrefpage.ui
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/fldvarpage.ui
-${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/floatingnavigation.ui
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/floatingsync.ui
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/footendnotedialog.ui
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/footnoteareapage.ui
@@ -11926,6 +11950,8 @@ ${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/svx/ui/formpropertydialog.ui
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/svx/ui/functionmenu.ui
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/svx/ui/gallerymenu1.ui
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/svx/ui/gallerymenu2.ui
+${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/svx/ui/genericcheckdialog.ui
+${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/svx/ui/genericcheckentry.ui
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/svx/ui/grafctrlbox.ui
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/svx/ui/grafmodebox.ui
${PKGNAME}/lib/libreoffice/share/config/soffice.cfg/svx/ui/headfootformatpage.ui
@@ -12167,6 +12193,13 @@ ${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-ckb/LICENSES-en.txt
+${PKGNAME}/lib/libreoffice/share/extensions/dict-ckb/META-INF/manifest.xml
+${PKGNAME}/lib/libreoffice/share/extensions/dict-ckb/ckb.aff
+${PKGNAME}/lib/libreoffice/share/extensions/dict-ckb/ckb.dic
+${PKGNAME}/lib/libreoffice/share/extensions/dict-ckb/description.xml
+${PKGNAME}/lib/libreoffice/share/extensions/dict-ckb/description/desc_en_US.txt
+${PKGNAME}/lib/libreoffice/share/extensions/dict-ckb/dictionaries.xcu
${PKGNAME}/lib/libreoffice/share/extensions/dict-cs/META-INF/manifest.xml
${PKGNAME}/lib/libreoffice/share/extensions/dict-cs/README_cs.txt
${PKGNAME}/lib/libreoffice/share/extensions/dict-cs/README_en.txt
@@ -14710,6 +14743,3 @@ share/metainfo/libreoffice-impress.appdata.xml
share/metainfo/libreoffice-writer.appdata.xml
share/metainfo/org.libreoffice.kde.metainfo.xml
share/mime/packages/libreoffice.xml
-@pkgdir ${PKGNAME}/lib/libreoffice/share/uno_packages/cache/uno_packages
-@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/fur
-@pkgdir ${PKGNAME}/lib/libreoffice/share/autotext/ckb
diff --git a/misc/libreoffice/PLIST.java b/misc/libreoffice/PLIST.java
index 31cd0cd2c8e..2f6b7643d5d 100644
--- a/misc/libreoffice/PLIST.java
+++ b/misc/libreoffice/PLIST.java
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.java,v 1.14 2022/02/05 04:53:43 ryoon Exp $
+@comment $NetBSD: PLIST.java,v 1.15 2022/08/22 13:58:32 ryoon Exp $
${PKGNAME}/lib/libreoffice/program/JREProperties.class
${PKGNAME}/lib/libreoffice/program/classes/ScriptFramework.jar
${PKGNAME}/lib/libreoffice/program/classes/ScriptProviderForBeanShell.jar
diff --git a/misc/libreoffice/distinfo b/misc/libreoffice/distinfo
index 945d18e8d21..46a613cdea4 100644
--- a/misc/libreoffice/distinfo
+++ b/misc/libreoffice/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.130 2022/07/17 10:58:12 tnn Exp $
+$NetBSD: distinfo,v 1.131 2022/08/22 13:58:32 ryoon Exp $
BLAKE2s (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 0e0a0ae1eb07e5058749dc1726bc59971c723b4b16c57d83f24b6ac6ddd96d71
SHA512 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46
@@ -126,24 +126,21 @@ Size (libreoffice/liberation-fonts-ttf-2.1.4.tar.gz) = 2388283 bytes
BLAKE2s (libreoffice/liberation-narrow-fonts-ttf-1.07.6.tar.gz) = 88f456ed6d4b6ea4930cbea0905e3f101a92722a294b7205563d4d64b81b6c72
SHA512 (libreoffice/liberation-narrow-fonts-ttf-1.07.6.tar.gz) = bea2b8af3eaf32cc57faf1a582fdbef0ba3f2d5c2d9615f3c83c6b5aaac37856a25147cab26c3b18c3dca1b109b2a853874f5876dd6ae614676db3118f1bb804
Size (libreoffice/liberation-narrow-fonts-ttf-1.07.6.tar.gz) = 300832 bytes
-BLAKE2s (libreoffice/libjpeg-turbo-2.1.1.tar.gz) = 8ca4570fb6507241badab2f4ea78e22811e336a9f02cf2ad9616a30b0962d38e
-SHA512 (libreoffice/libjpeg-turbo-2.1.1.tar.gz) = 20a5c61923e32ed9670955107ec26e973bd6b05920f294861a6735be591ffcd5c6649a19f37d6adb5dc94642d487244ce595b3f4be1dc59378378b3087159d1f
-Size (libreoffice/libjpeg-turbo-2.1.1.tar.gz) = 2256321 bytes
BLAKE2s (libreoffice/libre-hebrew-1.0.tar.gz) = 0cf1aade1aa45f923b05b4c0c2378ad8fe954b6b56913ef8b263403696853679
SHA512 (libreoffice/libre-hebrew-1.0.tar.gz) = 609c8ef29a1eab9b027ea04abf14949e9a204cf826fb0a792dadd8a83fc49ac9610a0b3a2bd4b8988e615688c63d0ec08a89436134980b2a9667e8966a75a795
Size (libreoffice/libre-hebrew-1.0.tar.gz) = 531276 bytes
-BLAKE2s (libreoffice/libreoffice-7.3.3.2.tar.xz) = 1c6311051b2b9bc5688eec7565babe211fad51778d42a02484bdc2395464cb8f
-SHA512 (libreoffice/libreoffice-7.3.3.2.tar.xz) = 242d5694b6d09c669992ea68223b62fb8e418e886f68c7e5d843272d55ad2de34e5207180b7a541fd97cbe678c2d12d5290ebd8b82d47c88f1607e6736413c96
-Size (libreoffice/libreoffice-7.3.3.2.tar.xz) = 256036064 bytes
-BLAKE2s (libreoffice/libreoffice-dictionaries-7.3.3.2.tar.xz) = 8af6dd7712589c843a42df3849d24b3bdf5f32ecdb2c422db7f8bcf6d05bea0c
-SHA512 (libreoffice/libreoffice-dictionaries-7.3.3.2.tar.xz) = 681a45bf0d2d7aca2230e26f95f38071deb0484045d3dee0a14807fc0487c258234f3b6673633c86af11b985f0203b640d8aefe2a765f2f199d09df80ce14c47
-Size (libreoffice/libreoffice-dictionaries-7.3.3.2.tar.xz) = 51306820 bytes
-BLAKE2s (libreoffice/libreoffice-help-7.3.3.2.tar.xz) = dfaf4d7e405c0fe28c4fe216c5ddc651549545947905e52767899e2e351e209d
-SHA512 (libreoffice/libreoffice-help-7.3.3.2.tar.xz) = f70e747c5b78be20bbe4dd0c20840923d14b4278c00a12a60f5e58e3226abc0c218ac3cce4885cf5a440ace92141bf0428df40a4d1469edb91103167c5e3d46f
-Size (libreoffice/libreoffice-help-7.3.3.2.tar.xz) = 112209704 bytes
-BLAKE2s (libreoffice/libreoffice-translations-7.3.3.2.tar.xz) = ed5ed45ab393c889ac72b3f7afe9d756dda3e499b7a245649a7dcc25c5e18759
-SHA512 (libreoffice/libreoffice-translations-7.3.3.2.tar.xz) = 6197659420c6f452ec678dcf006835e58e34b2b0952572768af79f1e67d40ecccc9fc4a316bee7420e5db6f1eb6521237af583a492080f4084eb4cab1fefcf42
-Size (libreoffice/libreoffice-translations-7.3.3.2.tar.xz) = 196316184 bytes
+BLAKE2s (libreoffice/libreoffice-7.4.0.3.tar.xz) = abbd1c069e2f0713235f28ff8720e414baffd808f71526243fdff7b464b0da62
+SHA512 (libreoffice/libreoffice-7.4.0.3.tar.xz) = f94561253fa915b628e32dc5982563bfb75b275b7136a0275f76c6af3648c77ee6573c66fd17ec9ceaca6ef736375ac0acd0545a0999542a80e9e31d4c8b77b4
+Size (libreoffice/libreoffice-7.4.0.3.tar.xz) = 262953208 bytes
+BLAKE2s (libreoffice/libreoffice-dictionaries-7.4.0.3.tar.xz) = 43468a5727493f637a5cc6fa67efa441ccdb8cb3f8a675e3d48564681a952425
+SHA512 (libreoffice/libreoffice-dictionaries-7.4.0.3.tar.xz) = c9e42de8505a6a1aff06eb6ad147a4a232c8601391990e9062aa4506d2e2d2896e65a873854f99e58b3725c8063dac0e09fbffe803aedbe0e512a2e772f98418
+Size (libreoffice/libreoffice-dictionaries-7.4.0.3.tar.xz) = 51464284 bytes
+BLAKE2s (libreoffice/libreoffice-help-7.4.0.3.tar.xz) = 91952c0c879c9226a13639d36c401ce1166cbb60ddf71af5ee52271718fc2b0b
+SHA512 (libreoffice/libreoffice-help-7.4.0.3.tar.xz) = 0186da24e52e7624cde3b63819aca36c1bd7dc644b87abaad4aa0c0d66a1fad7d9980285005cde4ca92a5e30ccdaae191404e77a0479c7627b751fa148f71ed3
+Size (libreoffice/libreoffice-help-7.4.0.3.tar.xz) = 112593500 bytes
+BLAKE2s (libreoffice/libreoffice-translations-7.4.0.3.tar.xz) = 6b23f3e1552f13ae39fdda90a6e03e25c05d5919750d787d2818b88f71ca0e0c
+SHA512 (libreoffice/libreoffice-translations-7.4.0.3.tar.xz) = 523a703707b18f78d9ae1e4962b2bb60fe84845a29112874ae2b1e8d5e15b91bbd1d8ee426dc7f2453bc7fdc40a8a4bc492b3b1908e34ff3151c82319c4816ca
+Size (libreoffice/libreoffice-translations-7.4.0.3.tar.xz) = 199072904 bytes
BLAKE2s (libreoffice/lxml-4.1.1.tgz) = 8ab1ddfc30f21c433da04723d9092cd4e938cd5a5380310e8089e959a690d294
SHA512 (libreoffice/lxml-4.1.1.tgz) = 9542e5206f9b2f9e072c52ef8e6cf44d1aaae8ae3e7ca7e820c1fac12e716503308ccb3cebc52155b4c93799f3ebca247781fc491524d004378bd26f5cddb9d1
Size (libreoffice/lxml-4.1.1.tgz) = 2380804 bytes
@@ -156,40 +153,40 @@ Size (libreoffice/noto-fonts-20171024.tar.gz) = 6646182 bytes
BLAKE2s (libreoffice/odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar) = b63821ff44f5e8c5281a4d10251b656f8904954f9a047df616c56e1fc4010acb
SHA512 (libreoffice/odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar) = a7dd2aa0e0f8d54cef3ab0be8f3b0f4072fac3a9c1b0d93c6157188f3412d5d82fe61c2d52ef54fbcc547a2d8057c36358a84672190d2ca6b65d172bb14d009e
Size (libreoffice/odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar) = 27397202 bytes
-BLAKE2s (libreoffice/pdfium-4699.tar.bz2) = 6f3c2fd050e34446bb77358d83fa0b962698f85b0ea5a2e7382d8a2ff1b1afb1
-SHA512 (libreoffice/pdfium-4699.tar.bz2) = 530c035a50848eecd292f4fd564bfd8059b47beda0f670e1ccb69e0d2b368e4e73f012bb37526db478549ade1f818c187f0c38b1f8d97c77bdbedf5a50127b67
-Size (libreoffice/pdfium-4699.tar.bz2) = 8780890 bytes
+BLAKE2s (libreoffice/pdfium-5058.tar.bz2) = 61c0eec3e940bcd299c6163c9a25b6d83f20ead50fa456b59620b839662e94ed
+SHA512 (libreoffice/pdfium-5058.tar.bz2) = 7238f22c265191834fa2a376f8b9b7ad64f794f5986a64d83cae5a7a017805d0be68165b8d61e7684b476341b539f11ba79a5e319029817a989020bceb6445c2
+Size (libreoffice/pdfium-5058.tar.bz2) = 9771391 bytes
BLAKE2s (libreoffice/postgresql-13.5.tar.bz2) = d57be90445afc8f6680aa3b0c7a314352437adc08f0a3559751b5036c59bd2a6
SHA512 (libreoffice/postgresql-13.5.tar.bz2) = c76effbca8ee63be48fa3aeb39c7038221848fe83ca2afc4e0904ba8c6a50b89aa2ad37080d4e3be75e9bdc2d6ca6dfefcda334ef55a5e1a8954bb955ce905e5
Size (libreoffice/postgresql-13.5.tar.bz2) = 21186674 bytes
-BLAKE2s (libreoffice/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz) = 717553be8f14d835db53532096acf784e4d531f8436a4c862326cdc2c2e26ab3
-SHA512 (libreoffice/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz) = fbf5cfef66991565dbad928091a4e795a5b5b79a1e062a98ab9135b9972827de703c449507957294e7471c422c2e2ed239d6df61ffb9b9581a9ca3d848687a76
-Size (libreoffice/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz) = 11826600 bytes
+BLAKE2s (libreoffice/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz) = 61c21d665c607aab9965c284f9280e2af7c374910617d91c9ae6319f42e1ffe3
+SHA512 (libreoffice/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz) = 1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436
+Size (libreoffice/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz) = 11079112 bytes
BLAKE2s (libreoffice/source-serif-pro-3.000R.tar.gz) = 2d7c07e17a8015efa8170ac24916cf59b84c2f7e268271f1a1ffa5c764fd47ee
SHA512 (libreoffice/source-serif-pro-3.000R.tar.gz) = abbae601e8b91c095d7421c9c1fd0fad2d482816d23cdca83b0cff36c8bc9ef2116c256cc4967aefcb6166dcd4eb63733e0603086d1e4cf1f5b65a1660ebbee3
Size (libreoffice/source-serif-pro-3.000R.tar.gz) = 1135588 bytes
BLAKE2s (libreoffice/ttf-kacst_2.01+mry.tar.gz) = cd3c3689d7efcc38f8018673c7cab712a0e4ebb6fe40b0dc8335f78da9278c34
SHA512 (libreoffice/ttf-kacst_2.01+mry.tar.gz) = b77f1c2ed1b8a5702c12829e7281e4fd7a64648eb4fb4cbe9c3ca93c413ee9e6a48de190f7be088cde0d07ceafa3761dfd13dd56fa0182e837f257e24b82413e
Size (libreoffice/ttf-kacst_2.01+mry.tar.gz) = 407400 bytes
-BLAKE2s (libreoffice/xmlsec1-1.2.33.tar.gz) = 1257ba28b777cd23b4e30dab85739ffb0e1e221169526ad82f3eae8a1c0c1043
-SHA512 (libreoffice/xmlsec1-1.2.33.tar.gz) = 6354554b5cdc0a1389f6991efeac919bea912330b36d3be3d3496d61331e9edd2771786d50d2571a439f62ccfc3bd32be0a50bb5a037c4993aac076ad94b46e8
-Size (libreoffice/xmlsec1-1.2.33.tar.gz) = 1991955 bytes
+BLAKE2s (libreoffice/xmlsec1-1.2.34.tar.gz) = c5c97e0c6cb1b00d632dd5cbf76bc2a3e1573e0c9c6c1178f86825a3443eb338
+SHA512 (libreoffice/xmlsec1-1.2.34.tar.gz) = 4e3c17ab71c5ce3c76a80f2077393a5808a537d7eba861bae104c186be57f4be53499b52571913187e0a302962376bc033d7fe8ea769c6a181bf72d3f9eea1f2
+Size (libreoffice/xmlsec1-1.2.34.tar.gz) = 1991505 bytes
SHA1 (patch-Makefile.in) = c16214631f0e40af4b366c790c7b84e0e11a892e
SHA1 (patch-autogen.sh) = 0fed5f88342112bed0f573d426cc2c3d05ed45c7
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) = 97ab185c3fb3e871ebecba0cd9f0f232d2ee8a14
+SHA1 (patch-configure.ac) = b68def12350216375eb177ee730328b9523cea48
SHA1 (patch-desktop_scripts_soffice.sh) = e6342e08781ca8dac72a1f28407517d79155577c
SHA1 (patch-external_mariadb-connector-c_UnpackedTarball__mariadb-connector-c.mk) = 0a682ef486310474684ccd279e864f96259a3087
SHA1 (patch-external_mariadb-connector-c_netbsd.patch) = c8a82ce0c3d293108daa41f81d9cee376ca50a82
SHA1 (patch-external_pdfium_Library__pdfium.mk) = f7c6d5da07cd3d7b2ee327a0df0581e7fe441621
SHA1 (patch-external_pdfium_UnpackedTarball__pdfium.mk) = b5806e94fd125e900385aa571bccaedba9878b90
-SHA1 (patch-external_pdfium_pkgsrc.patch.1) = 307a3be1f3002d01d93a83724c06e5adcae5a813
+SHA1 (patch-external_pdfium_pkgsrc.patch.1) = a8247f5394c39cf94470e7a88088ab86f766c03b
SHA1 (patch-external_postgresql_ExternalProject__postgresql.mk) = 545a10100e439b996e3f235a8a5dff682fd48879
SHA1 (patch-external_skia_Library__skia.mk) = bf97a0724bd8cb5e249b63e60e85e2e7217cfdad
-SHA1 (patch-external_skia_UnpackedTarball__skia.mk) = 75d379ec8f11f45ea98e81e1b9124edf6d7e2f2b
-SHA1 (patch-external_skia_netbsd.patch.0) = 0667db4002f8026108f3a4b0adbfeffd08a3369c
-SHA1 (patch-i18nutil_source_utility_unicode.cxx) = 014d48574a379f92f2d0afe3c91d2c2956708dd8
+SHA1 (patch-external_skia_UnpackedTarball__skia.mk) = 7c0a0ccfe67b5e45340be07d476032a39cbd38e5
+SHA1 (patch-external_skia_netbsd.patch.0) = 7852da3030ce31cd089cba99c7949eda57ffaf8f
+SHA1 (patch-i18nutil_source_utility_unicode.cxx) = 138a0f278ad7ba7f6ae4657007f0c2fbe111be71
SHA1 (patch-instsetoo__native_inc__openoffice_unix_find-requires-x11.sh) = 3595ea18e6231d09665268cb716df61456c444d6
SHA1 (patch-sal_osl_unx_system.hxx) = 478dd47dc512d283a554600951010bbaa10c2c0e
SHA1 (patch-sal_rtl_cipher.cxx) = e5e46d0b96e25572be86bf26f0053436859736cd
@@ -199,7 +196,7 @@ SHA1 (patch-solenv_gbuild_platform_NETBSD_AARCH64_GCC.mk) = eda8dbd0e9394b2dde2f
SHA1 (patch-store_source_storbase.hxx) = 69c58db3984f22de45c7e32fdfd4f7c28340adf1
SHA1 (patch-sw_source_core_bastyp_calc.cxx) = 317f206500c88aea4a645a6f1dea8e0a837ad581
SHA1 (patch-sw_source_uibase_config_usrpref.cxx) = 8f761c368e38435aea53bfcfcdc1f3aba0c73d03
-SHA1 (patch-vcl_unx_generic_app_geninst.cxx) = 0bc6d8b22236ab60fce0aa1923514b7eec162ba6
+SHA1 (patch-vcl_unx_generic_app_geninst.cxx) = aa8f1a7e0fe2b6254a05e8370f1d12d25ba9795a
SHA1 (patch-xmloff_source_draw_ximp3dscene.cxx) = bdd0b2563e54424dd468c2334e17ab23057a69fb
SHA1 (patch-xmlsecurity_source_gpg_CertificateImpl.hxx) = 56ac06159e0805edc1685d271b632f1af438be86
SHA1 (patch-xmlsecurity_source_gpg_xmlsignature__gpgimpl.cxx) = 151ccef192a8491bca5d39f2a02d938b3e4fad67
diff --git a/misc/libreoffice/patches/patch-configure.ac b/misc/libreoffice/patches/patch-configure.ac
index f013584e01c..0442bde63be 100644
--- a/misc/libreoffice/patches/patch-configure.ac
+++ b/misc/libreoffice/patches/patch-configure.ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure.ac,v 1.20 2022/02/05 04:53:43 ryoon Exp $
+$NetBSD: patch-configure.ac,v 1.21 2022/08/22 13:58:32 ryoon Exp $
* Add NetBSD/aarch64 support.
* Disable freetype2 and fontconfig from pkgsrc explicitly.
@@ -7,9 +7,9 @@ $NetBSD: patch-configure.ac,v 1.20 2022/02/05 04:53:43 ryoon Exp $
* Include header files from security/gpgme correctly.
* Find devel/apache-ant.
---- configure.ac.orig 2022-01-26 14:35:29.000000000 +0000
+--- configure.ac.orig 2022-08-10 14:14:32.000000000 +0000
+++ configure.ac
-@@ -5174,6 +5174,11 @@ linux-android*)
+@@ -5305,6 +5305,11 @@ linux-android*)
RTL_ARCH=X86_64
PLATFORMID=netbsd_x86_64
;;
@@ -21,33 +21,34 @@ $NetBSD: patch-configure.ac,v 1.20 2022/02/05 04:53:43 ryoon Exp $
*)
AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
;;
-@@ -9451,9 +9456,9 @@ elif test "$using_freetype_fontconfig" =
- AC_MSG_RESULT([internal])
- FREETYPE_CFLAGS="${ISYSTEM}${WORKDIR}/UnpackedTarball/freetype/include"
- if test "x$ac_config_site_64bit_host" = xYES; then
-- FREETYPE_LIBS="-L${WORKDIR}/UnpackedTarball/freetype/instdir/lib64 -lfreetype"
-+ FREETYPE_LIBS="${WORKDIR}/UnpackedTarball/freetype/instdir/lib64/libfreetype.a"
- else
-- FREETYPE_LIBS="-L${WORKDIR}/UnpackedTarball/freetype/instdir/lib -lfreetype"
-+ FREETYPE_LIBS="${WORKDIR}/UnpackedTarball/freetype/instdir/lib/libfreetype.a"
- fi
- BUILD_TYPE="$BUILD_TYPE FREETYPE"
+@@ -9663,9 +9668,9 @@ dnl When the minimal version is at least
+ dnl ===================================================================
+ FREETYPE_CFLAGS_internal="${ISYSTEM}${WORKDIR}/UnpackedTarball/freetype/include"
+ if test "x$ac_config_site_64bit_host" = xYES; then
+- FREETYPE_LIBS_internal="-L${WORKDIR}/UnpackedTarball/freetype/instdir/lib64 -lfreetype"
++ FREETYPE_LIBS_internal="${WORKDIR}/UnpackedTarball/freetype/instdir/lib64/libfreetype.a"
+ else
+- FREETYPE_LIBS_internal="-L${WORKDIR}/UnpackedTarball/freetype/instdir/lib -lfreetype"
++ FREETYPE_LIBS_internal="${WORKDIR}/UnpackedTarball/freetype/instdir/lib/libfreetype.a"
fi
-@@ -10730,11 +10735,11 @@ dnl HarfBuzz
+ libo_CHECK_SYSTEM_MODULE([freetype],[FREETYPE],[freetype2 >= 9.9.3],,system,TRUE)
+
+@@ -10890,11 +10895,12 @@ dnl HarfBuzz
dnl ===================================================================
- libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 0.9.3],
- ["-I${WORKDIR}/UnpackedTarball/graphite/include -DGRAPHITE2_STATIC"],
-- ["-L${WORKDIR}/LinkTarget/StaticLibrary -lgraphite"])
-+ ["${WORKDIR}/LinkTarget/StaticLibrary/libgraphite.a"])
- libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 0.9.42],
- ["-I${WORKDIR}/UnpackedTarball/harfbuzz/src"],
-- ["-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs -lharfbuzz"])
-+ ["${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs/libharfbuzz.a"])
+ GRAPHITE_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/graphite/include -DGRAPHITE2_STATIC"
+-GRAPHITE_LIBS_internal="-L${WORKDIR}/LinkTarget/StaticLibrary -lgraphite"
++GRAPHITE_LIBS_internal="${WORKDIR}/LinkTarget/StaticLibrary/libgraphite.a"
++
+ libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 0.9.3])
+
+ HARFBUZZ_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/harfbuzz/src"
+-HARFBUZZ_LIBS_internal="-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs -lharfbuzz"
++HARFBUZZ_LIBS_internal="${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs/libharfbuzz.a"
+ libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 0.9.42])
if test "$COM" = "MSC"; then # override the above
- GRAPHITE_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/graphite.lib"
-@@ -12442,7 +12447,7 @@ elif test "$_os" = "Linux" -o "$_os" = "
+@@ -12559,7 +12565,7 @@ elif test \( \( "$_os" = "Linux" -o "$_o
SYSTEM_GPGMEPP=TRUE
# C++ library doesn't come with fancy gpgmepp-config, check for headers the old-fashioned way
@@ -56,7 +57,7 @@ $NetBSD: patch-configure.ac,v 1.20 2022/02/05 04:53:43 ryoon Exp $
[AC_MSG_ERROR([gpgmepp headers not found, install gpgmepp >= 1.14 development package])], [])
# progress_callback is the only func with plain C linkage
# checking for it also filters out older, KDE-dependent libgpgmepp versions
-@@ -13611,8 +13616,8 @@ EOF
+@@ -13764,8 +13770,8 @@ EOF
if test -f /usr/share/ant-core/lib/ant.jar; then
ANT_LIB=/usr/share/ant-core/lib
else
diff --git a/misc/libreoffice/patches/patch-external_pdfium_pkgsrc.patch.1 b/misc/libreoffice/patches/patch-external_pdfium_pkgsrc.patch.1
index ee11391244c..4a337363f93 100644
--- a/misc/libreoffice/patches/patch-external_pdfium_pkgsrc.patch.1
+++ b/misc/libreoffice/patches/patch-external_pdfium_pkgsrc.patch.1
@@ -1,15 +1,14 @@
-$NetBSD: patch-external_pdfium_pkgsrc.patch.1,v 1.8 2022/02/05 04:53:43 ryoon Exp $
+$NetBSD: patch-external_pdfium_pkgsrc.patch.1,v 1.9 2022/08/22 13:58:32 ryoon Exp $
* Support NetBSD
* Add pkgsrc font path
---- external/pdfium/pkgsrc.patch.1.orig 2022-02-03 05:03:32.276772721 +0000
+--- external/pdfium/pkgsrc.patch.1.orig 2022-08-19 00:52:46.342273839 +0000
+++ external/pdfium/pkgsrc.patch.1
-@@ -0,0 +1,44 @@
-+diff -ur pdfium.orig/core/fpdfapi/page/cpdf_psengine.cpp pdfium/core/fpdfapi/page/cpdf_psengine.cpp
-+--- pdfium.orig/core/fpdfapi/page/cpdf_psengine.cpp 2021-11-10 05:48:16.000000000 +0900
-++++ pdfium/core/fpdfapi/page/cpdf_psengine.cpp 2022-02-03 14:01:56.227611267 +0900
-+@@ -74,7 +74,7 @@
+@@ -0,0 +1,41 @@
++--- pdfium/core/fpdfapi/page/cpdf_psengine.cpp.orig 2022-05-11 00:10:54.000000000 +0000
+++++ pdfium/core/fpdfapi/page/cpdf_psengine.cpp
++@@ -74,7 +74,7 @@ constexpr PDF_PSOpName kPsOpNames[] = {
+ // Round half up is a nearest integer round with half-way numbers always rounded
+ // up. Example: -5.5 rounds to -5.
+ float RoundHalfUp(float f) {
@@ -18,31 +17,29 @@ $NetBSD: patch-external_pdfium_pkgsrc.patch.1,v 1.8 2022/02/05 04:53:43 ryoon Ex
+ return 0;
+ if (f > std::numeric_limits<float>::max() - 0.5f)
+ return std::numeric_limits<float>::max();
-+diff -ur pdfium.orig/core/fxcrt/cfx_datetime.cpp pdfium/core/fxcrt/cfx_datetime.cpp
-+--- pdfium.orig/core/fxcrt/cfx_datetime.cpp 2021-11-10 05:48:16.000000000 +0900
-++++ pdfium/core/fxcrt/cfx_datetime.cpp 2022-02-03 13:15:19.222355164 +0900
++--- pdfium/core/fxcrt/cfx_datetime.cpp.orig 2022-05-11 00:10:54.000000000 +0000
+++++ pdfium/core/fxcrt/cfx_datetime.cpp
+@@ -11,7 +11,7 @@
+ #include "third_party/base/check.h"
+
-+ #if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
-+- defined(OS_APPLE) || defined(OS_ASMJS)
-++ defined(OS_APPLE) || defined(OS_ASMJS) || defined(OS_NETBSD)
++ #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
++- BUILDFLAG(IS_APPLE) || defined(OS_ASMJS)
+++ BUILDFLAG(IS_APPLE) || defined(OS_ASMJS) || defined(OS_NETBSD)
+ #include <sys/time.h>
+ #include <time.h>
+ #endif
-+diff -ur pdfium.orig/core/fxge/linux/fx_linux_impl.cpp pdfium/core/fxge/linux/fx_linux_impl.cpp
-+--- pdfium.orig/core/fxge/linux/fx_linux_impl.cpp 2021-11-10 05:48:16.000000000 +0900
-++++ pdfium/core/fxge/linux/fx_linux_impl.cpp 2022-02-03 13:16:30.636408478 +0900
-+@@ -17,7 +17,7 @@
++--- pdfium/core/fxge/linux/fx_linux_impl.cpp.orig 2022-05-11 00:10:54.000000000 +0000
+++++ pdfium/core/fxge/linux/fx_linux_impl.cpp
++@@ -18,7 +18,7 @@
+ #include "third_party/base/check.h"
-+ #include "third_party/base/cxx17_backports.h"
+
-+-#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ASMJS)
-++#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ASMJS) && !defined(OS_NETBSD)
++ #if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !defined(OS_FUCHSIA) && \
++- !defined(OS_ASMJS)
+++ !defined(OS_ASMJS) && !defined(OS_NETBSD)
+ #error "Included on the wrong platform"
+ #endif
+
-+@@ -169,6 +169,7 @@
++@@ -170,6 +170,7 @@ class CLinuxPlatform : public CFX_GEModu
+ pInfo->AddPath("/usr/share/X11/fonts/Type1");
+ pInfo->AddPath("/usr/share/X11/fonts/TTF");
+ pInfo->AddPath("/usr/local/share/fonts");
diff --git a/misc/libreoffice/patches/patch-external_skia_UnpackedTarball__skia.mk b/misc/libreoffice/patches/patch-external_skia_UnpackedTarball__skia.mk
index f04c275efc7..28cf2e4a723 100644
--- a/misc/libreoffice/patches/patch-external_skia_UnpackedTarball__skia.mk
+++ b/misc/libreoffice/patches/patch-external_skia_UnpackedTarball__skia.mk
@@ -1,12 +1,12 @@
-$NetBSD: patch-external_skia_UnpackedTarball__skia.mk,v 1.6 2022/02/05 04:53:43 ryoon Exp $
+$NetBSD: patch-external_skia_UnpackedTarball__skia.mk,v 1.7 2022/08/22 13:58:32 ryoon Exp $
---- external/skia/UnpackedTarball_skia.mk.orig 2022-01-26 14:35:29.000000000 +0000
+--- external/skia/UnpackedTarball_skia.mk.orig 2022-08-10 14:14:32.000000000 +0000
+++ external/skia/UnpackedTarball_skia.mk
-@@ -37,6 +37,7 @@ skia_patches := \
- disable-freetype-colrv1.1 \
- windows-libraries-system32.patch.1 \
- fix-graphite-ifdef.patch.1 \
-+ netbsd.patch.0
+@@ -38,6 +38,7 @@ skia_patches := \
+ allow-no-es2restrictions.patch.1 \
+ vk_mem_alloc.patch.1 \
+ tdf148624.patch.1 \
++ netbsd.patch.0 \
$(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1))
diff --git a/misc/libreoffice/patches/patch-external_skia_netbsd.patch.0 b/misc/libreoffice/patches/patch-external_skia_netbsd.patch.0
index 2a07ba8564f..76a61e86935 100644
--- a/misc/libreoffice/patches/patch-external_skia_netbsd.patch.0
+++ b/misc/libreoffice/patches/patch-external_skia_netbsd.patch.0
@@ -1,15 +1,18 @@
-$NetBSD: patch-external_skia_netbsd.patch.0,v 1.3 2022/02/05 04:53:43 ryoon Exp $
+$NetBSD: patch-external_skia_netbsd.patch.0,v 1.4 2022/08/22 13:58:32 ryoon Exp $
* Support NetBSD. It has no uselocale(3).
* Fix build failure (isnan etc. are not defined) under NetBSD/amd64 9.99.88
(GCC 10.3.0) at least.
---- external/skia/netbsd.patch.0.orig 2022-02-03 04:24:23.011640283 +0000
+--- external/skia/netbsd.patch.0.orig 2022-08-19 00:29:47.661827273 +0000
+++ external/skia/netbsd.patch.0
-@@ -0,0 +1,29 @@
-+diff -ur skia.orig/src/gpu/GrAutoLocaleSetter.h skia/src/gpu/GrAutoLocaleSetter.h
-+--- src/gpu/GrAutoLocaleSetter.h 2019-09-19 18:38:01.127185317 +0900
-++++ src/gpu/GrAutoLocaleSetter.h 2022-02-03 13:25:31.192362952 +0900
+@@ -0,0 +1,31 @@
++* Support NetBSD. It has no uselocale(3).
++* Fix build failure (isnan etc. are not defined) under NetBSD/amd64 9.99.88
++ (GCC 10.3.0) at least.
++
++--- src/gpu/ganesh/GrAutoLocaleSetter.h.orig 2022-08-19 00:39:34.308186035 +0000
+++++ src/gpu/ganesh/GrAutoLocaleSetter.h
+@@ -27,7 +27,7 @@
+ #define HAVE_XLOCALE 0
+ #endif
@@ -19,12 +22,11 @@ $NetBSD: patch-external_skia_netbsd.patch.0,v 1.3 2022/02/05 04:53:43 ryoon Exp
+ #define HAVE_LOCALE_T 0
+ #else
+ #define HAVE_LOCALE_T 1
-+diff -ur skia.orig/src/sksl/dsl/DSLExpression.cpp skia/src/sksl/dsl/DSLExpression.cpp
-+--- src/sksl/dsl/DSLExpression.cpp 2021-11-26 00:00:28.260475275 +0900
-++++ src/sksl/dsl/DSLExpression.cpp 2022-02-03 13:26:31.790025246 +0900
-+@@ -45,10 +45,10 @@
++--- src/sksl/dsl/DSLExpression.cpp.orig 2022-08-19 00:40:37.794860287 +0000
+++++ src/sksl/dsl/DSLExpression.cpp
++@@ -63,10 +63,10 @@ DSLExpression::DSLExpression(float value
+ : fExpression(SkSL::Literal::MakeFloat(ThreadContext::Context(),
-+ pos.line(),
++ pos,
+ value)) {
+- if (!isfinite(value)) {
+- if (isinf(value)) {
diff --git a/misc/libreoffice/patches/patch-i18nutil_source_utility_unicode.cxx b/misc/libreoffice/patches/patch-i18nutil_source_utility_unicode.cxx
index 59f8430c9e7..c2d73fd1264 100644
--- a/misc/libreoffice/patches/patch-i18nutil_source_utility_unicode.cxx
+++ b/misc/libreoffice/patches/patch-i18nutil_source_utility_unicode.cxx
@@ -1,12 +1,12 @@
-$NetBSD: patch-i18nutil_source_utility_unicode.cxx,v 1.5 2020/02/05 14:10:35 ryoon Exp $
+$NetBSD: patch-i18nutil_source_utility_unicode.cxx,v 1.6 2022/08/22 13:58:32 ryoon Exp $
---- i18nutil/source/utility/unicode.cxx.orig 2019-01-23 19:35:25.000000000 +0000
+--- i18nutil/source/utility/unicode.cxx.orig 2022-08-10 14:14:32.000000000 +0000
+++ i18nutil/source/utility/unicode.cxx
-@@ -25,6 +25,7 @@
+@@ -24,6 +24,7 @@
#include <i18nutil/unicode.hxx>
#include <sal/log.hxx>
#include <unicode/numfmt.h>
+#include <unicode/regex.h>
#include "unicode_data.h"
#include <rtl/character.hxx>
- #include <memory>
+ #include <o3tl/string_view.hxx>
diff --git a/misc/libreoffice/patches/patch-vcl_unx_generic_app_geninst.cxx b/misc/libreoffice/patches/patch-vcl_unx_generic_app_geninst.cxx
index 0595bb27406..c6bddb3f977 100644
--- a/misc/libreoffice/patches/patch-vcl_unx_generic_app_geninst.cxx
+++ b/misc/libreoffice/patches/patch-vcl_unx_generic_app_geninst.cxx
@@ -1,4 +1,4 @@
-$NetBSD: patch-vcl_unx_generic_app_geninst.cxx,v 1.2 2021/07/26 12:42:24 ryoon Exp $
+$NetBSD: patch-vcl_unx_generic_app_geninst.cxx,v 1.3 2022/08/22 13:58:32 ryoon Exp $
Set "OS Environment" on NetBSD,same as FreeBSD.
@@ -8,7 +8,7 @@ Help -> About LibreOffice
Tweaked by Yasushi Oshima, PR pkg/56048.
---- vcl/unx/generic/app/geninst.cxx.orig 2021-07-16 21:17:42.000000000 +0000
+--- vcl/unx/generic/app/geninst.cxx.orig 2022-08-10 14:14:32.000000000 +0000
+++ vcl/unx/generic/app/geninst.cxx
@@ -22,7 +22,7 @@
#if defined(LINUX)
@@ -19,10 +19,10 @@ Tweaked by Yasushi Oshima, PR pkg/56048.
# include <sys/utsname.h>
#endif
-@@ -73,14 +73,18 @@ OUString SalGenericInstance::getOSVersio
+@@ -72,14 +72,18 @@ OUString SalGenericInstance::getOSVersio
+ }
fclose( pVersion );
}
- return aKernelVer;
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__NetBSD__)
struct utsname stName;
@@ -40,11 +40,11 @@ Tweaked by Yasushi Oshima, PR pkg/56048.
while ( nIndex++ < aKernelVer.getLength() )
{
const char c = stName.release[ nIndex ];
-@@ -89,6 +93,7 @@ OUString SalGenericInstance::getOSVersio
+@@ -87,6 +91,7 @@ OUString SalGenericInstance::getOSVersio
+ break;
}
- return OUString::createFromAscii( stName.sysname ) + " " +
- aKernelVer.copy( 0, nIndex );
+ aKernelVer = OUString::createFromAscii(stName.sysname) + " " + aKernelVer.copy(0, nIndex);
+#endif
- #else
- return aKernelVer;
- #endif
+ #elif defined(EMSCRIPTEN)
+ #define str(s) #s
+ #define xstr(s) str(s)
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-26 07:15:26 +0000