update to 6.1.0.3

editors/libreoffice/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.187 2018/07/01 18:33:35 espie Exp $
+# $OpenBSD: Makefile,v 1.188 2018/08/18 07:07:17 robert Exp $
 
 USE_WXNEEDED=	Yes
 
@@ -12,8 +12,8 @@ SHARED_LIBS +=  orcus-0.13                0.0 # 0.0
 SHARED_LIBS +=  orcus-parser-0.13         0.0 # 0.0
 SHARED_LIBS +=  staroffice-0.0-lo         0.0 # 0.0
 
-BV=		6.0
-VERSION=	${BV}.3.2
+BV=		6.1
+VERSION=	${BV}.0.3
 DISTNAME=	libreoffice-${VERSION}
 WRKDIST=	${WRKDIR}/libreoffice-${VERSION}
 PKGNAME=	libreoffice-${VERSION}
@@ -22,7 +22,6 @@ PKGNAME-kde=	libreoffice-kde-${VERSION}
 PKGNAME-java=	libreoffice-java-${VERSION}
 CATEGORIES=	editors productivity
 DPB_PROPERTIES=	parallel tag:kde4
-REVISION-main=	2
 
 EPOCH=		0
 
@@ -68,6 +67,7 @@ DISTFILES += 5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz
 DISTFILES += 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip:0
 DISTFILES += 7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz:0
 DISTFILES += xmlsec1-1.2.25.tar.gz:0
+DISTFILES += lxml-4.1.1.tgz:0
 DISTFILES += 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip:0
 DISTFILES += 907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz:0
 DISTFILES += 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip:0
@@ -89,40 +89,41 @@ DISTFILES += e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip:0
 DISTFILES += edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz:0
 DISTFILES += eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip:0
 DISTFILES += f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip:0
-DISTFILES += language-subtag-registry-2017-12-14.tar.bz2:0
+DISTFILES += language-subtag-registry-2018-04-23.tar.bz2:0
 DISTFILES += libabw-0.1.2.tar.xz:0
 DISTFILES += libcdr-0.1.4.tar.xz:0
 DISTFILES += libcdr-0.1.3.tar.bz2:0
 DISTFILES += libcmis-0.5.1.tar.gz:0
 DISTFILES += libe-book-0.1.3.tar.xz:0
-DISTFILES += libepubgen-0.1.0.tar.bz2:0
-DISTFILES += libetonyek-0.1.7.tar.xz:0
+DISTFILES += libepubgen-0.1.1.tar.xz:0
+DISTFILES += libetonyek-0.1.8.tar.xz:0
 DISTFILES += libexttextcat-3.4.5.tar.xz:0
 DISTFILES += libfreehand-0.1.2.tar.xz:0
 DISTFILES += libgltf-0.0.2.tar.bz2:1
 DISTFILES += liblangtag-0.6.2.tar.bz2:0
-DISTFILES += libmspub-0.1.3.tar.xz:0
-DISTFILES += libmwaw-0.3.13.tar.xz:0
+DISTFILES += libmspub-0.1.4.tar.xz:0
+DISTFILES += libmwaw-0.3.14.tar.xz:0
 DISTFILES += libodfgen-0.1.6.tar.bz2:0
-DISTFILES += liborcus-0.13.3.tar.gz:0
+DISTFILES += liborcus-0.13.4.tar.gz:0
 DISTFILES += libre-hebrew-1.0.tar.gz:0
 DISTFILES += ttf-kacst_2.01+mry.tar.gz:0
 DISTFILES += culmus-0.131.tar.gz:0
 DISTFILES += libpagemaker-0.0.4.tar.xz:0
 DISTFILES += libqxp-0.0.1.tar.xz:0
 DISTFILES += librevenge-0.0.4.tar.bz2:0
-DISTFILES += libstaroffice-0.0.5.tar.xz:0
+DISTFILES += libstaroffice-0.0.6.tar.xz:0
 DISTFILES += libvisio-0.1.6.tar.xz:0
 DISTFILES += libwpd-0.10.2.tar.xz:0
 DISTFILES += libwpg-0.3.2.tar.xz:0
-DISTFILES += libwps-0.4.4.tar.bz2:0
+DISTFILES += libwps-0.4.9.tar.xz:0
 DISTFILES += libwps-0.4.8.tar.xz:0
 DISTFILES += libzmf-0.0.2.tar.xz:0
 DISTFILES += mdds-1.3.1.tar.bz2:0
-DISTFILES += pdfium-3235.tar.bz2:0
+DISTFILES += pdfium-3426.tar.bz2:0
 DISTFILES += noto-fonts-20171024.tar.gz:0
-DISTFILES += ReemKufi-0.6.tar.gz:0
+DISTFILES += ReemKufi-0.7.zip:0
 DISTFILES += Scheherazade-2.100.zip:0
+DISTFILES += Amiri-0.111.zip:0
 
 DIST_SUBDIR=	libreoffice
 
@@ -229,6 +230,7 @@ WANTLIB-main+=	bz2 graphite2
 WANTLIB-main+=	boost_filesystem boost_filesystem-mt boost_iostreams-mt
 WANTLIB-main+=	boost_system boost_system-mt boost_date_time-mt
 WANTLIB-main+=	boost_locale-mt
+WANTLIB-main+=	epoxy
 
 RUN_DEPENDS-main=	devel/desktop-file-utils \
 			devel/libexecinfo \
@@ -249,6 +251,7 @@ LIB_DEPENDS-kde=	x11/kde4/libs \
 WANTLIB-kde+=		ICE SM Xext icuuc
 WANTLIB-kde+=		X11 ${COMPILER_LIBCXX} glib-2.0 intl m pthread
 WANTLIB-kde+=		QtCore QtGui QtNetwork kdecore kdeui kfile kio
+WANTLIB-kde+=		epoxy harfbuzz-icu
 
 .include <bsd.port.arch.mk>
 
@@ -274,7 +277,8 @@ CONFIGURE_STYLE=	gnu
 AUTOCONF_VERSION=	2.68
 AUTOMAKE_VERSION=	1.12
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+CONFIGURE_ENV=	CONFIG_SHELL=${LOCALBASE}/bin/bash \
+		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
 		KDE4INC="${LOCALBASE}/include/kde4" KDE4LIB="${LOCALBASE}/lib/kde4/libs"\
 		QT4DIR="${LOCALBASE}/lib/qt4" QT4LIB="${LOCALBASE}/qt4" \
@@ -292,6 +296,7 @@ CONFIGURE_ARGS+=\
 		--disable-mergelibs \
 		--disable-dependency-tracking \
 		--disable-online-update \
+		--disable-libnumbertext \
 		--enable-orcus \
 		--enable-gio \
 		--enable-kde4 \

editors/libreoffice/distinfo

