user/libreoffice: bump to 6.2.1.2

Added to makedepends:
* fontforge-dev
* libnumbertext-dev
* py3-lxml

Removed from makedepends:
* gettext-tiny-dev

1 files changed, 40 insertions, 39 deletions

diff --git a/user/libreoffice/APKBUILD b/user/libreoffice/APKBUILD
index 9b9cab975..a9e18b5f3 100644
--- a/user/libreoffice/APKBUILD
+++ b/user/libreoffice/APKBUILD
@@ -11,14 +11,14 @@
 #   8 GB with Hulu in Chromium in the background is enough.
 #
 # * Disk space:
-#   * Dependencies:  1216 MiB
-#   * Downloads:      372 MiB
-#   * Subtotal:      1588 MiB =  1.6 GiB
-#   * Complete src: 28682 MiB
-#   * Complete pkg:  7935 MiB
-#   * All APKs:      1934 MiB =  1.9 GiB
-#   * Subtotal:     38551 MiB = 37.6 GiB
-#   * Grand total:  40139 MiB = 39.2 GiB
+#   * Dependencies:  1131 MiB
+#   * Downloads:      398 MiB
+#   * Subtotal:      1529 MiB =  1.5 GiB
+#   * Complete src: 33970 MiB
+#   * Complete pkg:  9637 MiB
+#   * All APKs:      2362 MiB =  2.3 GiB
+#   * Subtotal:     45969 MiB = 44.9 GiB
+#   * Grand total:  47498 MiB = 46.4 GiB
 #
 # Build stats:
 # * Run "abuild deps fetch" first.
@@ -29,8 +29,8 @@
 #   abuild -r  29590.16s user 1077.69s system 340% cpu 2:30:13.12 total
 
 pkgname=libreoffice
-pkgver=6.0.6.2
-pkgrel=1
+pkgver=6.2.1.2
+pkgrel=0
 case "$pkgver" in
 *.*.*.*) _ver="${pkgver%.*}";;
 *.*.*) _ver="$pkgver";;
@@ -43,7 +43,7 @@ url="https://www.libreoffice.org/"
 # and $subpackages doesn't really support setting $arch to anything other than
 # noarch.
 arch="all"
-options="!checkroot"
+options=""
 license="MPL-2.0 AND Apache-2.0 AND MIT AND X11 AND (MPL-1.1 OR GPL-2.0+ OR LGPL-2.1+) AND GPL-2.0+ AND GPL-3.0 AND GPL-3.0+ AND LGPL-2.1 AND LGPL-3.0+ AND BSD-3-Clause AND SISSL AND IJG AND CC-BY-SA-3.0"
 
 depends="$pkgname-base $pkgname-calc $pkgname-common $pkgname-draw
@@ -53,21 +53,20 @@ depends="$pkgname-base $pkgname-calc $pkgname-common $pkgname-draw
 # 3. GUIs - gtk+2.0
 # 4. File formats
 makedepends="apr-dev bash bison boost-dev cairo-dev clucene-dev cmd:which
-	coreutils cppunit-dev cups-dev dbus-glib-dev findutils flex
-	fontconfig-dev freetype-dev gettext-tiny-dev glm gperf gpgme-dev
-	gst-plugins-base-dev gstreamer-dev harfbuzz-dev hunspell-dev
-	hyphen-dev icu icu-dev lcms2-dev libcmis-dev libexttextcat-dev
-	libjpeg-turbo-dev libpng-dev libxml2-utils libxslt-dev mdds~1.3
-	mythes-dev neon-dev nss-dev openldap-dev openssl-dev paxmark perl
-	poppler-dev postgresql-dev python3-dev redland-dev sane-dev sed ucpp
-	unixodbc-dev util-linux xmlsec-dev zip
+	coreutils cppunit-dev cups-dev dbus-glib-dev findutils flex fontconfig-dev
+	fontforge-dev freetype-dev glm gperf gpgme-dev gst-plugins-base-dev
+	gstreamer-dev harfbuzz-dev hunspell-dev hyphen-dev icu icu-dev lcms2-dev
+	libcmis-dev libexttextcat-dev libjpeg-turbo-dev libnumbertext-dev libpng-dev
+	libxml2-utils libxslt-dev mdds>=1.4.1 mythes-dev neon-dev nss-dev
+	openldap-dev openssl-dev paxmark perl poppler-dev postgresql-dev python3-dev
+	py3-lxml redland-dev sane-dev sed ucpp unixodbc-dev util-linux xmlsec-dev zip
 
 	libepoxy-dev libxinerama-dev libxrandr-dev libxrender-dev libxext-dev
 
 	gtk+2.0-dev gdk-pixbuf-dev glib-dev
 
 	libabw-dev libcdr-dev libe-book-dev libepubgen-dev libetonyek-dev