@@ -16,8 +16,9 @@ SHA256 (libreoffice/7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar
 SHA256 (libreoffice/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip) = q+LFesErpF2DVjsC4kD6ldlzN23i9yCquP4R8uYhwJU=
 SHA256 (libreoffice/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz) = CUZtzodlMzPxiazYNYxgxnNtzZXwQt7gtkS9z2W2ri8=
 SHA256 (libreoffice/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip) = PYU7GbHZSm76aeevkPfysJ7PMCkTvuPaeWwV7P68+sg=
+SHA256 (libreoffice/Amiri-0.111.zip) = H7/MztY0i12ywcIdWzGc1IjhTQVXAvqBeg9suD2IIWY=
 SHA256 (libreoffice/EmojiOneColor-SVGinOT-1.3.tar.gz) = 0aCPfBBYnyJ0AjEBdpSvCnonB2DI3sM9jRwDjivgoMc=
-SHA256 (libreoffice/ReemKufi-0.6.tar.gz) = TfvYsifqBiyhdC+xXXB/C3Q5j53bIxiSVU8JWQSOgJs=
+SHA256 (libreoffice/ReemKufi-0.7.zip) = 9gxlCNIJzkI20tcyQlbC/93UgL5+PWAjdwuT3DkaYF8=
 SHA256 (libreoffice/Scheherazade-2.100.zip) = JRyIF864fZtmHOHVtJ5zKgEWrdEKvARr5Li6UZbhSbU=
 SHA256 (libreoffice/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = dYI3dvtRqcUmr5BPFQOnr6qrkA+6g+2mT4pBBzckyHA=
 SHA256 (libreoffice/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz) = HoHzldjIUcPk51tWjiD6L6VJNU51qzl/neSw4HkKMF8=
@@ -37,40 +38,41 @@ SHA256 (libreoffice/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip)
 SHA256 (libreoffice/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz) = 57yaH+x4elKeSfWia5Pc3PQVBkSd/HD5LN720X62+2E=
 SHA256 (libreoffice/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip) = dcgDWcnONDwgqrijakXLO57nxhz5LBOuRTmdhUQjqbo=
 SHA256 (libreoffice/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip) = BWQKH2gFsrLX4sucUNuaXLCE48Uqsacc4BUjm0odQ0M=
-SHA256 (libreoffice/language-subtag-registry-2017-12-14.tar.bz2) = D4e5Qoy8LZbY5PVKB+OFi0pCjl/sk5a8O1L7nySL42I=
+SHA256 (libreoffice/language-subtag-registry-2018-04-23.tar.bz2) = FMIfRTPKdOOvngkYTWdWp1DQzUYJkBW6jFleSEmaqHg=
 SHA256 (libreoffice/libabw-0.1.2.tar.xz) = C3KUTVr4HdoKXFgD7oTLrEuBRBpNdnqlcCmtxnRMJIU=
 SHA256 (libreoffice/libcdr-0.1.3.tar.bz2) = UWC7v+/lK9SICED60rB6USgT43v6+MysBi/KI48jD00=
 SHA256 (libreoffice/libcdr-0.1.4.tar.xz) = 56fosAo99XmBEAJNcGH+nRwzMCd9Lk+pITKU+Wakpm0=
 SHA256 (libreoffice/libcmis-0.5.1.tar.gz) = asvfIuzbq6N3KHKbdb/Ahe5aS0mmAkdXz7hszT2iew4=
 SHA256 (libreoffice/libe-book-0.1.3.tar.xz) = fo2P808ngxrKO8b5zFMsL5DSBXx3iWO4hP89HjTf4fk=
-SHA256 (libreoffice/libepubgen-0.1.0.tar.bz2) = cwvRy+7hZjNPqtvAbJU6Z7FFw8R1SjtQNIIGba5M1jM=
-SHA256 (libreoffice/libetonyek-0.1.7.tar.xz) = advhDUQm1S8JBg1In465Dfod9ZLoLrBpjZ2684zHNKw=
+SHA256 (libreoffice/libepubgen-0.1.1.tar.xz) = A+CEuZTL7/yMPdEzA7LLgF9E2PLDt592kNfj/H9iFa0=
+SHA256 (libreoffice/libetonyek-0.1.8.tar.xz) = nckjR67gzJ7VexdaPiH52W6+VdMP7LEOhB0QUHlO2C0=
 SHA256 (libreoffice/libexttextcat-3.4.5.tar.xz) = E/28nUxImk0FGeUZM6GqIf4/uet9oZG4f3pj6CeX2sg=
 SHA256 (libreoffice/libfreehand-0.1.2.tar.xz) = DkItFWSm2/IqmvWYU1QlJx5YNRTA97p9kJFnZCDeNKw=
 SHA256 (libreoffice/libgltf-0.0.2.tar.bz2) = 0cxyl+0ZIaqWniZBO0xOGK/Igs5NL1oqoqKQVwb3IGs=
 SHA256 (libreoffice/liblangtag-0.6.2.tar.bz2) = 1iQnkDJPFDL7Cm+ucbaFH1ILLFqHZ1SXz46hTCkk1S4=
-SHA256 (libreoffice/libmspub-0.1.3.tar.xz) = 8CJfD/A/a+xIR9fC2HGaNsr8S5egnlBLYQNyzFuYHJc=
-SHA256 (libreoffice/libmwaw-0.3.13.tar.xz) = 21XHKESPnHlc1xoLtgQ/bUdE4+ABuVWgGKLGNJgdWuo=
+SHA256 (libreoffice/libmspub-0.1.4.tar.xz) = 7zbBoaq7K6Owvtqq/nF79EgL4rqN5vOJS+X9NwKwE7o=
+SHA256 (libreoffice/libmwaw-0.3.14.tar.xz) = rKi/HOVe2Drb6oLHDUyL6+gTnzNLNIG/Wm5Af5HzPOk=
 SHA256 (libreoffice/libodfgen-0.1.6.tar.bz2) = LHshiS+EpMZ1RvhGEezNrWJZh1yXHpjdsCfaZuoKycI=
-SHA256 (libreoffice/liborcus-0.13.3.tar.gz) = Yudt4f0xAedxGHMrhgNUEhtAqHu7Hr/rggNHf/+sFuk=
+SHA256 (libreoffice/liborcus-0.13.4.tar.gz) = vAGxs+kJFBb0mIQNPBmhqicEtEgQDn9rgO7+iKqwbVs=
 SHA256 (libreoffice/libpagemaker-0.0.4.tar.xz) = Zq2s1wWn0ZiV4I6sRtHoUTMq3y5zbFZr7xFk56RCUZ0=
 SHA256 (libreoffice/libqxp-0.0.1.tar.xz) = jCV/YYT/lK76fJ+hz66CCD1VpJJHJmkFxxxT4BP5XHM=
 SHA256 (libreoffice/libre-hebrew-1.0.tar.gz) = 9ZYlfB23Bs41eVsY1/ZqTbmdQncl8g6ThJFLU0FCV5o=
-SHA256 (libreoffice/libreoffice-6.0.3.2.tar.xz) = Erii9X15etUbdmHiMCur/nPA0jtS3ayfTH6xuCRyhZs=
-SHA256 (libreoffice/libreoffice-dictionaries-6.0.3.2.tar.xz) = 9mKMgQhmDoVA972aBavizcffh6JaYIrgb6IRuEPArX8=
-SHA256 (libreoffice/libreoffice-help-6.0.3.2.tar.xz) = BpmerHdsT89zOXMr+YjSuFtxkyg9S+Yi+EhwbieORwE=
-SHA256 (libreoffice/libreoffice-translations-6.0.3.2.tar.xz) = iqZRJmtwGxfniqynfbOUvsPaB/r2JUZJZITGPdUZpbM=
+SHA256 (libreoffice/libreoffice-6.1.0.3.tar.xz) = VOzNJo911i+mq3jSVoVxnBCSV+HA9NYo6ukuwJYy69g=
+SHA256 (libreoffice/libreoffice-dictionaries-6.1.0.3.tar.xz) = /B4IihVRjBU99jTMX7H3+utWMqOLPa+ttBE3Z0Onp9Y=
+SHA256 (libreoffice/libreoffice-help-6.1.0.3.tar.xz) = u8XM26k6uKLnkjEaa16E8WCILvQEjv9G7N/DHQvV2is=
+SHA256 (libreoffice/libreoffice-translations-6.1.0.3.tar.xz) = p2JSdFNRVOOT4irBoXlYWdT36tHHjiW2NVREbw0GEZA=
 SHA256 (libreoffice/librevenge-0.0.4.tar.bz2) = xRYBzQgyC3VwKBLGSq4GU0CRZNp4Jf0PRRrCxdvnfL8=
-SHA256 (libreoffice/libstaroffice-0.0.5.tar.xz) = MVUHrdWAaKptXEN+fCpv0avmhFFZFRUsbPM4/FiNqYI=
+SHA256 (libreoffice/libstaroffice-0.0.6.tar.xz) = awDh7YGU5gcr5EQQJdG4iOOTZXJ+1bI+DoySxACdHsQ=
 SHA256 (libreoffice/libvisio-0.1.6.tar.xz) = /hAC02cdU8Cbxl5H7JSOx7Z+b7ES7RzRCWbiEai7UPk=
 SHA256 (libreoffice/libwpd-0.10.2.tar.xz) = Mj9ovq9PNeWk19r/tHA9BWZpgoAQkhD6TqqQ3qJ9ZhA=
 SHA256 (libreoffice/libwpg-0.3.2.tar.xz) = V/rxq5fWPVc4OsXXh16ZKj0ZBDZzL0CDMQwEcecvjDM=
-SHA256 (libreoffice/libwps-0.4.4.tar.bz2) = OHxG2VQ7tWY4H924mR4oOFmfxQDuEy/vljGnBMXL7XM=
 SHA256 (libreoffice/libwps-0.4.8.tar.xz) = 5HjoJe8z9qQ0oZ/5AsVGnJ2nrMhm6g2KthCosqqUF34=
+SHA256 (libreoffice/libwps-0.4.9.tar.xz) = E76wxzO7FUSlQrarHZ0gXyGOmiIC0dTKwFb3n223SSI=
 SHA256 (libreoffice/libzmf-0.0.2.tar.xz) = JwUaMMsFf9tdXeZaHxZccVPcduJ/5iJRy7hmOessryI=
+SHA256 (libreoffice/lxml-4.1.1.tgz) = lAyu8ex8eODDSw9rlP5C0PICKRX/x4ZD0oU4pc/Q9A4=
 SHA256 (libreoffice/mdds-1.3.1.tar.bz2) = 3LjNJCVWelpewWSv6kdbzld4S8o+NSrUy909Gn4I5aE=
 SHA256 (libreoffice/noto-fonts-20171024.tar.gz) = KazBWkxNa1EgG6XWDzA9+8LlrL/bcEE8muHtNPolmZQ=
-SHA256 (libreoffice/pdfium-3235.tar.bz2) = fcDTP8JLFhKGX14XPUiAC6Py24kcV+P5K50s5W/+ty8=
+SHA256 (libreoffice/pdfium-3426.tar.bz2) = gDMbSBZlAaGS1lR2ky8XBE7rXxD6pupQ9PF1FpR1yVc=
 SHA256 (libreoffice/ttf-kacst_2.01+mry.tar.gz) = 3KAPXmVfLyF6dm+qc6gfVCxcIEqjpHAXw8K+CzHQClY=
 SHA256 (libreoffice/xmlsec1-1.2.25.tar.gz) = lnyoPt8lzLW0ijxKCa00BaYzZVdlA780KQpC3huS/NI=
 SIZE (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 96939
@@ -91,8 +93,9 @@ SIZE (libreoffice/7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.g
 SIZE (libreoffice/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip) = 762419
 SIZE (libreoffice/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz) = 1338551
 SIZE (libreoffice/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip) = 2938721
+SIZE (libreoffice/Amiri-0.111.zip) = 1423863
 SIZE (libreoffice/EmojiOneColor-SVGinOT-1.3.tar.gz) = 2961759
-SIZE (libreoffice/ReemKufi-0.6.tar.gz) = 85466
+SIZE (libreoffice/ReemKufi-0.7.zip) = 153832
 SIZE (libreoffice/Scheherazade-2.100.zip) = 1114645
 SIZE (libreoffice/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 23150
 SIZE (libreoffice/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz) = 4910303
@@ -112,39 +115,40 @@ SIZE (libreoffice/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip) =
 SIZE (libreoffice/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz) = 1098827
 SIZE (libreoffice/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip) = 427800
 SIZE (libreoffice/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip) = 211919
-SIZE (libreoffice/language-subtag-registry-2017-12-14.tar.bz2) = 74615
+SIZE (libreoffice/language-subtag-registry-2018-04-23.tar.bz2) = 75201
 SIZE (libreoffice/libabw-0.1.2.tar.xz) = 318400
 SIZE (libreoffice/libcdr-0.1.3.tar.bz2) = 731755
 SIZE (libreoffice/libcdr-0.1.4.tar.xz) = 609592
 SIZE (libreoffice/libcmis-0.5.1.tar.gz) = 767701
 SIZE (libreoffice/libe-book-0.1.3.tar.xz) = 416268
-SIZE (libreoffice/libepubgen-0.1.0.tar.bz2) = 398811
-SIZE (libreoffice/libetonyek-0.1.7.tar.xz) = 1256232
+SIZE (libreoffice/libepubgen-0.1.1.tar.xz) = 324380
+SIZE (libreoffice/libetonyek-0.1.8.tar.xz) = 1324868
 SIZE (libreoffice/libexttextcat-3.4.5.tar.xz) = 1041268
 SIZE (libreoffice/libfreehand-0.1.2.tar.xz) = 516132
 SIZE (libreoffice/libgltf-0.0.2.tar.bz2) = 538040
 SIZE (libreoffice/liblangtag-0.6.2.tar.bz2) = 766080
-SIZE (libreoffice/libmspub-0.1.3.tar.xz) = 377716
-SIZE (libreoffice/libmwaw-0.3.13.tar.xz) = 1258220
+SIZE (libreoffice/libmspub-0.1.4.tar.xz) = 377472
+SIZE (libreoffice/libmwaw-0.3.14.tar.xz) = 1276240
 SIZE (libreoffice/libodfgen-0.1.6.tar.bz2) = 446705
-SIZE (libreoffice/liborcus-0.13.3.tar.gz) = 2327631
+SIZE (libreoffice/liborcus-0.13.4.tar.gz) = 2326729
 SIZE (libreoffice/libpagemaker-0.0.4.tar.xz) = 306496
 SIZE (libreoffice/libqxp-0.0.1.tar.xz) = 340184
 SIZE (libreoffice/libre-hebrew-1.0.tar.gz) = 531276
-SIZE (libreoffice/libreoffice-6.0.3.2.tar.xz) = 203747760
-SIZE (libreoffice/libreoffice-dictionaries-6.0.3.2.tar.xz) = 41657048
-SIZE (libreoffice/libreoffice-help-6.0.3.2.tar.xz) = 2972952
-SIZE (libreoffice/libreoffice-translations-6.0.3.2.tar.xz) = 139138536
+SIZE (libreoffice/libreoffice-6.1.0.3.tar.xz) = 206818588
+SIZE (libreoffice/libreoffice-dictionaries-6.1.0.3.tar.xz) = 42192496
+SIZE (libreoffice/libreoffice-help-6.1.0.3.tar.xz) = 15754176
+SIZE (libreoffice/libreoffice-translations-6.1.0.3.tar.xz) = 141153028
 SIZE (libreoffice/librevenge-0.0.4.tar.bz2) = 529833
-SIZE (libreoffice/libstaroffice-0.0.5.tar.xz) = 682380
+SIZE (libreoffice/libstaroffice-0.0.6.tar.xz) = 706324
 SIZE (libreoffice/libvisio-0.1.6.tar.xz) = 676396
 SIZE (libreoffice/libwpd-0.10.2.tar.xz) = 536400
 SIZE (libreoffice/libwpg-0.3.2.tar.xz) = 326840
-SIZE (libreoffice/libwps-0.4.4.tar.bz2) = 749717
 SIZE (libreoffice/libwps-0.4.8.tar.xz) = 648512
+SIZE (libreoffice/libwps-0.4.9.tar.xz) = 673784
 SIZE (libreoffice/libzmf-0.0.2.tar.xz) = 320952
+SIZE (libreoffice/lxml-4.1.1.tgz) = 2380804
 SIZE (libreoffice/mdds-1.3.1.tar.bz2) = 287612
 SIZE (libreoffice/noto-fonts-20171024.tar.gz) = 6646182
-SIZE (libreoffice/pdfium-3235.tar.bz2) = 5836207
+SIZE (libreoffice/pdfium-3426.tar.bz2) = 6348500
 SIZE (libreoffice/ttf-kacst_2.01+mry.tar.gz) = 407400
 SIZE (libreoffice/xmlsec1-1.2.25.tar.gz) = 1839160

editors/libreoffice/patches/patch-RepositoryExternal_mk

@@ -1,10 +1,10 @@
-$OpenBSD: patch-RepositoryExternal_mk,v 1.5 2018/02/05 17:15:05 robert Exp $
+$OpenBSD: patch-RepositoryExternal_mk,v 1.6 2018/08/18 07:07:17 robert Exp $
 XXX
 
 Index: RepositoryExternal.mk
 --- RepositoryExternal.mk.orig
 +++ RepositoryExternal.mk
-@@ -671,6 +671,7 @@ endef
+@@ -677,6 +677,7 @@ endef
  
  define gb_LinkTarget__use_boost_headers
  $(call gb_LinkTarget_use_unpacked,$(1),boost)
@@ -12,7 +12,7 @@ Index: RepositoryExternal.mk
  $(call gb_LinkTarget_set_include,$(1),\
  	$(BOOST_CPPFLAGS) \
  	$$(INCLUDE) \
-@@ -3582,7 +3583,11 @@ gb_LinkTarget__use_libgpg-error :=
+@@ -3675,7 +3676,11 @@ gb_LinkTarget__use_libgpg-error :=
  endif # ENABLE_GPGMEPP
  
  define gb_LinkTarget__use_dconf

editors/libreoffice/patches/patch-basic_source_runtime_methods_cxx

@@ -1,8 +1,8 @@
-$OpenBSD: patch-basic_source_runtime_methods_cxx,v 1.6 2018/02/05 17:15:05 robert Exp $
+$OpenBSD: patch-basic_source_runtime_methods_cxx,v 1.7 2018/08/18 07:07:17 robert Exp $
 Index: basic/source/runtime/methods.cxx
 --- basic/source/runtime/methods.cxx.orig
 +++ basic/source/runtime/methods.cxx
-@@ -84,6 +84,7 @@ using namespace com::sun::star::uno;
+@@ -85,6 +85,7 @@ using namespace com::sun::star::uno;
  #include <stdio.h>
  #include <stdlib.h>
  #include <errno.h>

editors/libreoffice/patches/patch-bridges_source_cpp_uno_gcc3_linux_intel_share_hxx

@@ -1,11 +1,11 @@
-$OpenBSD: patch-bridges_source_cpp_uno_gcc3_linux_intel_share_hxx,v 1.1 2017/08/13 17:12:48 robert Exp $
+$OpenBSD: patch-bridges_source_cpp_uno_gcc3_linux_intel_share_hxx,v 1.2 2018/08/18 07:07:17 robert Exp $
 
 Index: bridges/source/cpp_uno/gcc3_linux_intel/share.hxx
 --- bridges/source/cpp_uno/gcc3_linux_intel/share.hxx.orig
 +++ bridges/source/cpp_uno/gcc3_linux_intel/share.hxx
 @@ -33,6 +33,23 @@
  #include <uno/any2.h>
- #include "uno/mapping.h"
+ #include <uno/mapping.h>
  
 +namespace __cxxabiv1
 +{

editors/libreoffice/patches/patch-configure

@@ -1,24 +1,18 @@
-$OpenBSD: patch-configure,v 1.24 2018/04/05 21:49:33 robert Exp $
+$OpenBSD: patch-configure,v 1.25 2018/08/18 07:07:17 robert Exp $
 
 Index: configure
 --- configure.orig
 +++ configure
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#!/usr/bin/env bash
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.69 for LibreOffice 6.0.3.2.
- #
-@@ -273,7 +273,7 @@ $0: the script under such a shell if you do have one."
- fi
- fi
- fi
--SHELL=${CONFIG_SHELL-/bin/sh}
-+SHELL=${CONFIG_SHELL-/usr/bin/env bash}
- export SHELL
- # Unset more variables known to interfere with behavior of common tools.
- CLICOLOR_FORCE= GREP_OPTIONS=
-@@ -5864,6 +5864,7 @@ aix*)
+@@ -4982,7 +4982,7 @@ add_warning()
+     if test "$have_WARNINGS" = "no"; then
+         echo "*************************************" > warn
+         have_WARNINGS="yes"
+-        if which tput >/dev/null 2>/dev/null && test `tput colors` -ge 8; then
++        if which tput >/dev/null 2>/dev/null && test `tput colors 2>/dev/null` -ge 8 2>/dev/null; then
+                         COLORWARN='* WARNING :'
+         else
+             COLORWARN="* WARNING :"
+@@ -5932,6 +5932,7 @@ aix*)
  openbsd*)
      test_gtk=yes
      test_freetype=yes
@@ -26,7 +20,7 @@ Index: configure
      PTHREAD_CFLAGS="-D_THREAD_SAFE"
      PTHREAD_LIBS="-pthread"
      _os=OpenBSD
-@@ -17542,9 +17543,6 @@ _ACEOF
+@@ -17963,9 +17964,6 @@ _ACEOF
          rm -fr libconftest*
          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gccvisinlineshiddenok" >&5
  $as_echo "$gccvisinlineshiddenok" >&6; }
@@ -36,7 +30,7 @@ Index: configure
      fi
  
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if gcc has a visibility bug with class-level attributes (GCC bug 26905)" >&5
-@@ -24093,7 +24091,7 @@ if ${am_cv_pathless_PYTHON+:} false; then :
+@@ -24240,7 +24238,7 @@ if ${am_cv_pathless_PYTHON+:} false; then :
    $as_echo_n "(cached) " >&6
  else
  
@@ -45,7 +39,7 @@ Index: configure
  	  test "$am_cv_pathless_PYTHON" = none && break
  	  prog="import sys
  # split strings by '.' and convert to numeric.  Append some zeros
-@@ -24394,7 +24392,7 @@ if ${am_cv_pathless_PYTHON+:} false; then :
+@@ -24541,7 +24539,7 @@ if ${am_cv_pathless_PYTHON+:} false; then :
    $as_echo_n "(cached) " >&6
  else
  
@@ -54,7 +48,7 @@ Index: configure
  	  test "$am_cv_pathless_PYTHON" = none && break
  	  prog="import sys
  # split strings by '.' and convert to numeric.  Append some zeros
-@@ -24714,7 +24712,7 @@ if ${am_cv_pathless_PYTHON+:} false; then :
+@@ -24861,7 +24859,7 @@ if ${am_cv_pathless_PYTHON+:} false; then :
    $as_echo_n "(cached) " >&6
  else
  
@@ -63,25 +57,25 @@ Index: configure
  	  test "$am_cv_pathless_PYTHON" = none && break
  	  prog="import sys
  # split strings by '.' and convert to numeric.  Append some zeros
-@@ -32560,7 +32558,7 @@ $as_echo "internal" >&6; }
+@@ -32713,7 +32711,7 @@ $as_echo "internal" >&6; }
      if test "$COM" = "MSC"; then
          HYPHEN_LIB="${WORKDIR}/LinkTarget/StaticLibrary/hyphen.lib"
      else
 -        HYPHEN_LIB="-L${WORKDIR}/UnpackedTarball/hyphen/.libs -lhyphen"
-+        HYPHEN_LIB="${WORKDIR}/UnpackedTarball/hyphen/.libs/libhyphen.a"
++	HYPHEN_LIB="${WORKDIR}/UnpackedTarball/hyphen/.libs/libhyphen.a"
      fi
  fi
  
-@@ -32753,7 +32751,7 @@ $as_echo "internal" >&6; }
+@@ -32906,7 +32904,7 @@ $as_echo "internal" >&6; }
      if test "$COM" = "MSC"; then
          MYTHES_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/mythes.lib"
      else
 -        MYTHES_LIBS="-L${WORKDIR}/UnpackedTarball/mythes/.libs -lmythes-1.2"
-+        MYTHES_LIBS="${WORKDIR}/UnpackedTarball/mythes/.libs/libmythes-1.2.a"
++	MYTHES_LIBS="${WORKDIR}/UnpackedTarball/mythes/.libs/libmythes-1.2.a"
      fi
  fi
  
-@@ -35895,8 +35893,8 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE
+@@ -36334,8 +36332,8 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE
      qt4_incdirs="$QT4INC /usr/include/qt4 /usr/include $x_includes"
      qt4_libdirs="$QT4LIB /usr/lib/qt4 /usr/lib $x_libraries"
  
@@ -92,22 +86,22 @@ Index: configure
  
      if test -n "$supports_multilib"; then
          qt4_libdirs="$qt4_libdirs /usr/lib64/qt4 /usr/lib64/qt /usr/lib64"
-@@ -35921,11 +35919,11 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE
+@@ -36360,11 +36358,11 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE
      fi
  
      if test -n "$KDEDIR"; then
 -        kde4_incdirs="$KDEDIR/include $kde4_incdirs"
-+        kde4_incdirs="$KDEDIR/include/kde $KDEDIR/include $kde4_incdirs"
++	kde4_incdirs="$KDEDIR/include/kde $KDEDIR/include $kde4_incdirs"
          if test -z "$supports_multilib"; then
 -            kde4_libdirs="$KDEDIR/lib $kde4_libdirs"
-+            kde4_libdirs="$KDEDIR/lib/kde4 $KDEDIR/lib $kde4_libdirs"
++	    kde4_libdirs="$KDEDIR/lib/kde4 $KDEDIR/lib $kde4_libdirs"
          else
 -            kde4_libdirs="$KDEDIR/lib64 $KDEDIR/lib $kde4_libdirs"
-+            kde4_libdirs="$KDEDIR/lib64 $KDEDIR/lib/kde4 $KDEDIR/lib $kde4_libdirs"
++	    kde4_libdirs="$KDEDIR/lib64 $KDEDIR/lib/kde4 $KDEDIR/lib $kde4_libdirs"
          fi
      fi
      if test -n "$KDE4DIR"; then
-@@ -36019,7 +36017,7 @@ test -n "$QMAKE4" || QMAKE4="no"
+@@ -36458,7 +36456,7 @@ test -n "$QMAKE4" || QMAKE4="no"
  $as_echo_n "checking for Qt4 libraries... " >&6; }
      qt4_lib_dir="no"
      for lib_dir in $qt4_libdirs; do
@@ -116,7 +110,7 @@ Index: configure
              qt4_lib_dir="$lib_dir"
              PKG_CONFIG_PATH="$qt4_lib_dir"/pkgconfig:$PKG_CONFIG_PATH
              break
-@@ -36146,7 +36144,7 @@ $as_echo "$kde4_incdir" >&6; }
+@@ -36585,7 +36583,7 @@ $as_echo "$kde4_incdir" >&6; }
  $as_echo_n "checking for KDE4 libraries... " >&6; }
      kde4_libdir="no"
      for kde4_check in $kde4_libdirs; do
@@ -125,7 +119,7 @@ Index: configure
              kde4_libdir="$kde4_check"
              break
          fi
-@@ -38726,7 +38724,7 @@ for i in shasum /usr/local/bin/shasum /usr/sfw/bin/sha
+@@ -39034,7 +39032,7 @@ for i in shasum /usr/local/bin/shasum /usr/sfw/bin/sha
  done
  
  if test -z "$SHA256SUM"; then

editors/libreoffice/patches/patch-desktop_source_app_app_cxx

@@ -1,8 +1,8 @@
-$OpenBSD: patch-desktop_source_app_app_cxx,v 1.12 2018/02/05 17:15:05 robert Exp $
+$OpenBSD: patch-desktop_source_app_app_cxx,v 1.13 2018/08/18 07:07:17 robert Exp $
 Index: desktop/source/app/app.cxx
 --- desktop/source/app/app.cxx.orig
 +++ desktop/source/app/app.cxx
-@@ -574,7 +574,7 @@ void Desktop::DeInit()
+@@ -567,7 +567,7 @@ void Desktop::DeInit()
          // clear lockfile
          m_xLockfile.reset();
  

editors/libreoffice/patches/patch-external_libqxp_UnpackedTarball_libqxp_mk

@@ -1,9 +1,9 @@
-$OpenBSD: patch-external_libqxp_UnpackedTarball_libqxp_mk,v 1.1 2018/02/05 17:15:05 robert Exp $
+$OpenBSD: patch-external_libqxp_UnpackedTarball_libqxp_mk,v 1.2 2018/08/18 07:07:17 robert Exp $
 
 Index: external/libqxp/UnpackedTarball_libqxp.mk
 --- external/libqxp/UnpackedTarball_libqxp.mk.orig
 +++ external/libqxp/UnpackedTarball_libqxp.mk