-	libfreehand-dev libmspub-dev libmwaw-dev libodfgen-dev liborcus-dev~0.13
+	libfreehand-dev libmspub-dev libmwaw-dev libodfgen-dev liborcus-dev>=0.14
 	libpagemaker-dev libqxp-dev libstaroffice-dev libvisio-dev libwpd-dev
 	libwpg-dev libwps-dev libzmf-dev
 "
@@ -93,6 +92,8 @@ source="https://download.documentfoundation.org/$pkgname/src/$_ver/$pkgname-$pkg
 	gettext-tiny.patch
 	disable-crc-test.patch
 	disable-outdated-font-test.patch
+	disable-mariadbc.patch
+	disable-mysqlc.patch
 "
 ldpath="/usr/lib/$pkgname/program"
 
@@ -236,15 +237,11 @@ done
 subpackages="$subpackages $pkgname-common"
 
 prepare() {
-	cd "$builddir"
-
 	default_prepare
 	NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-	cd "$builddir"
-
 	export PYTHON="python3"
 	# Note: --with-parallelism must be specified since getconf does not
 	#       recognize _NPROCESSORS_ONLN
@@ -266,7 +263,6 @@ build() {
 		--enable-release-build \
 		--enable-split-app-modules \
 		--enable-python=system \
-		--with-alloc=system \
 		--with-tls=nss \
 		--with-system-libs \
 		--with-system-ucpp \
@@ -291,7 +287,8 @@ build() {
 		--disable-pdfium \
 		--disable-ooenv \
 		--without-java \
-		--disable-epm
+		--disable-epm \
+		--enable-build-opensymbol
 
 	# adding '-isystem /usr/include' make things break with gcc6
 	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=823145
@@ -301,12 +298,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
-	make -k unitcheck
+	make -k -j1 unitcheck
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" distro-pack-install
 }
 
@@ -415,6 +410,10 @@ common() {
 	mkdir -p "$subpkgdir/usr/share/appdata"
 	mv "$pkgdir"/usr/share/appdata/*.xml "$subpkgdir/usr/share/appdata"
 
+	mkdir -p "$subpkgdir"/usr/lib/libreoffice/share
+	mv "$pkgdir"/usr/lib/libreoffice/share/libreofficekit \
+		"$subpkgdir"/usr/lib/libreoffice/share/libreofficekit
+
 	# At this point there should only be empty directories left in
 	# the "libreoffice" metapackage
 	if [ -n "$(find "$pkgdir" -type f)" ]; then
@@ -473,13 +472,15 @@ writer() {
 	_split writer
 }
 
-sha512sums="8cf7bd4d8f81ee09f8a21c4ccb12f788c67cf1cba71e08b9b720f9e8b4ec2dfcc25452ef05b6b60529463241c2b23a70eb6a79a8f15b95e890a2ea9cbb458517  libreoffice-6.0.6.2.tar.xz
-7b84e2ec964b02e5d2fe17f7879080571fce02d090cde0e09de07af5419c8b7879e88a53fd1231d1195e3d29a2919c33a7d85f11c469cd87670ad67921cf8b9b  libreoffice-dictionaries-6.0.6.2.tar.xz
-fcc2ffeefde50abb80e539f7395efec6e022462b8b8938c2077df6fb3be217808cc2b96eb51539d5bf04fe0680807cb9af5f46f838bac6e6a5c88f90f88c5f2c  libreoffice-translations-6.0.6.2.tar.xz
-89caab57774f85f3e58523c0debb57247a0f10959634bf296aaacc4928bcce6ea8ed9f167b267e2e0eeb52b69714eeb094fedfa3e810cf409dfbc7c5e49b7c13  libreoffice-help-6.0.6.2.tar.xz
-10a1ee056ebce41b2f6d3863b220f8529f70b7fd159ff2d36967ad96d9653166737db4ba865c10769c37afad553f59fb9629437c0d8a1afbbff963fc36dbbf1a  linux-musl.patch
-4aa595588226ac2060ae78f4f857db1b148735429a47389f75313df61cabf0819ad2add15c09cae5c5ebbce64852589ca89932c72281ba662ab53dddec4e1336  fix-execinfo.patch
-ae36500897db9d758e95da1791ef2577d59b0e0865baba316b4a1f1f48ce9fd5e52fc3f14fa45aeeab73c5b93f57e89f9a42c996bdb3c85eb3beb2634543d85e  fix-includes.patch
-c50272ec2cf0471e629bf817d23e5c51ff59e94961fab1ee107f43352409353a37f2988c1ff75f423c4c5aedb1e38b432849619700e25124a33c99a589d7a80b  gettext-tiny.patch
-4ce3bacada3ab99dc09c6d29529bfc5e70eb287bcb61bc6e9a4ba4334cf77624121191d240f2a8f31b63e7510886904ce7842425752252e174478e0034988055  disable-crc-test.patch
-887680966f8e8754d551ca7e4acc3bcae57c4fb835c49240fde05f65eb4282b8ad03deda3944b50e73b0da97ca8b28e7b1f1861907e6dbd012f5646e6d55efb4  disable-outdated-font-test.patch"
+sha512sums="0d18e5f470b3e8a70d1679c7acdc91887cbbbb2032e1eb452308d257a6bc02d42e93fec66709c84838f7565e42217ac1d2b121e3356f7c754fc7ee33b7c6f0ef  libreoffice-6.2.1.2.tar.xz
+e9acd76b783a7a0b3344f267a8105ede52b2da92d6c1ae2b54237ffc30d4f87a8e126bb597ab3c4d993bb1e89f1b5d16921ea3d83419c1b5b69cb83aae007bd3  libreoffice-dictionaries-6.2.1.2.tar.xz
+4dafc81179fbb8a0b10c774ec072d0abdcdfebbcd5eb8341802bd7d515bd0ea5fb117729ae66b5666da5927a567b54a23c870bcd16ba64478016a4ab84f7f3a5  libreoffice-translations-6.2.1.2.tar.xz
+c8bd2765b46162203d0b0acc06dc76108bd0093020981e1030d26d5a8771fb9494337c16cc99c10b7de7a906e713dd27555b0af8754d142387c3a968fa663a2f  libreoffice-help-6.2.1.2.tar.xz
+600e4eb772b1e24e06b906682fc4d4114d62ede3adcde3639482edafef56e970ac09925fcd910dccee8a14f5ca049ac3de3f279ebcc2be3a611e3883f3a7efb8  linux-musl.patch
+ed18d6bc6e03369e17b50e6b969ac0804984c1416fdfe7120251d11c59a791bb0fc8956f848ee8697fce3c074f2943b03d4441aa531ff9504be2f497a8e7e412  fix-execinfo.patch
+a1d704c78e3decb83eb45b0f180e7b352d58b4005a7e43dd8fddcb4829c932da4f0dd3d4dfeaa2313c1520273e9e1c64979a0ecbe5d72737926c54d5658bd2ff  fix-includes.patch
+bac06a1f0f6ef3e5860ec340470583b2a7ff079efa9efee9119ae1ac320b97ecbfdb7eba63975d4f7a4e2476d3b01a9508a53a84b49df0a8febe12e17b685529  gettext-tiny.patch
+6a039ba592a23b8db1dd5c8d5dffbc9562270de691d2eb1e1c420f8632532c0fce14a0f3844dc2e6f6b6b04655c40230bd69fd81d1ae6f0bd16f0e88ce0a2783  disable-crc-test.patch
+4ffc389a3c545d37d152bb52390c3abd06a32eb9fee03110c07e8b57f9b9d1be68fdc5092ad0be76f6540367a1f1d2e9e32d519021d8205847594edb811da428  disable-outdated-font-test.patch
+c1925fe5833410c6a4b47a1723e67ce3898fc01ebded766023855cd93f290a6788638a86a8595e112ab788628c0ea7642c41d7ff987ba9117c2e079a99a3b29f  disable-mariadbc.patch
+01ef207d0b3ab1ded5edadd2d05cefe65d7c2dc4285abee12d7fbb61c92b2a3e37d5cfe5bb8f5ea9a40fd2918396ec25b473a916012e04732ebbe79ee6768a21  disable-mysqlc.patch"