-@@ -23,6 +23,7 @@ endif
+@@ -25,6 +25,7 @@ endif
  
  $(eval $(call gb_UnpackedTarball_add_patches,libqxp, \
  	external/libqxp/android-workaround.patch.1 \

editors/libreoffice/patches/patch-external_libwps_ExternalProject_libwps_mk

@@ -1,14 +1,15 @@
-$OpenBSD: patch-external_libwps_ExternalProject_libwps_mk,v 1.2 2018/02/05 17:15:05 robert Exp $
+$OpenBSD: patch-external_libwps_ExternalProject_libwps_mk,v 1.3 2018/08/18 07:07:17 robert Exp $
 
 Index: external/libwps/ExternalProject_libwps.mk
 --- external/libwps/ExternalProject_libwps.mk.orig
 +++ external/libwps/ExternalProject_libwps.mk
-@@ -35,8 +35,9 @@ $(call gb_ExternalProject_get_state_target,libwps,buil
- 			--disable-debug \
+@@ -41,9 +41,10 @@ $(call gb_ExternalProject_get_state_target,libwps,buil
+ 			$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
  			--disable-werror \
  			$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
 +			CPPFLAGS="$(gb_CPPFLAGS) -fPIC" \
  			CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \
+ 			$(if $(libwps_CPPFLAGS),CPPFLAGS='$(libwps_CPPFLAGS)') \
 -			$(if $(filter LINUX,$(OS)),$(if $(SYSTEM_REVENGE),, \
 +			$(if $(filter OPENBSD,$(OS)),$(if $(SYSTEM_REVENGE),, \
  				'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \

editors/libreoffice/patches/patch-external_pdfium_UnpackedTarball_pdfium_mk

@@ -1,12 +1,12 @@
-$OpenBSD: patch-external_pdfium_UnpackedTarball_pdfium_mk,v 1.1 2018/02/05 17:15:05 robert Exp $
+$OpenBSD: patch-external_pdfium_UnpackedTarball_pdfium_mk,v 1.2 2018/08/18 07:07:17 robert Exp $
 
 Index: external/pdfium/UnpackedTarball_pdfium.mk
 --- external/pdfium/UnpackedTarball_pdfium.mk.orig
 +++ external/pdfium/UnpackedTarball_pdfium.mk
-@@ -11,6 +11,7 @@ pdfium_patches :=
- pdfium_patches += visibility.patch.1
- pdfium_patches += ubsan.patch
- pdfium_patches += freetype.patch.1
+@@ -13,6 +13,7 @@ pdfium_patches += ubsan.patch
+ pdfium_patches += icu.patch.1
+ # Fixes build on our baseline.
+ pdfium_patches += build.patch.1
 +pdfium_patches += pdfium-openbsd.patch
  
  $(eval $(call gb_UnpackedTarball_UnpackedTarball,pdfium))

editors/libreoffice/patches/patch-external_pdfium_pdfium-openbsd_patch

@@ -1,12 +1,12 @@
-$OpenBSD: patch-external_pdfium_pdfium-openbsd_patch,v 1.1 2018/02/05 17:15:05 robert Exp $
+$OpenBSD: patch-external_pdfium_pdfium-openbsd_patch,v 1.2 2018/08/18 07:07:17 robert Exp $
 
 Index: external/pdfium/pdfium-openbsd.patch
 --- external/pdfium/pdfium-openbsd.patch.orig
 +++ external/pdfium/pdfium-openbsd.patch
-@@ -0,0 +1,75 @@
-+--- core/fxcrt/fx_system.h.orig	Fri Feb  2 23:17:44 2018
-++++ core/fxcrt/fx_system.h	Fri Feb  2 23:17:50 2018
-+@@ -40,7 +40,7 @@
+@@ -0,0 +1,60 @@
++--- core/fxcrt/fx_system.h.orig	Wed Aug 15 15:05:00 2018
+++++ core/fxcrt/fx_system.h	Wed Aug 15 15:05:10 2018
++@@ -41,7 +41,7 @@
 + #elif defined(_WIN64)
 + #define _FX_OS_ _FX_OS_WIN64_
 + #define _FX_PLATFORM_ _FX_PLATFORM_WINDOWS_
@@ -15,9 +15,9 @@ Index: external/pdfium/pdfium-openbsd.patch
 + #define _FX_OS_ _FX_OS_LINUX_
 + #define _FX_PLATFORM_ _FX_PLATFORM_LINUX_
 + #elif defined(__APPLE__)
-+--- core/fxge/fx_ge_linux.cpp.orig	Fri Feb  2 23:20:40 2018
-++++ core/fxge/fx_ge_linux.cpp	Fri Feb  2 23:20:51 2018
-+@@ -148,9 +148,8 @@
++--- core/fxge/fx_ge_linux.cpp.orig	Wed Aug 15 15:05:14 2018
+++++ core/fxge/fx_ge_linux.cpp	Wed Aug 15 15:05:28 2018
++@@ -146,9 +146,8 @@
 +     const char** pUserPaths) {
 +   auto pInfo = pdfium::MakeUnique<CFX_LinuxFontInfo>();
 +   if (!pInfo->ParseFontCfg(pUserPaths)) {
@@ -29,23 +29,8 @@ Index: external/pdfium/pdfium-openbsd.patch
 +     pInfo->AddPath("/usr/local/share/fonts");
 +   }
 +   return std::move(pInfo);
-+--- fpdfsdk/javascript/JS_Value.cpp.orig	Fri Feb  2 23:18:54 2018
-++++ fpdfsdk/javascript/JS_Value.cpp	Fri Feb  2 23:19:15 2018
-+@@ -37,7 +37,12 @@
-+   long timezone = 0;
-+   _get_timezone(&timezone);
-+ #endif  // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
-++#ifdef __OpenBSD__
-++  struct tm *lt;
-++  return (double)(-(lt->tm_gmtoff * 1000));
-++#else
-+   return (double)(-(timezone * 1000));
-++#endif
-+ }
-+ 
-+ int GetDaylightSavingTA(double d) {
-+--- third_party/base/logging.h.orig	Fri Feb  2 23:19:24 2018
-++++ third_party/base/logging.h	Fri Feb  2 23:19:36 2018
++--- third_party/base/logging.h.orig	Wed Aug 15 15:05:36 2018
+++++ third_party/base/logging.h	Wed Aug 15 15:05:46 2018
 +@@ -10,7 +10,7 @@
 + 
 + #ifndef _WIN32
@@ -55,8 +40,8 @@ Index: external/pdfium/pdfium-openbsd.patch
 + #else
 + #define NULL_DEREF_IF_POSSIBLE
 + #endif
-+--- third_party/libopenjpeg20/opj_malloc.h.orig	Fri Feb  2 23:19:48 2018
-++++ third_party/libopenjpeg20/opj_malloc.h	Fri Feb  2 23:19:56 2018
++--- third_party/libopenjpeg20/opj_malloc.h.orig	Wed Aug 15 15:05:54 2018
+++++ third_party/libopenjpeg20/opj_malloc.h	Wed Aug 15 15:06:06 2018
 +@@ -98,7 +98,7 @@
 + #else /* Not _WIN32 */
 +   #if defined(__sun)
@@ -66,9 +51,9 @@ Index: external/pdfium/pdfium-openbsd.patch
 +     #define HAVE_POSIX_MEMALIGN
 +   /* Linux x86_64 and OSX always align allocations to 16 bytes */
 +   #elif !defined(__amd64__) && !defined(__APPLE__) && !defined(_AIX)
-+--- xfa/fgas/font/cfgas_fontmgr.cpp.orig	Fri Feb  2 23:20:07 2018
-++++ xfa/fgas/font/cfgas_fontmgr.cpp	Fri Feb  2 23:20:29 2018
-+@@ -436,8 +436,8 @@
++--- xfa/fgas/font/cfgas_fontmgr.cpp.orig	Wed Aug 15 15:06:11 2018
+++++ xfa/fgas/font/cfgas_fontmgr.cpp	Wed Aug 15 15:06:21 2018
++@@ -252,8 +252,8 @@
 + 
 + constexpr const char* g_FontFolders[] = {
 + #if _FX_PLATFORM_ == _FX_PLATFORM_LINUX_

editors/libreoffice/patches/patch-filter_Executable_svg2odf_mk

@@ -1,16 +0,0 @@
-$OpenBSD: patch-filter_Executable_svg2odf_mk,v 1.2 2018/02/05 17:15:05 robert Exp $
-Index: filter/Executable_svg2odf.mk
---- filter/Executable_svg2odf.mk.orig
-+++ filter/Executable_svg2odf.mk
-@@ -11,7 +11,10 @@ $(eval $(call gb_Executable_Executable,svg2odf))
- 
- $(eval $(call gb_Executable_set_targettype_gui,svg2odf,YES))
- 
--$(eval $(call gb_Executable_use_external,svg2odf,boost_headers))
-+$(eval $(call gb_Executable_use_externals,svg2odf,\
-+    boost_headers \
-+    orcus \
-+))
- 
- $(eval $(call gb_Executable_use_sdk_api,svg2odf))
- 

editors/libreoffice/patches/patch-sal_cppunittester_cppunittester_cxx

@@ -1,8 +1,8 @@
-$OpenBSD: patch-sal_cppunittester_cppunittester_cxx,v 1.6 2018/02/05 17:15:05 robert Exp $
+$OpenBSD: patch-sal_cppunittester_cppunittester_cxx,v 1.7 2018/08/18 07:07:17 robert Exp $
 Index: sal/cppunittester/cppunittester.cxx
 --- sal/cppunittester/cppunittester.cxx.orig
 +++ sal/cppunittester/cppunittester.cxx
-@@ -375,6 +375,7 @@ void reportResourceUsage(const OUString& /*rPath*/)
+@@ -371,6 +371,7 @@ void reportResourceUsage(const OUString& /*rPath*/)
  
  SAL_IMPLEMENT_MAIN()
  {

editors/libreoffice/patches/patch-sal_osl_unx_system_hxx

@@ -1,9 +1,9 @@
-$OpenBSD: patch-sal_osl_unx_system_hxx,v 1.1 2017/12/29 07:39:30 robert Exp $
+$OpenBSD: patch-sal_osl_unx_system_hxx,v 1.2 2018/08/18 07:07:17 robert Exp $
 
 Index: sal/osl/unx/system.hxx
 --- sal/osl/unx/system.hxx.orig
 +++ sal/osl/unx/system.hxx
-@@ -128,7 +128,6 @@
+@@ -160,7 +160,6 @@
  #endif
  
  #ifdef OPENBSD

editors/libreoffice/patches/patch-shell_source_unix_exec_shellexec_cxx

@@ -1,9 +1,9 @@
-$OpenBSD: patch-shell_source_unix_exec_shellexec_cxx,v 1.8 2018/02/05 17:15:05 robert Exp $
+$OpenBSD: patch-shell_source_unix_exec_shellexec_cxx,v 1.9 2018/08/18 07:07:17 robert Exp $
 
 Index: shell/source/unix/exec/shellexec.cxx
 --- shell/source/unix/exec/shellexec.cxx.orig
 +++ shell/source/unix/exec/shellexec.cxx
-@@ -145,7 +145,7 @@ void SAL_CALL ShellExec::execute( const OUString& aCom
+@@ -137,7 +137,7 @@ void SAL_CALL ShellExec::execute( const OUString& aCom
          aBuffer.append("open --");
  #else
          // Just use xdg-open on non-Mac
@@ -12,7 +12,7 @@ Index: shell/source/unix/exec/shellexec.cxx
  #endif
          aBuffer.append(" ");
          escapeForShell(aBuffer, OUStringToOString(aURL, osl_getThreadTextEncoding()));
-@@ -185,7 +185,7 @@ void SAL_CALL ShellExec::execute( const OUString& aCom
+@@ -177,7 +177,7 @@ void SAL_CALL ShellExec::execute( const OUString& aCom
      }
  
      OString cmd =

editors/libreoffice/patches/patch-solenv_bin_ooinstall

@@ -1,8 +1,8 @@
-$OpenBSD: patch-solenv_bin_ooinstall,v 1.6 2018/02/05 17:15:05 robert Exp $
+$OpenBSD: patch-solenv_bin_ooinstall,v 1.7 2018/08/18 07:07:17 robert Exp $
 Index: solenv/bin/ooinstall
 --- solenv/bin/ooinstall.orig
 +++ solenv/bin/ooinstall
-@@ -82,10 +82,12 @@ if ($is_windows) {
+@@ -81,10 +81,12 @@ if ($is_windows) {
  # make distro-pack-install shufle with the SDK installation to make it LSB compliant
  # it creates symlinks from the original path to /usr/share; they are not valid with $DESTDIR
  # and potential second ooinstall call fails with strange error messages if the old tree is still there

editors/libreoffice/patches/patch-vcl_Library_vclplug_gtk3_mk

@@ -1,7 +1,8 @@
-$OpenBSD: patch-vcl_Library_vclplug_gtk3_mk,v 1.4 2016/09/04 12:02:49 robert Exp $
---- vcl/Library_vclplug_gtk3.mk.orig.port	Fri Jul 29 00:11:19 2016
-+++ vcl/Library_vclplug_gtk3.mk	Sat Sep  3 16:55:20 2016
-@@ -113,10 +113,10 @@ $(eval $(call gb_Library_add_exception_objects,vclplug
+$OpenBSD: patch-vcl_Library_vclplug_gtk3_mk,v 1.5 2018/08/18 07:07:17 robert Exp $
+Index: vcl/Library_vclplug_gtk3.mk
+--- vcl/Library_vclplug_gtk3.mk.orig
++++ vcl/Library_vclplug_gtk3.mk
+@@ -115,10 +115,10 @@ $(eval $(call gb_Library_add_exception_objects,vclplug
      vcl/unx/gtk3/gtk3hudawareness \
  ))
  

editors/libreoffice/patches/patch-vcl_Library_vclplug_gtk_mk

@@ -1,7 +1,8 @@
-$OpenBSD: patch-vcl_Library_vclplug_gtk_mk,v 1.2 2016/09/04 12:02:49 robert Exp $
---- vcl/Library_vclplug_gtk.mk.orig.port	Fri Jul 29 00:11:19 2016
-+++ vcl/Library_vclplug_gtk.mk	Sat Sep  3 16:55:20 2016
-@@ -120,10 +120,10 @@ $(eval $(call gb_Library_add_exception_objects,vclplug
+$OpenBSD: patch-vcl_Library_vclplug_gtk_mk,v 1.3 2018/08/18 07:07:17 robert Exp $
+Index: vcl/Library_vclplug_gtk.mk
+--- vcl/Library_vclplug_gtk.mk.orig
++++ vcl/Library_vclplug_gtk.mk
+@@ -122,10 +122,10 @@ $(eval $(call gb_Library_add_exception_objects,vclplug
  ))
  endif
  

editors/libreoffice/patches/patch-vcl_Library_vclplug_kde4_mk

@@ -1,4 +1,4 @@
-$OpenBSD: patch-vcl_Library_vclplug_kde4_mk,v 1.2 2018/02/05 17:15:05 robert Exp $
+$OpenBSD: patch-vcl_Library_vclplug_kde4_mk,v 1.3 2018/08/18 07:07:17 robert Exp $
 Index: vcl/Library_vclplug_kde4.mk
 --- vcl/Library_vclplug_kde4.mk.orig
 +++ vcl/Library_vclplug_kde4.mk
@@ -10,7 +10,7 @@ Index: vcl/Library_vclplug_kde4.mk
  ))
  
  $(eval $(call gb_Library_add_defs,vclplug_kde4,\
-@@ -87,10 +88,10 @@ $(eval $(call gb_Library_add_exception_objects,vclplug
+@@ -88,10 +89,10 @@ $(eval $(call gb_Library_add_exception_objects,vclplug
      vcl/unx/kde4/VCLKDEApplication \
  ))
  

editors/libreoffice/patches/patch-vcl_source_salmain_salmain_cxx

@@ -1,4 +1,4 @@
-$OpenBSD: patch-vcl_source_salmain_salmain_cxx,v 1.2 2018/02/05 17:15:05 robert Exp $
+$OpenBSD: patch-vcl_source_salmain_salmain_cxx,v 1.3 2018/08/18 07:07:17 robert Exp $
 
 Index: vcl/source/salmain/salmain.cxx
 --- vcl/source/salmain/salmain.cxx.orig
@@ -7,14 +7,14 @@ Index: vcl/source/salmain/salmain.cxx
  
  #include <salinst.hxx>
  
--#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && !defined LIBO_HEADLESS
-+#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && !defined LIBO_HEADLESS && !defined OPENBSD
+-#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && !defined LIBO_HEADLESS && !defined HAIKU
++#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && !defined LIBO_HEADLESS && !defined HAIKU && !defined OPENBSD
  #include <opengl/x11/glxtest.hxx>
  #endif
  
  SAL_IMPLEMENT_MAIN() {
--#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && !defined LIBO_HEADLESS
-+#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && !defined LIBO_HEADLESS && !defined OPENBSD
+-#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && !defined LIBO_HEADLESS && !defined HAIKU
++#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && !defined LIBO_HEADLESS && !defined HAIKU && !defined OPENBSD
      fire_glxtest_process();
  #endif
      tools::extendApplicationEnvironment();

editors/libreoffice/patches/patch-writerfilter_source_rtftok_rtfsprm_hxx

@@ -1,12 +1,13 @@
-$OpenBSD: patch-writerfilter_source_rtftok_rtfsprm_hxx,v 1.5 2018/02/05 17:15:05 robert Exp $
+$OpenBSD: patch-writerfilter_source_rtftok_rtfsprm_hxx,v 1.6 2018/08/18 07:07:17 robert Exp $
+
 Index: writerfilter/source/rtftok/rtfsprm.hxx
 --- writerfilter/source/rtftok/rtfsprm.hxx.orig
 +++ writerfilter/source/rtftok/rtfsprm.hxx
 @@ -14,6 +14,7 @@
  #include <utility>
  #include <vector>
- 
+ #include <map>
 +#include <cstddef>
- #include <boost/intrusive_ptr.hpp>
- #include "rtfvalue.hxx"
  
+ #include <tools/ref.hxx>
+ #include "rtfvalue.hxx"

editors/libreoffice/patches/patch-xmlsecurity_Executable_pdfverify_mk

@@ -1,11 +1,11 @@
-$OpenBSD: patch-xmlsecurity_Executable_pdfverify_mk,v 1.1 2018/02/05 17:15:05 robert Exp $
+$OpenBSD: patch-xmlsecurity_Executable_pdfverify_mk,v 1.2 2018/08/18 07:07:17 robert Exp $
 
 Index: xmlsecurity/Executable_pdfverify.mk
 --- xmlsecurity/Executable_pdfverify.mk.orig
 +++ xmlsecurity/Executable_pdfverify.mk
-@@ -11,6 +11,8 @@ $(eval $(call gb_Executable_Executable,pdfverify))
+@@ -13,6 +13,8 @@ $(eval $(call gb_Executable_use_sdk_api,pdfverify))
  
- $(eval $(call gb_Executable_use_sdk_api,pdfverify))
+ $(eval $(call gb_Executable_use_external,pdfverify,boost_headers))
  
 +$(eval $(call gb_Executable_use_external,pdfverify,orcus))
 +

editors/libreoffice/pkg/PLIST-main

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.51 2018/07/01 18:33:35 espie Exp $
+@comment $OpenBSD: PLIST-main,v 1.52 2018/08/18 07:07:17 robert Exp $
 bin/libreoffice
 bin/libreoffice${BV}
 bin/lobase
@@ -95,6 +95,7 @@ lib/libreoffice/program/libcppcanvaslo.so
 lib/libreoffice/program/libctllo.so
 lib/libreoffice/program/libcuilo.so
 lib/libreoffice/program/libdatelo.so
+lib/libreoffice/program/libdbahsqllo.so
 lib/libreoffice/program/libdbalo.so
 lib/libreoffice/program/libdbaselo.so
 lib/libreoffice/program/libdbaxmllo.so
@@ -179,6 +180,7 @@ lib/libreoffice/program/libmtfrendererlo.so
 @bin lib/libreoffice/program/libmwaw-0.3-lo.so.3
 lib/libreoffice/program/libmysqllo.so
 lib/libreoffice/program/libnamingservicelo.so
+lib/libreoffice/program/libnumbertextlo.so
 lib/libreoffice/program/libodbclo.so
 lib/libreoffice/program/libodfflatxmllo.so
 @bin lib/libreoffice/program/libodfgen-0.1-lo.so.1
@@ -201,7 +203,6 @@ lib/libreoffice/program/libprotocolhandlerlo.so
 lib/libreoffice/program/libproxyfaclo.so
 lib/libreoffice/program/libpythonloaderlo.so
 lib/libreoffice/program/libpyuno.so
-lib/libreoffice/program/libqstart_gtklo.so
 lib/libreoffice/program/librecentfile.so
 lib/libreoffice/program/libreflectionlo.so
 lib/libreoffice/program/libreglo.so
@@ -310,7 +311,6 @@ lib/libreoffice/program/libxmlscriptlo.so
 lib/libreoffice/program/libxmlsecurity.so
 lib/libreoffice/program/libxoflo.so
 lib/libreoffice/program/libxolo.so
-lib/libreoffice/program/libxsec_fw.so
 lib/libreoffice/program/libxsec_xmlsec.so
 lib/libreoffice/program/libxsltdlglo.so
 lib/libreoffice/program/libxsltfilterlo.so
@@ -475,8 +475,6 @@ lib/libreoffice/program/wizards/common/Properties.py
 lib/libreoffice/program/wizards/common/PropertyNames.py
 lib/libreoffice/program/wizards/common/SystemDialog.py
 lib/libreoffice/program/wizards/common/UCB.py
-lib/libreoffice/program/wizards/common/XMLHelper.py
-lib/libreoffice/program/wizards/common/XMLProvider.py
 lib/libreoffice/program/wizards/common/__init__.py
 lib/libreoffice/program/wizards/common/strings.hrc
 lib/libreoffice/program/wizards/document/
@@ -523,11 +521,8 @@ lib/libreoffice/program/wizards/ui/event/
 lib/libreoffice/program/wizards/ui/event/CommonListener.py
 lib/libreoffice/program/wizards/ui/event/DataAware.py
 lib/libreoffice/program/wizards/ui/event/EventListenerList.py
-lib/libreoffice/program/wizards/ui/event/ListDataEvent.py
-lib/libreoffice/program/wizards/ui/event/ListDataListener.py
 lib/libreoffice/program/wizards/ui/event/ListModelBinder.py
 lib/libreoffice/program/wizards/ui/event/RadioDataAware.py
-lib/libreoffice/program/wizards/ui/event/SimpleDataAware.py
 lib/libreoffice/program/wizards/ui/event/Task.py
 lib/libreoffice/program/wizards/ui/event/TaskEvent.py
 lib/libreoffice/program/wizards/ui/event/TaskListener.py
@@ -564,6 +559,8 @@ lib/libreoffice/share/Scripts/python/LibreLogo/icons/sc_editglossary.png
 lib/libreoffice/share/Scripts/python/LibreLogo/icons/sc_navigationbarleft.png
 lib/libreoffice/share/Scripts/python/LibreLogo/icons/sc_newdoc.png
 lib/libreoffice/share/Scripts/python/LibreLogo/icons/sc_runbasic.png
+lib/libreoffice/share/Scripts/python/NamedRanges.py
+lib/libreoffice/share/Scripts/python/SetCellColor.py
 lib/libreoffice/share/Scripts/python/pythonSamples/
 lib/libreoffice/share/Scripts/python/pythonSamples/TableSample.py
 lib/libreoffice/share/autocorr/
@@ -573,6 +570,7 @@ lib/libreoffice/share/autocorr/acor_ca-ES.dat
 lib/libreoffice/share/autocorr/acor_cs-CZ.dat
 lib/libreoffice/share/autocorr/acor_da-DK.dat
 lib/libreoffice/share/autocorr/acor_de.dat
+lib/libreoffice/share/autocorr/acor_el-GR.dat
 lib/libreoffice/share/autocorr/acor_en-AU.dat
 lib/libreoffice/share/autocorr/acor_en-GB.dat
 lib/libreoffice/share/autocorr/acor_en-US.dat
@@ -765,9 +763,9 @@ lib/libreoffice/share/classification/example_sl-SI.xml
 lib/libreoffice/share/config/
 lib/libreoffice/share/config/images_breeze.zip
 lib/libreoffice/share/config/images_breeze_dark.zip
+lib/libreoffice/share/config/images_colibre.zip
 lib/libreoffice/share/config/images_elementary.zip
-lib/libreoffice/share/config/images_galaxy.zip
-lib/libreoffice/share/config/images_hicontrast.zip
+lib/libreoffice/share/config/images_karasa_jaga.zip
 lib/libreoffice/share/config/images_sifr.zip
 lib/libreoffice/share/config/images_sifr_dark.zip
 lib/libreoffice/share/config/images_tango.zip
@@ -862,7 +860,6 @@ lib/libreoffice/share/config/soffice.cfg/cui/ui/macroassigndialog.ui
 lib/libreoffice/share/config/soffice.cfg/cui/ui/macroassignpage.ui
 lib/libreoffice/share/config/soffice.cfg/cui/ui/macroselectordialog.ui
 lib/libreoffice/share/config/soffice.cfg/cui/ui/menuassignpage.ui
-lib/libreoffice/share/config/soffice.cfg/cui/ui/messbox.ui
 lib/libreoffice/share/config/soffice.cfg/cui/ui/mosaicdialog.ui
 lib/libreoffice/share/config/soffice.cfg/cui/ui/movemenu.ui
 lib/libreoffice/share/config/soffice.cfg/cui/ui/multipathdialog.ui
@@ -943,6 +940,8 @@ lib/libreoffice/share/config/soffice.cfg/cui/ui/select_persona_dialog.ui
 lib/libreoffice/share/config/soffice.cfg/cui/ui/selectpathdialog.ui
 lib/libreoffice/share/config/soffice.cfg/cui/ui/shadowtabpage.ui
 lib/libreoffice/share/config/soffice.cfg/cui/ui/showcoldialog.ui
+lib/libreoffice/share/config/soffice.cfg/cui/ui/signatureline.ui
+lib/libreoffice/share/config/soffice.cfg/cui/ui/signsignatureline.ui
 lib/libreoffice/share/config/soffice.cfg/cui/ui/similaritysearchdialog.ui
 lib/libreoffice/share/config/soffice.cfg/cui/ui/slantcornertabpage.ui
 lib/libreoffice/share/config/soffice.cfg/cui/ui/smarttagoptionspage.ui
@@ -1003,6 +1002,7 @@ lib/libreoffice/share/config/soffice.cfg/dbaccess/ui/keymenu.ui
 lib/libreoffice/share/config/soffice.cfg/dbaccess/ui/ldapconnectionpage.ui
 lib/libreoffice/share/config/soffice.cfg/dbaccess/ui/ldappage.ui
 lib/libreoffice/share/config/soffice.cfg/dbaccess/ui/migratepage.ui
+lib/libreoffice/share/config/soffice.cfg/dbaccess/ui/migrwarndlg.ui
 lib/libreoffice/share/config/soffice.cfg/dbaccess/ui/mysqlnativepage.ui
 lib/libreoffice/share/config/soffice.cfg/dbaccess/ui/mysqlnativesettings.ui
 lib/libreoffice/share/config/soffice.cfg/dbaccess/ui/namematchingpage.ui
@@ -1218,6 +1218,7 @@ lib/libreoffice/share/config/soffice.cfg/modules/sbibliography/ui/
 lib/libreoffice/share/config/soffice.cfg/modules/sbibliography/ui/choosedatasourcedialog.ui
 lib/libreoffice/share/config/soffice.cfg/modules/sbibliography/ui/generalpage.ui
 lib/libreoffice/share/config/soffice.cfg/modules/sbibliography/ui/mappingdialog.ui
+lib/libreoffice/share/config/soffice.cfg/modules/sbibliography/ui/querydialog.ui
 lib/libreoffice/share/config/soffice.cfg/modules/sbibliography/ui/toolbar.ui
 lib/libreoffice/share/config/soffice.cfg/modules/scalc/
 lib/libreoffice/share/config/soffice.cfg/modules/scalc/menubar/
@@ -1235,6 +1236,7 @@ lib/libreoffice/share/config/soffice.cfg/modules/scalc/popupmenu/draw.xml
 lib/libreoffice/share/config/soffice.cfg/modules/scalc/popupmenu/drawtext.xml
 lib/libreoffice/share/config/soffice.cfg/modules/scalc/popupmenu/form.xml
 lib/libreoffice/share/config/soffice.cfg/modules/scalc/popupmenu/formrichtext.xml
+lib/libreoffice/share/config/soffice.cfg/modules/scalc/popupmenu/formulabar.xml
 lib/libreoffice/share/config/soffice.cfg/modules/scalc/popupmenu/freezepanes.xml
 lib/libreoffice/share/config/soffice.cfg/modules/scalc/popupmenu/graphic.xml
 lib/libreoffice/share/config/soffice.cfg/modules/scalc/popupmenu/media.xml
@@ -1295,6 +1297,7 @@ lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/autoformattable.ui
 lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/cellprotectionpage.ui
 lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/changesourcedialog.ui
 lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/chardialog.ui
+lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/checkwarningdialog.ui
 lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/chisquaretestdialog.ui
 lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/colorrowdialog.ui
 lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/colwidthdialog.ui
@@ -1319,6 +1322,7 @@ lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/datastreams.ui
 lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/definedatabaserangedialog.ui
 lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/definename.ui
 lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/deletecells.ui
+lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/deletecolumnentry.ui
 lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/deletecontents.ui
 lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/descriptivestatisticsdialog.ui
 lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/doubledialog.ui
@@ -1350,6 +1354,7 @@ lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/leftfooterdialog.ui
 lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/leftheaderdialog.ui
 lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/managenamesdialog.ui
 lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/mergecellsdialog.ui
+lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/mergecolumnentry.ui
 lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/movecopysheet.ui
 lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/movingaveragedialog.ui
 lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/multipleoperationsdialog.ui
@@ -1381,6 +1386,7 @@ lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/printeroptions.ui
 lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/protectsheetdlg.ui
 lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/queryrunstreamscriptdialog.ui
 lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/randomnumbergenerator.ui
+lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/recalcquerydialog.ui
 lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/regressiondialog.ui
 lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/retypepassdialog.ui
 lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/retypepassworddialog.ui
@@ -1398,6 +1404,7 @@ lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/selectsource.ui
 lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/sharedfooterdialog.ui
 lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/sharedheaderdialog.ui
 lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/sharedocumentdlg.ui
+lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/sharedwarningdialog.ui
 lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/sheetprintpage.ui
 lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/showchangesdialog.ui
 lib/libreoffice/share/config/soffice.cfg/modules/scalc/ui/showdetaildialog.ui
@@ -1513,6 +1520,7 @@ lib/libreoffice/share/config/soffice.cfg/modules/sdraw/popupmenu/line.xml
 lib/libreoffice/share/config/soffice.cfg/modules/sdraw/popupmenu/measure.xml
 lib/libreoffice/share/config/soffice.cfg/modules/sdraw/popupmenu/media.xml
 lib/libreoffice/share/config/soffice.cfg/modules/sdraw/popupmenu/multiselect.xml
+lib/libreoffice/share/config/soffice.cfg/modules/sdraw/popupmenu/notebookbar.xml
 lib/libreoffice/share/config/soffice.cfg/modules/sdraw/popupmenu/oleobject.xml
 lib/libreoffice/share/config/soffice.cfg/modules/sdraw/popupmenu/outlinetext.xml
 lib/libreoffice/share/config/soffice.cfg/modules/sdraw/popupmenu/page.xml
@@ -1586,9 +1594,11 @@ lib/libreoffice/share/config/soffice.cfg/modules/sdraw/ui/drawprtldialog.ui
 lib/libreoffice/share/config/soffice.cfg/modules/sdraw/ui/insertlayer.ui
 lib/libreoffice/share/config/soffice.cfg/modules/sdraw/ui/insertslidesdialog.ui
 lib/libreoffice/share/config/soffice.cfg/modules/sdraw/ui/namedesign.ui
+lib/libreoffice/share/config/soffice.cfg/modules/sdraw/ui/notebookbar.ui
+lib/libreoffice/share/config/soffice.cfg/modules/sdraw/ui/notebookbar_groupedbar_compact.ui
+lib/libreoffice/share/config/soffice.cfg/modules/sdraw/ui/notebookbar_groupedbar_full.ui
 lib/libreoffice/share/config/soffice.cfg/modules/sdraw/ui/paranumberingtab.ui
 lib/libreoffice/share/config/soffice.cfg/modules/sdraw/ui/queryunlinkimagedialog.ui
-lib/libreoffice/share/config/soffice.cfg/modules/sdraw/ui/tabledesigndialog.ui
 lib/libreoffice/share/config/soffice.cfg/modules/sdraw/ui/vectorize.ui
 lib/libreoffice/share/config/soffice.cfg/modules/sglobal/
 lib/libreoffice/share/config/soffice.cfg/modules/sglobal/menubar/
@@ -2073,13 +2083,13 @@ lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/attachnamedialog.ui
 lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/authenticationsettingsdialog.ui
 lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/autoformattable.ui
 lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/autotext.ui
+lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/bibliofragment.ui
 lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/bibliographyentry.ui
 lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/bulletsandnumbering.ui
 lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/businessdatapage.ui
 lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/cannotsavelabeldialog.ui
 lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/captiondialog.ui
 lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/captionoptions.ui
-lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/cardformatpage.ui
 lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/cardmediumpage.ui
 lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/ccdialog.ui
 lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/characterproperties.ui
@@ -2207,6 +2217,7 @@ lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/privateuserpage.ui
 lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/querycontinuebegindialog.ui
 lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/querycontinueenddialog.ui
 lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/querydefaultcompatdialog.ui
+lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/queryredlinedialog.ui
 lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/queryrotateintostandarddialog.ui
 lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/querysavelabeldialog.ui
 lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/queryshowchangesdialog.ui
@@ -2217,6 +2228,7 @@ lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/renameobjectdialog.u
 lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/rowheight.ui
 lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/saveashtmldialog.ui
 lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/savelabeldialog.ui
+lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/savemonitordialog.ui
 lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/sectionpage.ui
 lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/selectaddressdialog.ui
 lib/libreoffice/share/config/soffice.cfg/modules/swriter/ui/selectautotextdialog.ui
@@ -2323,6 +2335,7 @@ lib/libreoffice/share/config/soffice.cfg/sfx/ui/alienwarndialog.ui
 lib/libreoffice/share/config/soffice.cfg/sfx/ui/bookmarkdialog.ui
 lib/libreoffice/share/config/soffice.cfg/sfx/ui/bookmarkmenu.ui
 lib/libreoffice/share/config/soffice.cfg/sfx/ui/charmapcontrol.ui
+lib/libreoffice/share/config/soffice.cfg/sfx/ui/charviewmenu.ui
 lib/libreoffice/share/config/soffice.cfg/sfx/ui/checkin.ui
 lib/libreoffice/share/config/soffice.cfg/sfx/ui/cmisinfopage.ui
 lib/libreoffice/share/config/soffice.cfg/sfx/ui/cmisline.ui
@@ -2377,6 +2390,7 @@ lib/libreoffice/share/config/soffice.cfg/svt/ui/
 lib/libreoffice/share/config/soffice.cfg/svt/ui/addresstemplatedialog.ui
 lib/libreoffice/share/config/soffice.cfg/svt/ui/fileviewmenu.ui
 lib/libreoffice/share/config/soffice.cfg/svt/ui/graphicexport.ui
+lib/libreoffice/share/config/soffice.cfg/svt/ui/inputbox.ui
 lib/libreoffice/share/config/soffice.cfg/svt/ui/javadisableddialog.ui
 lib/libreoffice/share/config/soffice.cfg/svt/ui/placeedit.ui
 lib/libreoffice/share/config/soffice.cfg/svt/ui/printersetupdialog.ui
@@ -2394,6 +2408,7 @@ lib/libreoffice/share/config/soffice.cfg/svx/ui/addnamespacedialog.ui
 lib/libreoffice/share/config/soffice.cfg/svx/ui/addsubmissiondialog.ui
 lib/libreoffice/share/config/soffice.cfg/svx/ui/asianphoneticguidedialog.ui
 lib/libreoffice/share/config/soffice.cfg/svx/ui/cellmenu.ui
+lib/libreoffice/share/config/soffice.cfg/svx/ui/charsetmenu.ui
 lib/libreoffice/share/config/soffice.cfg/svx/ui/chineseconversiondialog.ui
 lib/libreoffice/share/config/soffice.cfg/svx/ui/chinesedictionary.ui
 lib/libreoffice/share/config/soffice.cfg/svx/ui/classificationdialog.ui
@@ -2434,6 +2449,7 @@ lib/libreoffice/share/config/soffice.cfg/svx/ui/imapmenu.ui
 lib/libreoffice/share/config/soffice.cfg/svx/ui/linkwarndialog.ui
 lib/libreoffice/share/config/soffice.cfg/svx/ui/mediaplayback.ui
 lib/libreoffice/share/config/soffice.cfg/svx/ui/namespacedialog.ui
+lib/libreoffice/share/config/soffice.cfg/svx/ui/oldcolorwindow.ui
 lib/libreoffice/share/config/soffice.cfg/svx/ui/optgridpage.ui
 lib/libreoffice/share/config/soffice.cfg/svx/ui/paralinespacingcontrol.ui
 lib/libreoffice/share/config/soffice.cfg/svx/ui/paralrspacing.ui
@@ -2588,6 +2604,7 @@ lib/libreoffice/share/emojiconfig/
 lib/libreoffice/share/emojiconfig/emoji.json
 lib/libreoffice/share/extensions/
 lib/libreoffice/share/extensions/dict-en/
+lib/libreoffice/share/extensions/dict-en/English.png
 lib/libreoffice/share/extensions/dict-en/Lightproof.components
 lib/libreoffice/share/extensions/dict-en/Lightproof.py
 lib/libreoffice/share/extensions/dict-en/Linguistic.xcu
@@ -2627,6 +2644,7 @@ lib/libreoffice/share/extensions/dict-en/en_ZA.dic
 lib/libreoffice/share/extensions/dict-en/hyph_en_GB.dic
 lib/libreoffice/share/extensions/dict-en/hyph_en_US.dic
 lib/libreoffice/share/extensions/dict-en/license.txt
+lib/libreoffice/share/extensions/dict-en/package-description.txt
 lib/libreoffice/share/extensions/dict-en/pythonpath/
 lib/libreoffice/share/extensions/dict-en/pythonpath/lightproof_en.py
 lib/libreoffice/share/extensions/dict-en/pythonpath/lightproof_handler_en.py
@@ -2851,6 +2869,11 @@ lib/libreoffice/share/fonts/
 lib/libreoffice/share/fonts/truetype/
 lib/libreoffice/share/fonts/truetype/Alef-Bold.ttf
 lib/libreoffice/share/fonts/truetype/Alef-Regular.ttf
+lib/libreoffice/share/fonts/truetype/Amiri-Bold.ttf
+lib/libreoffice/share/fonts/truetype/Amiri-BoldSlanted.ttf
+lib/libreoffice/share/fonts/truetype/Amiri-Regular.ttf
+lib/libreoffice/share/fonts/truetype/Amiri-Slanted.ttf
+lib/libreoffice/share/fonts/truetype/AmiriQuran.ttf
 lib/libreoffice/share/fonts/truetype/Caladea-Bold.ttf
 lib/libreoffice/share/fonts/truetype/Caladea-BoldItalic.ttf
 lib/libreoffice/share/fonts/truetype/Caladea-Italic.ttf
@@ -3023,11 +3046,6 @@ lib/libreoffice/share/fonts/truetype/SourceSansPro-LightIt.ttf
 lib/libreoffice/share/fonts/truetype/SourceSansPro-Regular.ttf
 lib/libreoffice/share/fonts/truetype/SourceSansPro-Semibold.ttf
 lib/libreoffice/share/fonts/truetype/SourceSansPro-SemiboldIt.ttf
-lib/libreoffice/share/fonts/truetype/amiri-bold.ttf
-lib/libreoffice/share/fonts/truetype/amiri-boldslanted.ttf
-lib/libreoffice/share/fonts/truetype/amiri-quran.ttf
-lib/libreoffice/share/fonts/truetype/amiri-regular.ttf
-lib/libreoffice/share/fonts/truetype/amiri-slanted.ttf
 lib/libreoffice/share/fonts/truetype/fc_local.conf
 lib/libreoffice/share/fonts/truetype/opens___.ttf
 lib/libreoffice/share/gallery/
@@ -3544,9 +3562,6 @@ lib/libreoffice/share/gallery/sg1.thm
 lib/libreoffice/share/gallery/sg24.sdg
 lib/libreoffice/share/gallery/sg24.sdv
 lib/libreoffice/share/gallery/sg24.thm
-lib/libreoffice/share/gallery/sg3.sdg
-lib/libreoffice/share/gallery/sg3.sdv
-lib/libreoffice/share/gallery/sg3.thm
 lib/libreoffice/share/gallery/sg36.sdg
 lib/libreoffice/share/gallery/sg36.sdv
 lib/libreoffice/share/gallery/sg36.thm
@@ -3751,69 +3766,6 @@ lib/libreoffice/share/gallery/txtshapes/Square06-Striped-Blue.svg
 lib/libreoffice/share/gallery/txtshapes/Square07-Striped-Green.svg
 lib/libreoffice/share/gallery/txtshapes/Square08-Striped-Red.svg
 lib/libreoffice/share/gallery/txtshapes/Square09-Striped-Orange.svg
-lib/libreoffice/share/gallery/www-back/
-lib/libreoffice/share/gallery/www-back/aqua.jpg
-lib/libreoffice/share/gallery/www-back/bathroom.jpg
-lib/libreoffice/share/gallery/www-back/blocks.jpg
-lib/libreoffice/share/gallery/www-back/blow_green.jpg
-lib/libreoffice/share/gallery/www-back/blueblop.jpg
-lib/libreoffice/share/gallery/www-back/bulging.jpg
-lib/libreoffice/share/gallery/www-back/canvas_blue.jpg
-lib/libreoffice/share/gallery/www-back/cheese.jpg
-lib/libreoffice/share/gallery/www-back/chocolate.jpg
-lib/libreoffice/share/gallery/www-back/citrus.jpg
-lib/libreoffice/share/gallery/www-back/confetti.jpg
-lib/libreoffice/share/gallery/www-back/daisy.jpg
-lib/libreoffice/share/gallery/www-back/fluffy-grey.jpg
-lib/libreoffice/share/gallery/www-back/fluffy.jpg
-lib/libreoffice/share/gallery/www-back/fuzzy-blue.jpg
-lib/libreoffice/share/gallery/www-back/fuzzy-darkgrey.jpg
-lib/libreoffice/share/gallery/www-back/fuzzy-grey.jpg
-lib/libreoffice/share/gallery/www-back/fuzzy-lightgrey.jpg
-lib/libreoffice/share/gallery/www-back/fuzzy_light.jpg
-lib/libreoffice/share/gallery/www-back/gregre.gif
-lib/libreoffice/share/gallery/www-back/grey.gif
-lib/libreoffice/share/gallery/www-back/grypaws.gif
-lib/libreoffice/share/gallery/www-back/ice-blue.jpg
-lib/libreoffice/share/gallery/www-back/ice-light.jpg
-lib/libreoffice/share/gallery/www-back/imitation_leather.jpg
-lib/libreoffice/share/gallery/www-back/interstices.jpg
-lib/libreoffice/share/gallery/www-back/jeans.jpg
-lib/libreoffice/share/gallery/www-back/jeansblk.jpg
-lib/libreoffice/share/gallery/www-back/lawn-artificial.jpg
-lib/libreoffice/share/gallery/www-back/lawn.jpg
-lib/libreoffice/share/gallery/www-back/lightblue-wet.jpg
-lib/libreoffice/share/gallery/www-back/linen-fine.jpg
-lib/libreoffice/share/gallery/www-back/lino-green.jpg
-lib/libreoffice/share/gallery/www-back/liquid-blue.jpg
-lib/libreoffice/share/gallery/www-back/marble.jpg
-lib/libreoffice/share/gallery/www-back/marble_dark.jpg
-lib/libreoffice/share/gallery/www-back/mazes.jpg
-lib/libreoffice/share/gallery/www-back/mint.gif
-lib/libreoffice/share/gallery/www-back/notes.gif
-lib/libreoffice/share/gallery/www-back/pattern.jpg
-lib/libreoffice/share/gallery/www-back/pebble-light.jpg
-lib/libreoffice/share/gallery/www-back/pink.gif
-lib/libreoffice/share/gallery/www-back/pool.jpg
-lib/libreoffice/share/gallery/www-back/popcorn.jpg
-lib/libreoffice/share/gallery/www-back/purple.jpg
-lib/libreoffice/share/gallery/www-back/reddark.jpg
-lib/libreoffice/share/gallery/www-back/rings-green.jpg
-lib/libreoffice/share/gallery/www-back/rings-orange.jpg
-lib/libreoffice/share/gallery/www-back/roses.jpg
-lib/libreoffice/share/gallery/www-back/sand-light.jpg
-lib/libreoffice/share/gallery/www-back/sand.jpg
-lib/libreoffice/share/gallery/www-back/sky.jpg
-lib/libreoffice/share/gallery/www-back/soft-structure_grey.jpg
-lib/libreoffice/share/gallery/www-back/space.jpg
-lib/libreoffice/share/gallery/www-back/stone-dark.jpg
-lib/libreoffice/share/gallery/www-back/stone.jpg
-lib/libreoffice/share/gallery/www-back/structure.jpg
-lib/libreoffice/share/gallery/www-back/structure_darkgreen.gif
-lib/libreoffice/share/gallery/www-back/structure_green.jpg
-lib/libreoffice/share/gallery/www-back/wall-grey.jpg
-lib/libreoffice/share/gallery/www-back/wet-turquoise.jpg
-lib/libreoffice/share/gallery/www-back/wood.jpg
 lib/libreoffice/share/gallery/www-graf/
 lib/libreoffice/share/gallery/www-graf/bluat.gif
 lib/libreoffice/share/gallery/www-graf/bluback.gif
@@ -4033,7 +3985,7 @@ lib/libreoffice/share/template/common/wizard/agenda/9colorful.ott
 lib/libreoffice/share/template/common/wizard/agenda/aw-10grey.ott
 lib/libreoffice/share/template/common/wizard/agenda/aw-1simple.ott
 lib/libreoffice/share/template/common/wizard/agenda/aw-2elegant.ott
-lib/libreoffice/share/template/common/wizard/agenda/aw${MODPY_BIN_SUFFIX}modern.ott
+lib/libreoffice/share/template/common/wizard/agenda/aw-3modern.ott
 lib/libreoffice/share/template/common/wizard/agenda/aw-4classic.ott
 lib/libreoffice/share/template/common/wizard/agenda/aw-5blue.ott
 lib/libreoffice/share/template/common/wizard/agenda/aw-6orange.ott
@@ -4116,10 +4068,10 @@ lib/libreoffice/share/template/wizard/bitmap/Import_3.bmp
 lib/libreoffice/share/template/wizard/bitmap/Import_4.bmp
 lib/libreoffice/share/template/wizard/bitmap/MS-Import_2-1.bmp
 lib/libreoffice/share/template/wizard/bitmap/MS-Import_2-2.bmp
-lib/libreoffice/share/template/wizard/bitmap/MS-Import_2${MODPY_BIN_SUFFIX}.bmp
+lib/libreoffice/share/template/wizard/bitmap/MS-Import_2-3.bmp
 lib/libreoffice/share/template/wizard/bitmap/XML-Import_2-1.bmp
 lib/libreoffice/share/template/wizard/bitmap/XML-Import_2-2.bmp
-lib/libreoffice/share/template/wizard/bitmap/XML-Import_2${MODPY_BIN_SUFFIX}.bmp
+lib/libreoffice/share/template/wizard/bitmap/XML-Import_2-3.bmp
 lib/libreoffice/share/template/wizard/bitmap/XML-Import_2-4.bmp
 lib/libreoffice/share/template/wizard/bitmap/cancel_down.bmp
 lib/libreoffice/share/template/wizard/bitmap/cancel_up.bmp
@@ -4156,7 +4108,6 @@ lib/libreoffice/share/xdg/calc.desktop
 lib/libreoffice/share/xdg/draw.desktop
 lib/libreoffice/share/xdg/impress.desktop
 lib/libreoffice/share/xdg/math.desktop
-lib/libreoffice/share/xdg/qstart.desktop
 lib/libreoffice/share/xdg/startcenter.desktop
 lib/libreoffice/share/xdg/writer.desktop
 lib/libreoffice/share/xdg/xsltfilter.desktop
@@ -4233,198 +4184,532 @@ lib/libreoffice/share/xslt/import/wordml/wordml2ooo_props.xsl
 lib/libreoffice/share/xslt/import/wordml/wordml2ooo_settings.xsl
 lib/libreoffice/share/xslt/import/wordml/wordml2ooo_table.xsl
 lib/libreoffice/share/xslt/import/wordml/wordml2ooo_text.xsl
+man/ja_JP.EUC/cat3f/
+man/ja_JP.EUC/man3f/
+man/ja_JP.EUC/man3p/
 share/applications/calc.desktop
 share/applications/draw.desktop
 share/applications/impress.desktop
 share/applications/math.desktop
-share/applications/qstart.desktop
 share/applications/startcenter.desktop
 share/applications/writer.desktop
 share/icons/hicolor/1024x1024/
 share/icons/hicolor/1024x1024/apps/
+share/icons/hicolor/1024x1024/apps/libreoffice-base.png
+share/icons/hicolor/1024x1024/apps/libreoffice-base.svg
+share/icons/hicolor/1024x1024/apps/libreoffice-calc.png
+share/icons/hicolor/1024x1024/apps/libreoffice-calc.svg
+share/icons/hicolor/1024x1024/apps/libreoffice-draw.png
+share/icons/hicolor/1024x1024/apps/libreoffice-draw.svg
+share/icons/hicolor/1024x1024/apps/libreoffice-impress.png
+share/icons/hicolor/1024x1024/apps/libreoffice-impress.svg
 share/icons/hicolor/1024x1024/apps/libreoffice-main.png
+share/icons/hicolor/1024x1024/apps/libreoffice-main.svg
+share/icons/hicolor/1024x1024/apps/libreoffice-math.png
+share/icons/hicolor/1024x1024/apps/libreoffice-math.svg
+share/icons/hicolor/1024x1024/apps/libreoffice-startcenter.png
+share/icons/hicolor/1024x1024/apps/libreoffice-startcenter.svg
+share/icons/hicolor/1024x1024/apps/libreoffice-writer.png
+share/icons/hicolor/1024x1024/apps/libreoffice-writer.svg
 share/icons/hicolor/1024x1024/mimetypes/
 share/icons/hicolor/1024x1024/mimetypes/oasis-database.png
+share/icons/hicolor/1024x1024/mimetypes/oasis-database.svg
 share/icons/hicolor/1024x1024/mimetypes/oasis-drawing-template.png
+share/icons/hicolor/1024x1024/mimetypes/oasis-drawing-template.svg
 share/icons/hicolor/1024x1024/mimetypes/oasis-drawing.png
+share/icons/hicolor/1024x1024/mimetypes/oasis-drawing.svg
+share/icons/hicolor/1024x1024/mimetypes/oasis-empty.png
+share/icons/hicolor/1024x1024/mimetypes/oasis-empty.svg
 share/icons/hicolor/1024x1024/mimetypes/oasis-formula.png
+share/icons/hicolor/1024x1024/mimetypes/oasis-formula.svg
 share/icons/hicolor/1024x1024/mimetypes/oasis-master-document.png
+share/icons/hicolor/1024x1024/mimetypes/oasis-master-document.svg
 share/icons/hicolor/1024x1024/mimetypes/oasis-presentation-template.png
+share/icons/hicolor/1024x1024/mimetypes/oasis-presentation-template.svg
 share/icons/hicolor/1024x1024/mimetypes/oasis-presentation.png
+share/icons/hicolor/1024x1024/mimetypes/oasis-presentation.svg
 share/icons/hicolor/1024x1024/mimetypes/oasis-spreadsheet-template.png
+share/icons/hicolor/1024x1024/mimetypes/oasis-spreadsheet-template.svg
 share/icons/hicolor/1024x1024/mimetypes/oasis-spreadsheet.png
+share/icons/hicolor/1024x1024/mimetypes/oasis-spreadsheet.svg
 share/icons/hicolor/1024x1024/mimetypes/oasis-text-template.png
+share/icons/hicolor/1024x1024/mimetypes/oasis-text-template.svg
 share/icons/hicolor/1024x1024/mimetypes/oasis-text.png
+share/icons/hicolor/1024x1024/mimetypes/oasis-text.svg
 share/icons/hicolor/1024x1024/mimetypes/oasis-web-template.png
+share/icons/hicolor/1024x1024/mimetypes/oasis-web-template.svg
+share/icons/hicolor/1024x1024/mimetypes/oasis-web.png
+share/icons/hicolor/1024x1024/mimetypes/oasis-web.svg
 share/icons/hicolor/128x128/apps/libreoffice-base.png
+share/icons/hicolor/128x128/apps/libreoffice-base.svg
 share/icons/hicolor/128x128/apps/libreoffice-calc.png
+share/icons/hicolor/128x128/apps/libreoffice-calc.svg
+share/icons/hicolor/128x128/apps/libreoffice-chart.png
+share/icons/hicolor/128x128/apps/libreoffice-chart.svg
 share/icons/hicolor/128x128/apps/libreoffice-draw.png
+share/icons/hicolor/128x128/apps/libreoffice-draw.svg
 share/icons/hicolor/128x128/apps/libreoffice-impress.png
+share/icons/hicolor/128x128/apps/libreoffice-impress.svg
 share/icons/hicolor/128x128/apps/libreoffice-main.png
+share/icons/hicolor/128x128/apps/libreoffice-main.svg
 share/icons/hicolor/128x128/apps/libreoffice-math.png
+share/icons/hicolor/128x128/apps/libreoffice-math.svg
 share/icons/hicolor/128x128/apps/libreoffice-startcenter.png
+share/icons/hicolor/128x128/apps/libreoffice-startcenter.svg
 share/icons/hicolor/128x128/apps/libreoffice-writer.png
+share/icons/hicolor/128x128/apps/libreoffice-writer.svg
 share/icons/hicolor/128x128/mimetypes/oasis-database.png
+share/icons/hicolor/128x128/mimetypes/oasis-database.svg
 share/icons/hicolor/128x128/mimetypes/oasis-drawing-template.png
+share/icons/hicolor/128x128/mimetypes/oasis-drawing-template.svg
 share/icons/hicolor/128x128/mimetypes/oasis-drawing.png
+share/icons/hicolor/128x128/mimetypes/oasis-drawing.svg
+share/icons/hicolor/128x128/mimetypes/oasis-empty.png
+share/icons/hicolor/128x128/mimetypes/oasis-empty.svg
 share/icons/hicolor/128x128/mimetypes/oasis-formula.png
+share/icons/hicolor/128x128/mimetypes/oasis-formula.svg
 share/icons/hicolor/128x128/mimetypes/oasis-master-document.png
+share/icons/hicolor/128x128/mimetypes/oasis-master-document.svg
 share/icons/hicolor/128x128/mimetypes/oasis-presentation-template.png
+share/icons/hicolor/128x128/mimetypes/oasis-presentation-template.svg
 share/icons/hicolor/128x128/mimetypes/oasis-presentation.png
+share/icons/hicolor/128x128/mimetypes/oasis-presentation.svg
 share/icons/hicolor/128x128/mimetypes/oasis-spreadsheet-template.png
+share/icons/hicolor/128x128/mimetypes/oasis-spreadsheet-template.svg
 share/icons/hicolor/128x128/mimetypes/oasis-spreadsheet.png
+share/icons/hicolor/128x128/mimetypes/oasis-spreadsheet.svg
 share/icons/hicolor/128x128/mimetypes/oasis-text-template.png
+share/icons/hicolor/128x128/mimetypes/oasis-text-template.svg
 share/icons/hicolor/128x128/mimetypes/oasis-text.png
+share/icons/hicolor/128x128/mimetypes/oasis-text.svg
 share/icons/hicolor/128x128/mimetypes/oasis-web-template.png
+share/icons/hicolor/128x128/mimetypes/oasis-web-template.svg
+share/icons/hicolor/128x128/mimetypes/oasis-web.png
+share/icons/hicolor/128x128/mimetypes/oasis-web.svg
 share/icons/hicolor/16x16/apps/libreoffice-base.png
+share/icons/hicolor/16x16/apps/libreoffice-base.svg
 share/icons/hicolor/16x16/apps/libreoffice-calc.png
+share/icons/hicolor/16x16/apps/libreoffice-calc.svg
+share/icons/hicolor/16x16/apps/libreoffice-chart.png
+share/icons/hicolor/16x16/apps/libreoffice-chart.svg
 share/icons/hicolor/16x16/apps/libreoffice-draw.png
+share/icons/hicolor/16x16/apps/libreoffice-draw.svg
 share/icons/hicolor/16x16/apps/libreoffice-impress.png
+share/icons/hicolor/16x16/apps/libreoffice-impress.svg
 share/icons/hicolor/16x16/apps/libreoffice-main.png
+share/icons/hicolor/16x16/apps/libreoffice-main.svg
 share/icons/hicolor/16x16/apps/libreoffice-math.png
+share/icons/hicolor/16x16/apps/libreoffice-math.svg
 share/icons/hicolor/16x16/apps/libreoffice-startcenter.png
+share/icons/hicolor/16x16/apps/libreoffice-startcenter.svg
 share/icons/hicolor/16x16/apps/libreoffice-writer.png
-share/icons/hicolor/16x16/mimetypes/database.png
-share/icons/hicolor/16x16/mimetypes/drawing-template.png
-share/icons/hicolor/16x16/mimetypes/drawing.png
+share/icons/hicolor/16x16/apps/libreoffice-writer.svg
 share/icons/hicolor/16x16/mimetypes/extension.png
-share/icons/hicolor/16x16/mimetypes/formula.png
-share/icons/hicolor/16x16/mimetypes/master-document.png
+share/icons/hicolor/16x16/mimetypes/extension.svg
 share/icons/hicolor/16x16/mimetypes/oasis-database.png
+share/icons/hicolor/16x16/mimetypes/oasis-database.svg
 share/icons/hicolor/16x16/mimetypes/oasis-drawing-template.png
+share/icons/hicolor/16x16/mimetypes/oasis-drawing-template.svg
 share/icons/hicolor/16x16/mimetypes/oasis-drawing.png
+share/icons/hicolor/16x16/mimetypes/oasis-drawing.svg
+share/icons/hicolor/16x16/mimetypes/oasis-empty.png
+share/icons/hicolor/16x16/mimetypes/oasis-empty.svg
 share/icons/hicolor/16x16/mimetypes/oasis-formula.png
+share/icons/hicolor/16x16/mimetypes/oasis-formula.svg
 share/icons/hicolor/16x16/mimetypes/oasis-master-document.png
+share/icons/hicolor/16x16/mimetypes/oasis-master-document.svg
 share/icons/hicolor/16x16/mimetypes/oasis-presentation-template.png
+share/icons/hicolor/16x16/mimetypes/oasis-presentation-template.svg
 share/icons/hicolor/16x16/mimetypes/oasis-presentation.png
+share/icons/hicolor/16x16/mimetypes/oasis-presentation.svg
 share/icons/hicolor/16x16/mimetypes/oasis-spreadsheet-template.png
+share/icons/hicolor/16x16/mimetypes/oasis-spreadsheet-template.svg
 share/icons/hicolor/16x16/mimetypes/oasis-spreadsheet.png
+share/icons/hicolor/16x16/mimetypes/oasis-spreadsheet.svg
 share/icons/hicolor/16x16/mimetypes/oasis-text-template.png
+share/icons/hicolor/16x16/mimetypes/oasis-text-template.svg
 share/icons/hicolor/16x16/mimetypes/oasis-text.png
+share/icons/hicolor/16x16/mimetypes/oasis-text.svg
 share/icons/hicolor/16x16/mimetypes/oasis-web-template.png
+share/icons/hicolor/16x16/mimetypes/oasis-web-template.svg
+share/icons/hicolor/16x16/mimetypes/oasis-web.png
+share/icons/hicolor/16x16/mimetypes/oasis-web.svg
 share/icons/hicolor/16x16/mimetypes/presentation-template.png
+share/icons/hicolor/16x16/mimetypes/presentation-template.svg
 share/icons/hicolor/16x16/mimetypes/presentation.png
+share/icons/hicolor/16x16/mimetypes/presentation.svg
 share/icons/hicolor/16x16/mimetypes/spreadsheet-template.png
+share/icons/hicolor/16x16/mimetypes/spreadsheet-template.svg
 share/icons/hicolor/16x16/mimetypes/spreadsheet.png
+share/icons/hicolor/16x16/mimetypes/spreadsheet.svg
 share/icons/hicolor/16x16/mimetypes/text-template.png
+share/icons/hicolor/16x16/mimetypes/text-template.svg
 share/icons/hicolor/16x16/mimetypes/text.png
+share/icons/hicolor/16x16/mimetypes/text.svg
+share/icons/hicolor/22x22/apps/libreoffice-base.png
+share/icons/hicolor/22x22/apps/libreoffice-base.svg
+share/icons/hicolor/22x22/apps/libreoffice-calc.png
+share/icons/hicolor/22x22/apps/libreoffice-calc.svg
+share/icons/hicolor/22x22/apps/libreoffice-draw.png
+share/icons/hicolor/22x22/apps/libreoffice-draw.svg
+share/icons/hicolor/22x22/apps/libreoffice-impress.png
+share/icons/hicolor/22x22/apps/libreoffice-impress.svg
+share/icons/hicolor/22x22/apps/libreoffice-main.png
+share/icons/hicolor/22x22/apps/libreoffice-main.svg
+share/icons/hicolor/22x22/apps/libreoffice-math.png
+share/icons/hicolor/22x22/apps/libreoffice-math.svg
+share/icons/hicolor/22x22/apps/libreoffice-startcenter.png
+share/icons/hicolor/22x22/apps/libreoffice-startcenter.svg
+share/icons/hicolor/22x22/apps/libreoffice-writer.png
+share/icons/hicolor/22x22/apps/libreoffice-writer.svg
+share/icons/hicolor/22x22/mimetypes/oasis-database.png
+share/icons/hicolor/22x22/mimetypes/oasis-database.svg
+share/icons/hicolor/22x22/mimetypes/oasis-drawing-template.png
+share/icons/hicolor/22x22/mimetypes/oasis-drawing-template.svg
+share/icons/hicolor/22x22/mimetypes/oasis-drawing.png
+share/icons/hicolor/22x22/mimetypes/oasis-drawing.svg
+share/icons/hicolor/22x22/mimetypes/oasis-empty.png
+share/icons/hicolor/22x22/mimetypes/oasis-empty.svg
+share/icons/hicolor/22x22/mimetypes/oasis-formula.png
+share/icons/hicolor/22x22/mimetypes/oasis-formula.svg
+share/icons/hicolor/22x22/mimetypes/oasis-master-document.png
+share/icons/hicolor/22x22/mimetypes/oasis-master-document.svg
+share/icons/hicolor/22x22/mimetypes/oasis-presentation-template.png
+share/icons/hicolor/22x22/mimetypes/oasis-presentation-template.svg
+share/icons/hicolor/22x22/mimetypes/oasis-presentation.png
+share/icons/hicolor/22x22/mimetypes/oasis-presentation.svg
+share/icons/hicolor/22x22/mimetypes/oasis-spreadsheet-template.png
+share/icons/hicolor/22x22/mimetypes/oasis-spreadsheet-template.svg
+share/icons/hicolor/22x22/mimetypes/oasis-spreadsheet.png
+share/icons/hicolor/22x22/mimetypes/oasis-spreadsheet.svg
+share/icons/hicolor/22x22/mimetypes/oasis-text-template.png
+share/icons/hicolor/22x22/mimetypes/oasis-text-template.svg
+share/icons/hicolor/22x22/mimetypes/oasis-text.png
+share/icons/hicolor/22x22/mimetypes/oasis-text.svg
+share/icons/hicolor/22x22/mimetypes/oasis-web-template.png
+share/icons/hicolor/22x22/mimetypes/oasis-web-template.svg
+share/icons/hicolor/22x22/mimetypes/oasis-web.png
+share/icons/hicolor/22x22/mimetypes/oasis-web.svg
+share/icons/hicolor/24x24/apps/libreoffice-base.png
+share/icons/hicolor/24x24/apps/libreoffice-base.svg
+share/icons/hicolor/24x24/apps/libreoffice-calc.png
+share/icons/hicolor/24x24/apps/libreoffice-calc.svg
+share/icons/hicolor/24x24/apps/libreoffice-draw.png
+share/icons/hicolor/24x24/apps/libreoffice-draw.svg
+share/icons/hicolor/24x24/apps/libreoffice-impress.png
+share/icons/hicolor/24x24/apps/libreoffice-impress.svg
+share/icons/hicolor/24x24/apps/libreoffice-main.png
+share/icons/hicolor/24x24/apps/libreoffice-main.svg
+share/icons/hicolor/24x24/apps/libreoffice-math.png
+share/icons/hicolor/24x24/apps/libreoffice-math.svg
+share/icons/hicolor/24x24/apps/libreoffice-startcenter.png
+share/icons/hicolor/24x24/apps/libreoffice-startcenter.svg
+share/icons/hicolor/24x24/apps/libreoffice-writer.png
+share/icons/hicolor/24x24/apps/libreoffice-writer.svg
+share/icons/hicolor/24x24/mimetypes/oasis-database.png
+share/icons/hicolor/24x24/mimetypes/oasis-database.svg
+share/icons/hicolor/24x24/mimetypes/oasis-drawing-template.png
+share/icons/hicolor/24x24/mimetypes/oasis-drawing-template.svg
+share/icons/hicolor/24x24/mimetypes/oasis-drawing.png
+share/icons/hicolor/24x24/mimetypes/oasis-drawing.svg
+share/icons/hicolor/24x24/mimetypes/oasis-empty.png
+share/icons/hicolor/24x24/mimetypes/oasis-empty.svg
+share/icons/hicolor/24x24/mimetypes/oasis-formula.png
+share/icons/hicolor/24x24/mimetypes/oasis-formula.svg
+share/icons/hicolor/24x24/mimetypes/oasis-master-document.png
+share/icons/hicolor/24x24/mimetypes/oasis-master-document.svg
+share/icons/hicolor/24x24/mimetypes/oasis-presentation-template.png
+share/icons/hicolor/24x24/mimetypes/oasis-presentation-template.svg
+share/icons/hicolor/24x24/mimetypes/oasis-presentation.png
+share/icons/hicolor/24x24/mimetypes/oasis-presentation.svg
+share/icons/hicolor/24x24/mimetypes/oasis-spreadsheet-template.png
+share/icons/hicolor/24x24/mimetypes/oasis-spreadsheet-template.svg
+share/icons/hicolor/24x24/mimetypes/oasis-spreadsheet.png
+share/icons/hicolor/24x24/mimetypes/oasis-spreadsheet.svg
+share/icons/hicolor/24x24/mimetypes/oasis-text-template.png
+share/icons/hicolor/24x24/mimetypes/oasis-text-template.svg
+share/icons/hicolor/24x24/mimetypes/oasis-text.png
+share/icons/hicolor/24x24/mimetypes/oasis-text.svg
+share/icons/hicolor/24x24/mimetypes/oasis-web-template.png
+share/icons/hicolor/24x24/mimetypes/oasis-web-template.svg
+share/icons/hicolor/24x24/mimetypes/oasis-web.png
+share/icons/hicolor/24x24/mimetypes/oasis-web.svg
 share/icons/hicolor/256x256/apps/libreoffice-base.png
+share/icons/hicolor/256x256/apps/libreoffice-base.svg
 share/icons/hicolor/256x256/apps/libreoffice-calc.png
+share/icons/hicolor/256x256/apps/libreoffice-calc.svg
+share/icons/hicolor/256x256/apps/libreoffice-chart.png
+share/icons/hicolor/256x256/apps/libreoffice-chart.svg
 share/icons/hicolor/256x256/apps/libreoffice-draw.png
+share/icons/hicolor/256x256/apps/libreoffice-draw.svg
 share/icons/hicolor/256x256/apps/libreoffice-impress.png
+share/icons/hicolor/256x256/apps/libreoffice-impress.svg
 share/icons/hicolor/256x256/apps/libreoffice-main.png
+share/icons/hicolor/256x256/apps/libreoffice-main.svg
 share/icons/hicolor/256x256/apps/libreoffice-math.png
+share/icons/hicolor/256x256/apps/libreoffice-math.svg
 share/icons/hicolor/256x256/apps/libreoffice-startcenter.png
+share/icons/hicolor/256x256/apps/libreoffice-startcenter.svg
 share/icons/hicolor/256x256/apps/libreoffice-writer.png
+share/icons/hicolor/256x256/apps/libreoffice-writer.svg
 share/icons/hicolor/256x256/mimetypes/oasis-database.png
+share/icons/hicolor/256x256/mimetypes/oasis-database.svg
 share/icons/hicolor/256x256/mimetypes/oasis-drawing-template.png
+share/icons/hicolor/256x256/mimetypes/oasis-drawing-template.svg
 share/icons/hicolor/256x256/mimetypes/oasis-drawing.png
+share/icons/hicolor/256x256/mimetypes/oasis-drawing.svg
+share/icons/hicolor/256x256/mimetypes/oasis-empty.png
+share/icons/hicolor/256x256/mimetypes/oasis-empty.svg
 share/icons/hicolor/256x256/mimetypes/oasis-formula.png
+share/icons/hicolor/256x256/mimetypes/oasis-formula.svg
 share/icons/hicolor/256x256/mimetypes/oasis-master-document.png
+share/icons/hicolor/256x256/mimetypes/oasis-master-document.svg
 share/icons/hicolor/256x256/mimetypes/oasis-presentation-template.png
+share/icons/hicolor/256x256/mimetypes/oasis-presentation-template.svg
 share/icons/hicolor/256x256/mimetypes/oasis-presentation.png
+share/icons/hicolor/256x256/mimetypes/oasis-presentation.svg
 share/icons/hicolor/256x256/mimetypes/oasis-spreadsheet-template.png
+share/icons/hicolor/256x256/mimetypes/oasis-spreadsheet-template.svg
 share/icons/hicolor/256x256/mimetypes/oasis-spreadsheet.png
+share/icons/hicolor/256x256/mimetypes/oasis-spreadsheet.svg
 share/icons/hicolor/256x256/mimetypes/oasis-text-template.png
+share/icons/hicolor/256x256/mimetypes/oasis-text-template.svg
 share/icons/hicolor/256x256/mimetypes/oasis-text.png
+share/icons/hicolor/256x256/mimetypes/oasis-text.svg
 share/icons/hicolor/256x256/mimetypes/oasis-web-template.png
+share/icons/hicolor/256x256/mimetypes/oasis-web-template.svg
+share/icons/hicolor/256x256/mimetypes/oasis-web.png
+share/icons/hicolor/256x256/mimetypes/oasis-web.svg
 share/icons/hicolor/32x32/apps/libreoffice-base.png
+share/icons/hicolor/32x32/apps/libreoffice-base.svg
 share/icons/hicolor/32x32/apps/libreoffice-calc.png
+share/icons/hicolor/32x32/apps/libreoffice-calc.svg
+share/icons/hicolor/32x32/apps/libreoffice-chart.png
+share/icons/hicolor/32x32/apps/libreoffice-chart.svg
 share/icons/hicolor/32x32/apps/libreoffice-draw.png
+share/icons/hicolor/32x32/apps/libreoffice-draw.svg
 share/icons/hicolor/32x32/apps/libreoffice-impress.png
+share/icons/hicolor/32x32/apps/libreoffice-impress.svg
 share/icons/hicolor/32x32/apps/libreoffice-main.png
+share/icons/hicolor/32x32/apps/libreoffice-main.svg
 share/icons/hicolor/32x32/apps/libreoffice-math.png
+share/icons/hicolor/32x32/apps/libreoffice-math.svg
 share/icons/hicolor/32x32/apps/libreoffice-startcenter.png
+share/icons/hicolor/32x32/apps/libreoffice-startcenter.svg
 share/icons/hicolor/32x32/apps/libreoffice-writer.png
-share/icons/hicolor/32x32/mimetypes/database.png
-share/icons/hicolor/32x32/mimetypes/drawing-template.png
-share/icons/hicolor/32x32/mimetypes/drawing.png
+share/icons/hicolor/32x32/apps/libreoffice-writer.svg
 share/icons/hicolor/32x32/mimetypes/extension.png
-share/icons/hicolor/32x32/mimetypes/formula.png
-share/icons/hicolor/32x32/mimetypes/master-document.png
+share/icons/hicolor/32x32/mimetypes/extension.svg
+share/icons/hicolor/32x32/mimetypes/math.png
+share/icons/hicolor/32x32/mimetypes/math.svg
 share/icons/hicolor/32x32/mimetypes/oasis-database.png
+share/icons/hicolor/32x32/mimetypes/oasis-database.svg
 share/icons/hicolor/32x32/mimetypes/oasis-drawing-template.png
+share/icons/hicolor/32x32/mimetypes/oasis-drawing-template.svg
 share/icons/hicolor/32x32/mimetypes/oasis-drawing.png
+share/icons/hicolor/32x32/mimetypes/oasis-drawing.svg
+share/icons/hicolor/32x32/mimetypes/oasis-empty.png
+share/icons/hicolor/32x32/mimetypes/oasis-empty.svg
 share/icons/hicolor/32x32/mimetypes/oasis-formula.png
+share/icons/hicolor/32x32/mimetypes/oasis-formula.svg
 share/icons/hicolor/32x32/mimetypes/oasis-master-document.png
+share/icons/hicolor/32x32/mimetypes/oasis-master-document.svg
 share/icons/hicolor/32x32/mimetypes/oasis-presentation-template.png
+share/icons/hicolor/32x32/mimetypes/oasis-presentation-template.svg
 share/icons/hicolor/32x32/mimetypes/oasis-presentation.png
+share/icons/hicolor/32x32/mimetypes/oasis-presentation.svg
 share/icons/hicolor/32x32/mimetypes/oasis-spreadsheet-template.png
+share/icons/hicolor/32x32/mimetypes/oasis-spreadsheet-template.svg
 share/icons/hicolor/32x32/mimetypes/oasis-spreadsheet.png
+share/icons/hicolor/32x32/mimetypes/oasis-spreadsheet.svg
 share/icons/hicolor/32x32/mimetypes/oasis-text-template.png
+share/icons/hicolor/32x32/mimetypes/oasis-text-template.svg
 share/icons/hicolor/32x32/mimetypes/oasis-text.png
+share/icons/hicolor/32x32/mimetypes/oasis-text.svg
 share/icons/hicolor/32x32/mimetypes/oasis-web-template.png
+share/icons/hicolor/32x32/mimetypes/oasis-web-template.svg
+share/icons/hicolor/32x32/mimetypes/oasis-web.png
+share/icons/hicolor/32x32/mimetypes/oasis-web.svg
 share/icons/hicolor/32x32/mimetypes/presentation-template.png
+share/icons/hicolor/32x32/mimetypes/presentation-template.svg
 share/icons/hicolor/32x32/mimetypes/presentation.png
+share/icons/hicolor/32x32/mimetypes/presentation.svg
 share/icons/hicolor/32x32/mimetypes/spreadsheet-template.png
+share/icons/hicolor/32x32/mimetypes/spreadsheet-template.svg
 share/icons/hicolor/32x32/mimetypes/spreadsheet.png
+share/icons/hicolor/32x32/mimetypes/spreadsheet.svg
 share/icons/hicolor/32x32/mimetypes/text-template.png
+share/icons/hicolor/32x32/mimetypes/text-template.svg
 share/icons/hicolor/32x32/mimetypes/text.png
+share/icons/hicolor/32x32/mimetypes/text.svg
 share/icons/hicolor/48x48/apps/libreoffice-base.png
+share/icons/hicolor/48x48/apps/libreoffice-base.svg
 share/icons/hicolor/48x48/apps/libreoffice-calc.png
+share/icons/hicolor/48x48/apps/libreoffice-calc.svg
+share/icons/hicolor/48x48/apps/libreoffice-chart.png
+share/icons/hicolor/48x48/apps/libreoffice-chart.svg
 share/icons/hicolor/48x48/apps/libreoffice-draw.png
+share/icons/hicolor/48x48/apps/libreoffice-draw.svg
 share/icons/hicolor/48x48/apps/libreoffice-impress.png
+share/icons/hicolor/48x48/apps/libreoffice-impress.svg
 share/icons/hicolor/48x48/apps/libreoffice-main.png
+share/icons/hicolor/48x48/apps/libreoffice-main.svg
 share/icons/hicolor/48x48/apps/libreoffice-math.png
+share/icons/hicolor/48x48/apps/libreoffice-math.svg
 share/icons/hicolor/48x48/apps/libreoffice-startcenter.png
+share/icons/hicolor/48x48/apps/libreoffice-startcenter.svg
 share/icons/hicolor/48x48/apps/libreoffice-writer.png
-share/icons/hicolor/48x48/mimetypes/database.png
-share/icons/hicolor/48x48/mimetypes/drawing-template.png
-share/icons/hicolor/48x48/mimetypes/drawing.png
+share/icons/hicolor/48x48/apps/libreoffice-writer.svg
 share/icons/hicolor/48x48/mimetypes/extension.png
-share/icons/hicolor/48x48/mimetypes/formula.png
-share/icons/hicolor/48x48/mimetypes/master-document.png
+share/icons/hicolor/48x48/mimetypes/extension.svg
 share/icons/hicolor/48x48/mimetypes/oasis-database.png
+share/icons/hicolor/48x48/mimetypes/oasis-database.svg
 share/icons/hicolor/48x48/mimetypes/oasis-drawing-template.png
+share/icons/hicolor/48x48/mimetypes/oasis-drawing-template.svg
 share/icons/hicolor/48x48/mimetypes/oasis-drawing.png
+share/icons/hicolor/48x48/mimetypes/oasis-drawing.svg
+share/icons/hicolor/48x48/mimetypes/oasis-empty.png
+share/icons/hicolor/48x48/mimetypes/oasis-empty.svg
 share/icons/hicolor/48x48/mimetypes/oasis-formula.png
+share/icons/hicolor/48x48/mimetypes/oasis-formula.svg
 share/icons/hicolor/48x48/mimetypes/oasis-master-document.png
+share/icons/hicolor/48x48/mimetypes/oasis-master-document.svg
 share/icons/hicolor/48x48/mimetypes/oasis-presentation-template.png
+share/icons/hicolor/48x48/mimetypes/oasis-presentation-template.svg
 share/icons/hicolor/48x48/mimetypes/oasis-presentation.png
+share/icons/hicolor/48x48/mimetypes/oasis-presentation.svg
 share/icons/hicolor/48x48/mimetypes/oasis-spreadsheet-template.png
+share/icons/hicolor/48x48/mimetypes/oasis-spreadsheet-template.svg
 share/icons/hicolor/48x48/mimetypes/oasis-spreadsheet.png
+share/icons/hicolor/48x48/mimetypes/oasis-spreadsheet.svg
 share/icons/hicolor/48x48/mimetypes/oasis-text-template.png
+share/icons/hicolor/48x48/mimetypes/oasis-text-template.svg
 share/icons/hicolor/48x48/mimetypes/oasis-text.png
+share/icons/hicolor/48x48/mimetypes/oasis-text.svg
 share/icons/hicolor/48x48/mimetypes/oasis-web-template.png
+share/icons/hicolor/48x48/mimetypes/oasis-web-template.svg
+share/icons/hicolor/48x48/mimetypes/oasis-web.png
+share/icons/hicolor/48x48/mimetypes/oasis-web.svg
 share/icons/hicolor/48x48/mimetypes/presentation-template.png
+share/icons/hicolor/48x48/mimetypes/presentation-template.svg
 share/icons/hicolor/48x48/mimetypes/presentation.png
+share/icons/hicolor/48x48/mimetypes/presentation.svg
 share/icons/hicolor/48x48/mimetypes/spreadsheet-template.png
+share/icons/hicolor/48x48/mimetypes/spreadsheet-template.svg
 share/icons/hicolor/48x48/mimetypes/spreadsheet.png
+share/icons/hicolor/48x48/mimetypes/spreadsheet.svg
 share/icons/hicolor/48x48/mimetypes/text-template.png
+share/icons/hicolor/48x48/mimetypes/text-template.svg
 share/icons/hicolor/48x48/mimetypes/text.png
+share/icons/hicolor/48x48/mimetypes/text.svg
+share/icons/hicolor/512x512/apps/libreoffice-base.png
+share/icons/hicolor/512x512/apps/libreoffice-base.svg
+share/icons/hicolor/512x512/apps/libreoffice-calc.png
+share/icons/hicolor/512x512/apps/libreoffice-calc.svg
+share/icons/hicolor/512x512/apps/libreoffice-draw.png
+share/icons/hicolor/512x512/apps/libreoffice-draw.svg
+share/icons/hicolor/512x512/apps/libreoffice-impress.png
+share/icons/hicolor/512x512/apps/libreoffice-impress.svg
 share/icons/hicolor/512x512/apps/libreoffice-main.png
+share/icons/hicolor/512x512/apps/libreoffice-main.svg
+share/icons/hicolor/512x512/apps/libreoffice-math.png
+share/icons/hicolor/512x512/apps/libreoffice-math.svg
+share/icons/hicolor/512x512/apps/libreoffice-startcenter.png
+share/icons/hicolor/512x512/apps/libreoffice-startcenter.svg
+share/icons/hicolor/512x512/apps/libreoffice-writer.png
+share/icons/hicolor/512x512/apps/libreoffice-writer.svg
 share/icons/hicolor/512x512/mimetypes/oasis-database.png
+share/icons/hicolor/512x512/mimetypes/oasis-database.svg
 share/icons/hicolor/512x512/mimetypes/oasis-drawing-template.png
+share/icons/hicolor/512x512/mimetypes/oasis-drawing-template.svg
 share/icons/hicolor/512x512/mimetypes/oasis-drawing.png
+share/icons/hicolor/512x512/mimetypes/oasis-drawing.svg
+share/icons/hicolor/512x512/mimetypes/oasis-empty.png
+share/icons/hicolor/512x512/mimetypes/oasis-empty.svg
 share/icons/hicolor/512x512/mimetypes/oasis-formula.png
+share/icons/hicolor/512x512/mimetypes/oasis-formula.svg
 share/icons/hicolor/512x512/mimetypes/oasis-master-document.png
+share/icons/hicolor/512x512/mimetypes/oasis-master-document.svg
 share/icons/hicolor/512x512/mimetypes/oasis-presentation-template.png
+share/icons/hicolor/512x512/mimetypes/oasis-presentation-template.svg
 share/icons/hicolor/512x512/mimetypes/oasis-presentation.png
+share/icons/hicolor/512x512/mimetypes/oasis-presentation.svg
 share/icons/hicolor/512x512/mimetypes/oasis-spreadsheet-template.png
+share/icons/hicolor/512x512/mimetypes/oasis-spreadsheet-template.svg
 share/icons/hicolor/512x512/mimetypes/oasis-spreadsheet.png
+share/icons/hicolor/512x512/mimetypes/oasis-spreadsheet.svg
 share/icons/hicolor/512x512/mimetypes/oasis-text-template.png
+share/icons/hicolor/512x512/mimetypes/oasis-text-template.svg
 share/icons/hicolor/512x512/mimetypes/oasis-text.png
+share/icons/hicolor/512x512/mimetypes/oasis-text.svg
 share/icons/hicolor/512x512/mimetypes/oasis-web-template.png
+share/icons/hicolor/512x512/mimetypes/oasis-web-template.svg
+share/icons/hicolor/512x512/mimetypes/oasis-web.png
+share/icons/hicolor/512x512/mimetypes/oasis-web.svg
+share/icons/hicolor/64x64/apps/libreoffice-base.png
+share/icons/hicolor/64x64/apps/libreoffice-base.svg
+share/icons/hicolor/64x64/apps/libreoffice-calc.png
+share/icons/hicolor/64x64/apps/libreoffice-calc.svg
+share/icons/hicolor/64x64/apps/libreoffice-draw.png
+share/icons/hicolor/64x64/apps/libreoffice-draw.svg
+share/icons/hicolor/64x64/apps/libreoffice-impress.png
+share/icons/hicolor/64x64/apps/libreoffice-impress.svg
+share/icons/hicolor/64x64/apps/libreoffice-main.png
+share/icons/hicolor/64x64/apps/libreoffice-main.svg
+share/icons/hicolor/64x64/apps/libreoffice-math.png
+share/icons/hicolor/64x64/apps/libreoffice-math.svg
+share/icons/hicolor/64x64/apps/libreoffice-startcenter.png
+share/icons/hicolor/64x64/apps/libreoffice-startcenter.svg
+share/icons/hicolor/64x64/apps/libreoffice-writer.png
+share/icons/hicolor/64x64/apps/libreoffice-writer.svg
+share/icons/hicolor/64x64/mimetypes/oasis-database.png
+share/icons/hicolor/64x64/mimetypes/oasis-database.svg
+share/icons/hicolor/64x64/mimetypes/oasis-drawing-template.png
+share/icons/hicolor/64x64/mimetypes/oasis-drawing-template.svg
+share/icons/hicolor/64x64/mimetypes/oasis-drawing.png
+share/icons/hicolor/64x64/mimetypes/oasis-drawing.svg
+share/icons/hicolor/64x64/mimetypes/oasis-empty.png
+share/icons/hicolor/64x64/mimetypes/oasis-empty.svg
+share/icons/hicolor/64x64/mimetypes/oasis-formula.png
+share/icons/hicolor/64x64/mimetypes/oasis-formula.svg
+share/icons/hicolor/64x64/mimetypes/oasis-master-document.png
+share/icons/hicolor/64x64/mimetypes/oasis-master-document.svg
+share/icons/hicolor/64x64/mimetypes/oasis-presentation-template.png
+share/icons/hicolor/64x64/mimetypes/oasis-presentation-template.svg
+share/icons/hicolor/64x64/mimetypes/oasis-presentation.png
+share/icons/hicolor/64x64/mimetypes/oasis-presentation.svg
+share/icons/hicolor/64x64/mimetypes/oasis-spreadsheet-template.png
+share/icons/hicolor/64x64/mimetypes/oasis-spreadsheet-template.svg
+share/icons/hicolor/64x64/mimetypes/oasis-spreadsheet.png
+share/icons/hicolor/64x64/mimetypes/oasis-spreadsheet.svg
+share/icons/hicolor/64x64/mimetypes/oasis-text-template.png
+share/icons/hicolor/64x64/mimetypes/oasis-text-template.svg
+share/icons/hicolor/64x64/mimetypes/oasis-text.png
+share/icons/hicolor/64x64/mimetypes/oasis-text.svg
+share/icons/hicolor/64x64/mimetypes/oasis-web-template.png
+share/icons/hicolor/64x64/mimetypes/oasis-web-template.svg
+share/icons/hicolor/64x64/mimetypes/oasis-web.png
+share/icons/hicolor/64x64/mimetypes/oasis-web.svg
 share/icons/hicolor/scalable/apps/libreoffice-base.svg
+share/icons/hicolor/scalable/apps/libreoffice-basic.svg
 share/icons/hicolor/scalable/apps/libreoffice-calc.svg
+share/icons/hicolor/scalable/apps/libreoffice-chart.svg
 share/icons/hicolor/scalable/apps/libreoffice-draw.svg
+share/icons/hicolor/scalable/apps/libreoffice-extension.svg
 share/icons/hicolor/scalable/apps/libreoffice-impress.svg
 share/icons/hicolor/scalable/apps/libreoffice-main.svg
 share/icons/hicolor/scalable/apps/libreoffice-math.svg
 share/icons/hicolor/scalable/apps/libreoffice-startcenter.svg
 share/icons/hicolor/scalable/apps/libreoffice-writer.svg
 share/icons/hicolor/scalable/mimetypes/oasis-database.svg
-share/icons/hicolor/scalable/mimetypes/oasis-drawing-template.svg
-share/icons/hicolor/scalable/mimetypes/oasis-drawing.svg
+share/icons/hicolor/scalable/mimetypes/oasis-draw.svg
+share/icons/hicolor/scalable/mimetypes/oasis-empty.svg
 share/icons/hicolor/scalable/mimetypes/oasis-formula.svg
 share/icons/hicolor/scalable/mimetypes/oasis-master-document.svg
-share/icons/hicolor/scalable/mimetypes/oasis-presentation-template.svg
 share/icons/hicolor/scalable/mimetypes/oasis-presentation.svg
-share/icons/hicolor/scalable/mimetypes/oasis-spreadsheet-template.svg
 share/icons/hicolor/scalable/mimetypes/oasis-spreadsheet.svg
-share/icons/hicolor/scalable/mimetypes/oasis-text-template.svg
 share/icons/hicolor/scalable/mimetypes/oasis-text.svg
-share/icons/hicolor/scalable/mimetypes/oasis-web-template.svg
+share/icons/hicolor/scalable/mimetypes/oasis-web.svg
 share/mime/packages/openoffice.org.xml
 @tag update-mime-database
 @tag gtk-update-icon-cache %D/share/icons/hicolor