extra/libreoffice-fresh to 24.2.0-1

2024-11-18 22:54:00 +00:00 · 2024-02-02 00:40:56 +00:00 · 2024-02-02 00:40:56 +00:00 · 9d30280c56
commit 9d30280c56
parent 6ecb758a0d
3 changed files with 313 additions and 619 deletions
--- a/extra/libreoffice-fresh/.SRCINFO
+++ b/extra/libreoffice-fresh/.SRCINFO
@ -1,9 +1,10 @@
 pkgbase = libreoffice-fresh
-	pkgver = 7.6.4
-	pkgrel = 2
+	pkgver = 24.2.0
+	pkgrel = 1
 	url = https://www.libreoffice.org/
 	arch = x86_64
-	license = LGPL3
+	license = MPL-2.0
+	license = LGPL-3.0-or-later
 	makedepends = curl>=7.20.0
 	makedepends = hunspell>=1.2.8
 	makedepends = python
@ -53,7 +54,7 @@ pkgbase = libreoffice-fresh
 	makedepends = junit
 	makedepends = libmythes
 	makedepends = libwpg
-	makedepends = java-environment=11
+	makedepends = java-environment=17
 	makedepends = postgresql-libs
 	makedepends = mariadb-libs
 	makedepends = libgl
@ -103,24 +104,25 @@ pkgbase = libreoffice-fresh
 	noextract = 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 	noextract = d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
 	noextract = ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-	noextract = pdfium-5778.tar.bz2
+	noextract = pdfium-6179.tar.bz2
 	noextract = dtoa-20180411.tgz
 	noextract = lxml-4.1.1.tgz
 	noextract = Firebird-3.0.7.33374-0.tar.bz2
-	noextract = skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz
+	noextract = skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz
 	noextract = dragonbox-1.1.3.tar.gz
 	noextract = frozen-1.1.1.tar.gz
+	noextract = zxcvbn-c-2.5.tar.gz
+	noextract = Java-WebSocket-1.5.4.tar.gz
 	noextract = 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
 	noextract = odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar
 	noextract = f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
-	noextract = 185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	options = !lto
-	source = https://download.documentfoundation.org/libreoffice/src/7.6.4/libreoffice-7.6.4.1.tar.xz
-	source = https://download.documentfoundation.org/libreoffice/src/7.6.4/libreoffice-7.6.4.1.tar.xz.asc
-	source = https://download.documentfoundation.org/libreoffice/src/7.6.4/libreoffice-help-7.6.4.1.tar.xz
-	source = https://download.documentfoundation.org/libreoffice/src/7.6.4/libreoffice-help-7.6.4.1.tar.xz.asc
-	source = https://download.documentfoundation.org/libreoffice/src/7.6.4/libreoffice-translations-7.6.4.1.tar.xz
-	source = https://download.documentfoundation.org/libreoffice/src/7.6.4/libreoffice-translations-7.6.4.1.tar.xz.asc
+	source = https://download.documentfoundation.org/libreoffice/src/24.2.0/libreoffice-24.2.0.3.tar.xz
+	source = https://download.documentfoundation.org/libreoffice/src/24.2.0/libreoffice-24.2.0.3.tar.xz.asc
+	source = https://download.documentfoundation.org/libreoffice/src/24.2.0/libreoffice-help-24.2.0.3.tar.xz
+	source = https://download.documentfoundation.org/libreoffice/src/24.2.0/libreoffice-help-24.2.0.3.tar.xz.asc
+	source = https://download.documentfoundation.org/libreoffice/src/24.2.0/libreoffice-translations-24.2.0.3.tar.xz
+	source = https://download.documentfoundation.org/libreoffice/src/24.2.0/libreoffice-translations-24.2.0.3.tar.xz.asc
 	source = https://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 	source = https://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 	source = https://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
@ -129,30 +131,30 @@ pkgbase = libreoffice-fresh
 	source = https://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 	source = https://dev-www.libreoffice.org/src/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
 	source = https://dev-www.libreoffice.org/src/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-	source = https://dev-www.libreoffice.org/src/pdfium-5778.tar.bz2
+	source = https://dev-www.libreoffice.org/src/pdfium-6179.tar.bz2
 	source = https://dev-www.libreoffice.org/src/dtoa-20180411.tgz
 	source = https://dev-www.libreoffice.org/src/lxml-4.1.1.tgz
 	source = https://dev-www.libreoffice.org/src/Firebird-3.0.7.33374-0.tar.bz2
-	source = https://dev-www.libreoffice.org/src/skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz
+	source = https://dev-www.libreoffice.org/src/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz
 	source = https://dev-www.libreoffice.org/src/dragonbox-1.1.3.tar.gz
 	source = https://dev-www.libreoffice.org/src/frozen-1.1.1.tar.gz
+	source = https://dev-www.libreoffice.org/src/zxcvbn-c-2.5.tar.gz
+	source = https://dev-www.libreoffice.org/src/Java-WebSocket-1.5.4.tar.gz
 	source = https://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
 	source = https://dev-www.libreoffice.org/extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar
 	source = https://dev-www.libreoffice.org/extern/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
-	source = https://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	source = make-pyuno-work-with-system-wide-module-install.diff
 	source = 623ea5c.diff
-	source = fix-build-against-system-libxml-2.12.diff
 	source = libreoffice-7.5.8.2-icu-74-compatibility.patch
 	source = soffice-template.desktop.in
 	source = libreoffice-fresh.sh
 	source = libreoffice-fresh.csh
 	validpgpkeys = C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3
-	sha256sums = 13fea7b8f24c776313b9e08628aa590390bea45064be73bc70ee7b1b70aa6a1e
+	sha256sums = 18f456917aa207f3bf4f4c013c392261a7d374075fb2fe246a2cfe58b3483568
 	sha256sums = SKIP
-	sha256sums = ed784c014096e0e7ff86294eba624bd92ecbe5be881b01950eecd69aed7d8678
+	sha256sums = 5c3542d8fa67eabebee758b608742838ced3182cf1851cfa4d636add8a8e428e
 	sha256sums = SKIP
-	sha256sums = 3a5a0dbe40abdc55cdd9994895f6577d7e547d26a36b20641f32f3640a3b7679
+	sha256sums = 7c69fcb6e6ea0878a016bb0e6061caa2ff40825bd14b054ffebe7c6a4390d264
 	sha256sums = SKIP
 	sha256sums = 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1
 	sha256sums = 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
@ -162,20 +164,20 @@ pkgbase = libreoffice-fresh
 	sha256sums = d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
 	sha256sums = 1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133
 	sha256sums = 233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd
-	sha256sums = b1052ff24e9ffb11af017c444bb0f6ad508d64c9a0fb88cacb0e8210245dde06
+	sha256sums = 4d3f08fe0e2fda86246832085426616826dcca0912202874428bfbc24d13d95c
 	sha256sums = 0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4
 	sha256sums = 940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e
 	sha256sums = acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76
-	sha256sums = 0d08a99ed46cde43b5ad2672b5d8770c8eb85d0d26cb8f1f85fd9befe1e9ceb9
+	sha256sums = 2223ebce534458a37826e8fe4f24635b0712cde7ed1bd3208f089f6fdd796e01
 	sha256sums = 09d63b05e9c594ec423778ab59b7a5aa1d76fdd71d25c7048b0258c4ec9c3384
 	sha256sums = f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45
+	sha256sums = 77d6c6ecb35952a8d8ce7f736b7a2bf466275c48210e309b73782d6b7e84dffd
+	sha256sums = a6828b35d1f938fee2335945f3d3c563cbbfa58ce7eb0bf72778d0fa7a550720
 	sha256sums = f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770
 	sha256sums = 984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504
 	sha256sums = f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140
-	sha256sums = eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6
 	sha256sums = c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563
 	sha256sums = 440c9af5f3d1213d8ed7177282380f25cbc981cabc8b590dcb777aaae84178e5
-	sha256sums = 793a52abff29b3db51a1db9686b561911b9b3de70bd6dd02bbc1d78fcd960648
 	sha256sums = d7b952a51e1e40d3faf2f465b68f46d56828d8c46948748fa82fe82a29af2599
 	sha256sums = d0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879
 	sha256sums = b43ed267643fc5ced803dca010427b12b1f10db485173ccb19efb3395e60c82e
@ -272,7 +274,7 @@ pkgname = libreoffice-fresh
 	depends = libxext
 	depends = openjpeg2
 	optdepends = java-runtime:     adds java support
-	optdepends = java-environment: required by extension-wiki-publisher and extension-nlpsolver
+	optdepends = java-environment>=17: required by extension-wiki-publisher and extension-nlpsolver
 	optdepends = pstoedit:         translates PostScript and PDF graphics into other vector formats
 	optdepends = libmythes:        for use in thesaurus
 	optdepends = beanshell:       interactive java -- good for prototyping/macros
@ -283,7 +285,7 @@ pkgname = libreoffice-fresh
 	optdepends = libpaper:         takes care of papersize
 	optdepends = postgresql-libs:  for postgresql-connector
 	optdepends = mariadb-libs:     for mysql-connector
-	optdepends = coin-or-mp:	   required by the Calc solver
+	optdepends = coin-or-mp:       required by the Calc solver
 	optdepends = gtk3:             for GTK3 integration
 	optdepends = gtk4:             for GTK4 integration (experimental)
 	optdepends = kio5:             for KF5 KDE desktop integration
--- a/extra/libreoffice-fresh/PKGBUILD
+++ b/extra/libreoffice-fresh/PKGBUILD
@ -17,60 +17,61 @@ _google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4

 pkgbase=libreoffice-fresh
 pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
-_LOver=7.6.4.1
-pkgver=7.6.4
-pkgrel=2
+_LOver=24.2.0.3
+pkgver=24.2.0
+pkgrel=1
 arch=('x86_64')
-license=('LGPL3')
+license=('MPL-2.0' 'LGPL-3.0-or-later')
 url="https://www.libreoffice.org/"
 makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python' 'libwpd>=0.9.2' 'libwps'
-	'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib'
-	'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' 'icu' 'libxslt' 
-	'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr'
-	'libmspub' 'harfbuzz-icu' 'nss' 'hicolor-icon-theme'
-	'gst-plugins-base-libs'	'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'ant'
-	'gperf' 'gtk3' 'gtk4' 'qt5-base' 'plasma-framework5' 'qt6-base' 'cppunit' 'beanshell' 'clucene'
-	'junit' 'libmythes' 'libwpg'  'java-environment=11' 'postgresql-libs' 'mariadb-libs' 'libgl'
-	'bluez-libs' 'gdb' 'doxygen'  'libatomic_ops'  'mdds'
-	'ttf-liberation' 'ttf-dejavu' 'ttf-carlito' 'libxinerama' 'libpagemaker' 'glm'
-	'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'liblangtag' 'liborcus' 
-	'libexttextcat' 'gobject-introspection' 'libcmis' # 'libfbclient'
-	'libtommath' 'libzmf' 'xmlsec' 'rxvt-unicode' 'gpgme' 'libwebp'
-	'libepubgen' 'libfreehand' 'libqxp' 'libstaroffice'  'boost' 'libnumbertext'
-	'abseil-cpp' 'clang' 'zxing-cpp'
-	'libffi' 'box2d' 'git'
+    'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib'
+    'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' 'icu' 'libxslt'
+    'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr'
+    'libmspub' 'harfbuzz-icu' 'nss' 'hicolor-icon-theme'
+    'gst-plugins-base-libs' 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'ant'
+    'gperf' 'gtk3' 'gtk4' 'qt5-base' 'plasma-framework5' 'qt6-base' 'cppunit' 'beanshell' 'clucene'
+    'junit' 'libmythes' 'libwpg'  'java-environment=17' 'postgresql-libs' 'mariadb-libs' 'libgl'
+    'bluez-libs' 'gdb' 'doxygen'  'libatomic_ops'  'mdds'
+    'ttf-liberation' 'ttf-dejavu' 'ttf-carlito' 'libxinerama' 'libpagemaker' 'glm'
+    'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'liblangtag' 'liborcus'
+    'libexttextcat' 'gobject-introspection' 'libcmis' # 'libfbclient'
+    'libtommath' 'libzmf' 'xmlsec' 'rxvt-unicode' 'gpgme' 'libwebp'
+    'libepubgen' 'libfreehand' 'libqxp' 'libstaroffice'  'boost' 'libnumbertext'
+    'abseil-cpp' 'clang' 'zxing-cpp'
+    'libffi' 'box2d' 'git'
 )
-options=('!lto')
+options=('!lto') # using --enable-lto (for parallel link-time optimization)
 _mirror="https://ftp.osuosl.org/pub/tdf/libreoffice/src/${pkgver}"
+#_mirror="https://download.documentfoundation.org/libreoffice/src/${pkgver}"
 #_mirror="https://dev-builds.libreoffice.org/pre-releases/src"
 _additional_source_url="https://dev-www.libreoffice.org/src"
 _additional_source_url2="https://dev-www.libreoffice.org/extern"
 source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
-	${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-	${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip # keep old bundled version, new system version ftbs
-	${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-	${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
-	${_additional_source_url}/language-subtag-registry-2021-03-05.tar.bz2
-	${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
-	${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
-	${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-	${_additional_source_url}/pdfium-5778.tar.bz2
-	${_additional_source_url}/dtoa-20180411.tgz
-	${_additional_source_url}/lxml-4.1.1.tgz
-	${_additional_source_url}/Firebird-3.0.7.33374-0.tar.bz2
-	${_additional_source_url}/skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz
-        ${_additional_source_url}/dragonbox-1.1.3.tar.gz
-        ${_additional_source_url}/frozen-1.1.1.tar.gz
-	${_additional_source_url2}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar  # for test suite
-	${_additional_source_url2}/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar # for test suite
-	${_additional_source_url2}/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
-	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	make-pyuno-work-with-system-wide-module-install.diff
-        623ea5c.diff
-        fix-build-against-system-libxml-2.12.diff
-        libreoffice-7.5.8.2-icu-74-compatibility.patch
-	soffice-template.desktop.in 
-	libreoffice-fresh.sh libreoffice-fresh.csh)
+    ${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
+    ${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip # keep old bundled version, new system version ftbs
+    ${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
+    ${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
+    ${_additional_source_url}/language-subtag-registry-2021-03-05.tar.bz2
+    ${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
+    ${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+    ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+    ${_additional_source_url}/pdfium-6179.tar.bz2
+    ${_additional_source_url}/dtoa-20180411.tgz
+    ${_additional_source_url}/lxml-4.1.1.tgz
+    ${_additional_source_url}/Firebird-3.0.7.33374-0.tar.bz2
+    ${_additional_source_url}/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz
+    ${_additional_source_url}/dragonbox-1.1.3.tar.gz
+    ${_additional_source_url}/frozen-1.1.1.tar.gz
+    ${_additional_source_url}/zxcvbn-c-2.5.tar.gz
+    ${_additional_source_url}/Java-WebSocket-1.5.4.tar.gz
+    ${_additional_source_url2}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar  # for test suite
+    ${_additional_source_url2}/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar # for test suite
+    ${_additional_source_url2}/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
+    make-pyuno-work-with-system-wide-module-install.diff
+    623ea5c.diff
+    libreoffice-7.5.8.2-icu-74-compatibility.patch
+    soffice-template.desktop.in 
+    libreoffice-fresh.sh libreoffice-fresh.csh)
 noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
           798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
           a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
@ -79,24 +80,25 @@ noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
           17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
           d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
           ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-           pdfium-5778.tar.bz2
+           pdfium-6179.tar.bz2
           dtoa-20180411.tgz
           lxml-4.1.1.tgz
           Firebird-3.0.7.33374-0.tar.bz2
-           skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz
+           skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz
           dragonbox-1.1.3.tar.gz
           frozen-1.1.1.tar.gz
+           zxcvbn-c-2.5.tar.gz
+           Java-WebSocket-1.5.4.tar.gz
           8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar  # for test suite
           odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar  # for test suite
           f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
-           185d60944ea767075d27247c3162b3bc-unowinreg.dll
 )
 validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build@documentfoundation.org>
-sha256sums=('13fea7b8f24c776313b9e08628aa590390bea45064be73bc70ee7b1b70aa6a1e'
+sha256sums=('18f456917aa207f3bf4f4c013c392261a7d374075fb2fe246a2cfe58b3483568'
            'SKIP'
-            'ed784c014096e0e7ff86294eba624bd92ecbe5be881b01950eecd69aed7d8678'
+            '5c3542d8fa67eabebee758b608742838ced3182cf1851cfa4d636add8a8e428e'
            'SKIP'
-            '3a5a0dbe40abdc55cdd9994895f6577d7e547d26a36b20641f32f3640a3b7679'
+            '7c69fcb6e6ea0878a016bb0e6061caa2ff40825bd14b054ffebe7c6a4390d264'
            'SKIP'
            '64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1'
            '1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753'
@ -106,20 +108,20 @@ sha256sums=('13fea7b8f24c776313b9e08628aa590390bea45064be73bc70ee7b1b70aa6a1e'
            'd30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370'
            '1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133'
            '233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd'
-            'b1052ff24e9ffb11af017c444bb0f6ad508d64c9a0fb88cacb0e8210245dde06'
+            '4d3f08fe0e2fda86246832085426616826dcca0912202874428bfbc24d13d95c'
            '0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4'
            '940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e'
            'acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76'
-            '0d08a99ed46cde43b5ad2672b5d8770c8eb85d0d26cb8f1f85fd9befe1e9ceb9'
+            '2223ebce534458a37826e8fe4f24635b0712cde7ed1bd3208f089f6fdd796e01'
            '09d63b05e9c594ec423778ab59b7a5aa1d76fdd71d25c7048b0258c4ec9c3384'
            'f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45'
+            '77d6c6ecb35952a8d8ce7f736b7a2bf466275c48210e309b73782d6b7e84dffd'
+            'a6828b35d1f938fee2335945f3d3c563cbbfa58ce7eb0bf72778d0fa7a550720'
            'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770'
            '984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504'
            'f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140'
-            'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6'
            'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563'
            '440c9af5f3d1213d8ed7177282380f25cbc981cabc8b590dcb777aaae84178e5'
-            '793a52abff29b3db51a1db9686b561911b9b3de70bd6dd02bbc1d78fcd960648'
            'd7b952a51e1e40d3faf2f465b68f46d56828d8c46948748fa82fe82a29af2599'
            'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879'
            'b43ed267643fc5ced803dca010427b12b1f10db485173ccb19efb3395e60c82e'
@ -127,271 +129,264 @@ sha256sums=('13fea7b8f24c776313b9e08628aa590390bea45064be73bc70ee7b1b70aa6a1e'

 prepare() {

-	cd libreoffice-$_LOver
+    cd libreoffice-$_LOver

-	# move external sources into place
-	mkdir "${srcdir}"/ext_sources && pushd "${srcdir}"/ext_sources
-	for source in "${noextract[@]}"; do
-		ln -s "${srcdir}"/$source .
-	done
-	popd
-	
-	# unowinreg.dll must be a file not a symlink or the result will become a broken symlink
-	# /usr/share/libreoffice/sdk/classes/win/unowinreg.dll -> /build/libreoffice/src/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	rm "${srcdir}"/ext_sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	cp -f "${srcdir}"/185d60944ea767075d27247c3162b3bc-unowinreg.dll "${srcdir}"/ext_sources
+    # move external sources into place
+    mkdir "${srcdir}"/ext_sources && pushd "${srcdir}"/ext_sources
+    for source in "${noextract[@]}"; do
+    ln -s "${srcdir}"/$source .
+    done
+    popd

-        # fix not upstreamable pyuno paths - FS#54250
-        patch -Np1 -i "${srcdir}"/make-pyuno-work-with-system-wide-module-install.diff
+# should be obsolete - Debian has dropped this long time ago
+    # fix not upstreamable pyuno paths - FS#54250
+#    patch -Np1 -i "${srcdir}"/make-pyuno-work-with-system-wide-module-install.diff

-        # fix build - https://gerrit.libreoffice.org/c/core/+/145421
-        patch -Np1 -i "${srcdir}"/623ea5c.diff
+    # fix build - https://gerrit.libreoffice.org/c/core/+/145421
+    patch -Np1 -i "${srcdir}"/623ea5c.diff

-        # fix build with libxml2 2.12
-        patch -Np1 -i "${srcdir}"/fix-build-against-system-libxml-2.12.diff
+    # fix build with icu 74
+    patch -Np1 -i "${srcdir}"/libreoffice-7.5.8.2-icu-74-compatibility.patch

-        # fix build with icu 74
-        patch -Np1 -i "${srcdir}"/libreoffice-7.5.8.2-icu-74-compatibility.patch
-
-	#use the CFLAGS but remove the LibO overridden ones
-	for i in $CFLAGS; do
-		case "$i" in
-			-O?|-pipe|-Wall|-g|-fexceptions) continue;;
-		esac
-		ARCH_FLAGS="$ARCH_FLAGS $i"
-	done
+    #use the CFLAGS but remove the LibO overridden ones
+    for i in $CFLAGS; do
+        case "$i" in
+            -pipe|-Wall|-Werror*|-fexceptions) continue;;
+        esac
+        ARCH_FLAGS="$ARCH_FLAGS $i"
+    done
+    export ARCH_FLAGS
+    export CFLAGS="$ARCH_FLAGS"
+    export CXXFLAGS="$ARCH_FLAGS"
 }

 build() {
-	cd libreoffice-$_LOver
+    cd libreoffice-$_LOver

-	# strip -s from Makeflags in case you use it to shorten build logs
-	_MAKEFLAGS=${MAKEFLAGS/-s/}
+    # strip -s from Makeflags in case you use it to shorten build logs
+    _MAKEFLAGS=${MAKEFLAGS/-s/}

-        # this uses malloc_usable_size, which is incompatible with fortification level 3
-        # /usr/lib/libreoffice/program/libskialo.so uses malloc_usable_size
-        export CFLAGS="${CFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}"
-        export CXXFLAGS="${CXXFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}"
+    # this uses malloc_usable_size, which is incompatible with fortification level 3
+    # /usr/lib/libreoffice/program/libskialo.so uses malloc_usable_size
+    export CFLAGS="${CFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}"
+    export CXXFLAGS="${CXXFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}"

-	# http://site.icu-project.org/download/61#TOC-Migration-Issues
-	CPPFLAGS+=' -DU_USING_ICU_NAMESPACE=1'
+    # http://site.icu-project.org/download/61#TOC-Migration-Issues
+    CPPFLAGS+=' -DU_USING_ICU_NAMESPACE=1'

-	# fix build with qt6 expecting libexec path
-	export qt6_libexec_dirs="/usr/lib/qt6"
+    # fix build with qt6 expecting libexec path
+    export qt6_libexec_dirs="/usr/lib/qt6"

-	./autogen.sh --with-extra-buildid="${pkgver}-${pkgrel}" \
-		--with-vendor="Arch Linux" \
-		--enable-split-app-modules \
-		--with-parallelism=${_MAKEFLAGS/-j/} \
-		--with-external-tar="${srcdir}/ext_sources" \
-		--disable-fetch-external \
-		--enable-release-build \
-		--prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
-		--libdir=/usr/lib --mandir=/usr/share/man \
-		--with-lang="" \
-		--with-help=html \
-		--disable-avahi \
-		--enable-dbus \
-		--enable-evolution2\
-		--enable-gio\
-		--enable-gtk3-kde5 \
-		--enable-kf5 \
-		--enable-qt5 \
-		--enable-qt6 \
-		--enable-gtk3 \
-		--enable-gtk4 \
-		--enable-introspection \
-		--enable-openssl \
-		--enable-odk\
-		--enable-python=system \
-		--enable-scripting-beanshell \
-		--enable-scripting-javascript \
-		--disable-dconf \
-		--disable-report-builder \
-		--enable-ext-wiki-publisher \
-		--enable-ext-nlpsolver \
-		--without-fonts\
-                --with-system-libxml \
-		--with-system-libcdr \
-		--with-system-mdds\
-		--without-myspell-dicts \
-		--with-system-libvisio \
-		--with-system-libcmis \
-		--with-system-libmspub \
-		--with-system-libexttextcat \
-		--with-system-orcus \
-		--with-system-liblangtag \
-		--with-system-libodfgen \
-		--with-system-libmwaw \
-		--with-system-libetonyek \
-		--with-system-libfreehand \
-		--disable-firebird-sdbc \
-		--with-system-zxing \
-		--with-system-libtommath \
-		--with-system-libatomic-ops \
-		--with-system-libebook \
-		--with-system-libabw \
-		--with-system-coinmp \
-		--with-system-dicts \
-		--with-external-dict-dir=/usr/share/hunspell \
-		--with-external-hyph-dir=/usr/share/hyphen \
-		--with-external-thes-dir=/usr/share/mythes \
-		--with-system-beanshell \
-		--with-system-cppunit\
-		--with-system-graphite\
-		--with-system-glm \
-		--with-system-libnumbertext \
-		--with-system-libwpg \
-		--with-system-libwps \
-		--with-system-redland\
-		--with-system-libzmf \
-		--with-system-gpgmepp \
-		--with-system-libstaroffice \
-		--with-jdk-home="/usr/lib/jvm/default" \
-		--with-ant-home="/usr/share/ant"\
-		--with-system-boost\
-		--with-system-icu \
-		--with-system-cairo \
-		--with-system-libs \
-		--with-system-mythes \
-		--with-system-headers \
-		--without-system-hsqldb \
-		--with-system-clucene \
-		--without-system-dragonbox \
-		--without-system-libfixmath \
-		--without-system-frozen \
-		--with-gdrive-client-id=${_google_default_client_id} \
-		--with-gdrive-client-secret=${_google_default_client_secret} \
-		--disable-dependency-tracking
+    ./autogen.sh --with-extra-buildid="${pkgver}-${pkgrel}" \
+        --with-vendor="Arch Linux" \
+        --enable-split-app-modules \
+        --with-parallelism=${_MAKEFLAGS/-j/} \
+        --with-external-tar="${srcdir}/ext_sources" \
+        --disable-fetch-external \
+        --enable-release-build \
+        --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
+        --libdir=/usr/lib --mandir=/usr/share/man \
+        --with-lang="" \
+        --with-help=html \
+        --disable-avahi \
+        --enable-dbus \
+        --enable-evolution2\
+        --enable-gio\
+        --enable-gtk3-kde5 \
+        --enable-kf5 \
+        --enable-qt5 \
+        --enable-qt6 \
+        --enable-gtk3 \
+        --enable-gtk4 \
+        --enable-introspection \
+        --enable-openssl \
+        --enable-odk\
+        --enable-python=system \
+        --enable-scripting-beanshell \
+        --enable-scripting-javascript \
+        --disable-dconf \
+        --disable-report-builder \
+        --enable-ext-wiki-publisher \
+        --enable-ext-nlpsolver \
+        --without-fonts\
+        --with-system-libxml \
+        --with-system-libcdr \
+        --with-system-mdds\
+        --without-myspell-dicts \
+        --with-system-libvisio \
+        --with-system-libcmis \
+        --with-system-libmspub \
+        --with-system-libexttextcat \
+        --with-system-orcus \
+        --with-system-liblangtag \
+        --with-system-libodfgen \
+        --with-system-libmwaw \
+        --with-system-libetonyek \
+        --with-system-libfreehand \
+        --disable-firebird-sdbc \
+        --with-system-zxing \
+        --with-system-libtommath \
+        --with-system-libatomic-ops \
+        --with-system-libebook \
+        --with-system-libabw \
+        --with-system-coinmp \
+        --with-system-dicts \
+        --with-external-dict-dir=/usr/share/hunspell \
+        --with-external-hyph-dir=/usr/share/hyphen \
+        --with-external-thes-dir=/usr/share/mythes \
+        --with-system-beanshell \
+        --with-system-cppunit\
+        --with-system-graphite\
+        --with-system-glm \
+        --with-system-libnumbertext \
+        --with-system-libwpg \
+        --with-system-libwps \
+        --with-system-redland\
+        --with-system-libzmf \
+        --with-system-gpgmepp \
+        --with-system-libstaroffice \
+        --with-jdk-home="/usr/lib/jvm/default" \
+        --with-ant-home="/usr/share/ant"\
+        --with-system-boost\
+        --with-system-icu \
+        --with-system-cairo \
+        --with-system-libs \
+        --with-system-mythes \
+        --with-system-headers \
+        --without-system-hsqldb \
+        --with-system-clucene \
+        --without-system-dragonbox \
+        --without-system-libfixmath \
+        --without-system-frozen \
+        --without-system-zxcvbn \
+        --with-gdrive-client-id=${_google_default_client_id} \
+        --with-gdrive-client-secret=${_google_default_client_secret} \
+        --disable-dependency-tracking

-	touch src.downloaded
-	make build
+    touch src.downloaded
+    make build

-	mkdir "${srcdir}"/fakeinstall
-	make DESTDIR="${srcdir}"/fakeinstall distro-pack-install
+    mkdir "${srcdir}"/fakeinstall
+    make DESTDIR="${srcdir}"/fakeinstall distro-pack-install
 }

 #check() {
-#	cd "${srcdir}"/build
-#	make check
+#   cd "${srcdir}"/build
+#   make check
 #}

 package_libreoffice-fresh-sdk() {
-	pkgdesc="Software Development Kit for LibreOffice Fresh"
-	depends=('libreoffice-fresh' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment' 'glibc')
-	provides=('libreoffice-sdk')
-	conflicts=('libreoffice-still-sdk')
+    pkgdesc="Software Development Kit for LibreOffice Fresh"
+    depends=('libreoffice-fresh' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment' 'glibc')
+    provides=('libreoffice-sdk')
+    conflicts=('libreoffice-still-sdk')

-	for dir in $(grep -h ^%dir libreoffice-$_LOver/file-lists/sdk{,_doc}_list.txt); do
-		install -dm755 "${pkgdir}"/${dir/\%dir/}
-	done
+    for dir in $(grep -h ^%dir libreoffice-$_LOver/file-lists/sdk{,_doc}_list.txt); do
+        install -dm755 "${pkgdir}"/${dir/\%dir/}
+    done

-	for file in $(grep -h -v ^%dir libreoffice-$_LOver/file-lists/sdk{,_doc}_list.txt); do
-		dirname=$(dirname $file)
-		[[ -d "${pkgdir}"/$dirname ]] || install -dm755 "${pkgdir}"/$dirname
-		mv "${srcdir}"/fakeinstall/${file} "${pkgdir}"/$file
-	done
+    for file in $(grep -h -v ^%dir libreoffice-$_LOver/file-lists/sdk{,_doc}_list.txt); do
+        dirname=$(dirname $file)
+        [[ -d "${pkgdir}"/$dirname ]] || install -dm755 "${pkgdir}"/$dirname
+        mv "${srcdir}"/fakeinstall/${file} "${pkgdir}"/$file
+    done

-	# fix environment path to keep compatibility with other java-environments
-	sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" \
-		"${pkgdir}"/usr/lib/libreoffice/sdk/setsdkenv_unix.sh
-
-	# fix permissions
-	find "${pkgdir}"/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} +
-	
-	# add LibreOfficeKit headers; FS#48066
-	install -dm755 "${pkgdir}"/usr/include/LibreOfficeKit
-	install -v -m644 "${srcdir}"/libreoffice-$_LOver/include/LibreOfficeKit/* "${pkgdir}"/usr/include/LibreOfficeKit
+    # fix permissions
+    find "${pkgdir}"/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} +
+    
+    # add LibreOfficeKit headers; FS#48066
+    install -dm755 "${pkgdir}"/usr/include/LibreOfficeKit
+    install -v -m644 "${srcdir}"/libreoffice-$_LOver/include/LibreOfficeKit/* "${pkgdir}"/usr/include/LibreOfficeKit
 }

 package_libreoffice-fresh() {
-	pkgdesc="LibreOffice branch which contains new features and program enhancements"
-	depends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python' 'libwpd>=0.9.2' 'libwps'
-		'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl'
-		'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' 'icu' 'libxslt'
-		'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr'
-		'libmspub' 'harfbuzz-icu' 'nss' 'clucene' 'hicolor-icon-theme'
-		'desktop-file-utils' 'shared-mime-info' 'libpagemaker'
-		'libxinerama' 'libabw' 'libmwaw' 'libe-book' 'libcups'
-		'liblangtag' 'libexttextcat' 'liborcus' 'libwebp' 'libcmis' # 'libfbclient'
-		'libtommath' 'libzmf' 'libatomic_ops' 'xmlsec' 'libnumbertext' 'gpgme' 
-		'libfreehand' 'libstaroffice' 'libepubgen' 'libqxp' 'libepoxy' 'box2d'
-		'zxing-cpp' 'xdg-utils'
+    pkgdesc="LibreOffice branch which contains new features and program enhancements"
+    depends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python' 'libwpd>=0.9.2' 'libwps'
+        'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl'
+        'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' 'icu' 'libxslt'
+        'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr'
+        'libmspub' 'harfbuzz-icu' 'nss' 'clucene' 'hicolor-icon-theme'
+        'desktop-file-utils' 'shared-mime-info' 'libpagemaker'
+        'libxinerama' 'libabw' 'libmwaw' 'libe-book' 'libcups'
+        'liblangtag' 'libexttextcat' 'liborcus' 'libwebp' 'libcmis' # 'libfbclient'
+        'libtommath' 'libzmf' 'libatomic_ops' 'xmlsec' 'libnumbertext' 'gpgme' 
+        'libfreehand' 'libstaroffice' 'libepubgen' 'libqxp' 'libepoxy' 'box2d'
+        'zxing-cpp' 'xdg-utils'
                'libldap' 'fontconfig' 'zlib' 'libpng' 'freetype2' 'raptor' 'libxml2'
                'cairo' 'libx11' 'expat' 'glib2' 'boost-libs' 'libtiff' 'dbus' 'glibc'
                'librevenge' 'libxext' 'openjpeg2' )
-	optdepends=('java-runtime:     adds java support'
-		'java-environment: required by extension-wiki-publisher and extension-nlpsolver'
-		'pstoedit:         translates PostScript and PDF graphics into other vector formats'
-		'libmythes:        for use in thesaurus'
-		'beanshell:       interactive java -- good for prototyping/macros'
-		'libwpg:           library for importing and converting WordPerfect Graphics format'
-		'sane:             for scanner access'
-		'unixodbc:         adds ODBC database support'
-		'gst-plugins-base-libs: for multimedia content, e.g. in Impress'
-		'libpaper:         takes care of papersize'
-		'postgresql-libs:  for postgresql-connector'
-		'mariadb-libs:     for mysql-connector'
-		'coin-or-mp:	   required by the Calc solver'
-		'gtk3:             for GTK3 integration'
-		'gtk4:             for GTK4 integration (experimental)'
-		'kio5:             for KF5 KDE desktop integration'
-		'qt6-base:         for Qt6 desktop integration')
-	backup=(etc/libreoffice/sofficerc
-		etc/libreoffice/bootstraprc
-		etc/libreoffice/psprint.conf
-		etc/profile.d/libreoffice-fresh.sh
-		etc/profile.d/libreoffice-fresh.csh)
-	provides=('libreoffice' 'libreoffice-en-US')
-	conflicts=('libreoffice-still')
+    optdepends=('java-runtime:     adds java support'
+        'java-environment>=17: required by extension-wiki-publisher and extension-nlpsolver'
+        'pstoedit:         translates PostScript and PDF graphics into other vector formats'
+        'libmythes:        for use in thesaurus'
+        'beanshell:       interactive java -- good for prototyping/macros'
+        'libwpg:           library for importing and converting WordPerfect Graphics format'
+        'sane:             for scanner access'
+        'unixodbc:         adds ODBC database support'
+        'gst-plugins-base-libs: for multimedia content, e.g. in Impress'
+        'libpaper:         takes care of papersize'
+        'postgresql-libs:  for postgresql-connector'
+        'mariadb-libs:     for mysql-connector'
+        'coin-or-mp:       required by the Calc solver'
+        'gtk3:             for GTK3 integration'
+        'gtk4:             for GTK4 integration (experimental)'
+        'kio5:             for KF5 KDE desktop integration'
+        'qt6-base:         for Qt6 desktop integration')
+    backup=(etc/libreoffice/sofficerc
+        etc/libreoffice/bootstraprc
+        etc/libreoffice/psprint.conf
+        etc/profile.d/libreoffice-fresh.sh
+        etc/profile.d/libreoffice-fresh.csh)
+    provides=('libreoffice' 'libreoffice-en-US')
+    conflicts=('libreoffice-still')

-	mv fakeinstall/* "${pkgdir}"/
+    mv fakeinstall/* "${pkgdir}"/

-	# put configuration files into place
-	install -dm755 "${pkgdir}"/etc/libreoffice
-	install -m644 "${pkgdir}"/usr/lib/libreoffice/program/{bootstraprc,sofficerc} \
-		"${pkgdir}"/etc/libreoffice/
-	install -m644 "${pkgdir}"/usr/lib/libreoffice/share/psprint/psprint.conf \
-	   	"${pkgdir}"/etc/libreoffice/
+    # put configuration files into place
+    install -dm755 "${pkgdir}"/etc/libreoffice
+    install -m644 "${pkgdir}"/usr/lib/libreoffice/program/{bootstraprc,sofficerc} \
+        "${pkgdir}"/etc/libreoffice/
+    install -m644 "${pkgdir}"/usr/lib/libreoffice/share/psprint/psprint.conf \
+        "${pkgdir}"/etc/libreoffice/

-	# install dummy links to make them found by LibO
-	cd "${pkgdir}"/usr/lib/libreoffice/program/
-	ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} .
-	cd "${pkgdir}"/usr/lib/libreoffice/share/psprint/
-	ln -vsf /etc/libreoffice/psprint.conf .
+    # install dummy links to make them found by LibO
+    cd "${pkgdir}"/usr/lib/libreoffice/program/
+    ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} .
+    cd "${pkgdir}"/usr/lib/libreoffice/share/psprint/
+    ln -vsf /etc/libreoffice/psprint.conf .

-	# allow to preset desired VLC
-	install -dm755 "${pkgdir}"/etc/profile.d
-	install -m644 "${srcdir}"/libreoffice-fresh.{sh,csh} "${pkgdir}"/etc/profile.d/
+    # allow to preset desired VLC
+    install -dm755 "${pkgdir}"/etc/profile.d
+    install -m644 "${srcdir}"/libreoffice-fresh.{sh,csh} "${pkgdir}"/etc/profile.d/

-	# make pyuno find its modules
-        local site_packages=$(python -c "import site; print(site.getsitepackages()[0])")
+    # make pyuno find its modules
+    local site_packages=$(python -c "import site; print(site.getsitepackages()[0])")

-	install -dm755 "${pkgdir}"/$site_packages
-	ln -svf /usr/lib/libreoffice/program/uno.py \
-		"${pkgdir}"/$site_packages/uno.py
-	ln -svf /usr/lib/libreoffice/program/unohelper.py \
-		"${pkgdir}"/$site_packages/unohelper.py
-		
-	# add a symlink required for gnome-documents; FS#51887
-	# https://lists.freedesktop.org/archives/libreoffice/2016-March/073787.html
-	ln -svf /usr/lib/libreoffice/program/liblibreofficekitgtk.so \
-		"${pkgdir}"/usr/lib/liblibreofficekitgtk.so  
+    install -dm755 "${pkgdir}"/$site_packages
+    ln -svf /usr/lib/libreoffice/program/uno.py \
+        "${pkgdir}"/$site_packages/uno.py
+    ln -svf /usr/lib/libreoffice/program/unohelper.py \
+        "${pkgdir}"/$site_packages/unohelper.py
+        
+    # add a symlink required for gnome-documents; FS#51887
+    # https://lists.freedesktop.org/archives/libreoffice/2016-March/073787.html
+    ln -svf /usr/lib/libreoffice/program/liblibreofficekitgtk.so \
+        "${pkgdir}"/usr/lib/liblibreofficekitgtk.so  

-	# cleanup
-	rm -rf "${pkgdir}"/usr/share/libreoffice/sdk
+    # cleanup
+    rm -rf "${pkgdir}"/usr/share/libreoffice/sdk

-	# add application descriptions
-	install -dm755 "${pkgdir}"/usr/share/metainfo
-	install -v -m644 "${srcdir}"/libreoffice-$_LOver/sysui/desktop/appstream-appdata/*.xml \
-		"${pkgdir}"/usr/share/metainfo
+    # add application descriptions
+    install -dm755 "${pkgdir}"/usr/share/metainfo
+    install -v -m644 "${srcdir}"/libreoffice-$_LOver/sysui/desktop/appstream-appdata/*.xml \
+    "${pkgdir}"/usr/share/metainfo

-	# add kde filemanager templates; FS#61662 - file taken from Debian
-	install -dm755 "${pkgdir}"/usr/share/templates/.source
-	install -v -m644 "${srcdir}"/libreoffice-$_LOver/extras/source/shellnew/soffice.* \
-		"${pkgdir}"/usr/share/templates/.source
+    # add kde filemanager templates; FS#61662 - file taken from Debian
+    install -dm755 "${pkgdir}"/usr/share/templates/.source
+    install -v -m644 "${srcdir}"/libreoffice-$_LOver/extras/source/shellnew/soffice.* \
+    "${pkgdir}"/usr/share/templates/.source

-	cat "${srcdir}"/soffice-template.desktop.in \
+    cat "${srcdir}"/soffice-template.desktop.in \
                | sed -e "s/@APP@/Writer/" \
                | sed -e "s/@EXT@/odt/" \
                | sed -e "s/@TYPE@/text/" \
@ -412,14 +407,14 @@ package_libreoffice-fresh() {
                | sed -e "s/@TYPE@/drawing/" \
                > "${pkgdir}"/usr/share/templates/soffice.odg.desktop

-	# make all i18n lang packages with help section ('1') available to
-	# fix "F1" not opening translated offline help opening in browser
-	# see also /usr/lib/libreoffice/help/en-US/langnames.js
-	echo "var languagesSet = new Set(['en-US','am','ar','ast','bg','bn',\
-	'bn-IN','bo','bs','ca','ca-valencia','cs','da','de','dz','el',\
-	'en-GB','en-ZA','eo','es','et','eu','fi','fr','gl','gu','he',\
-	'hi','hr','hu','id','is','it','ja','ka','km','ko','lo','lt','lv',\
-	'mk','nb','ne','nl','nn','om','pl','pt','pt-BR','ro','ru','si',\
-	'sid','sk','sl','sq','sv','ta','tg','tr','ug','uk','vi','zh-CN','zh-TW'])" \
-		> "${pkgdir}"/usr/lib/libreoffice/help/languages.js
+    # make all i18n lang packages with help section ('1') available to
+    # fix "F1" not opening translated offline help opening in browser
+    # see also /usr/lib/libreoffice/help/en-US/langnames.js
+    echo "var languagesSet = new Set(['en-US','am','ar','ast','bg','bn',\
+    'bn-IN','bo','bs','ca','ca-valencia','cs','da','de','dz','el',\
+    'en-GB','en-ZA','eo','es','et','eu','fi','fr','gl','gu','he',\
+    'hi','hr','hu','id','is','it','ja','ka','km','ko','lo','lt','lv',\
+    'mk','nb','ne','nl','nn','om','pl','pt','pt-BR','ro','ru','si',\
+    'sid','sk','sl','sq','sv','ta','tg','tr','ug','uk','vi','zh-CN','zh-TW'])" \
+        > "${pkgdir}"/usr/lib/libreoffice/help/languages.js
 }
--- a/extra/libreoffice-fresh/fix-build-against-system-libxml-2.12.diff
+++ b/extra/libreoffice-fresh/fix-build-against-system-libxml-2.12.diff
@ -1,303 +0,0 @@
-From c8f7408db73d2f2ccacb25a2b4fef8dfebdfc6cb Mon Sep 17 00:00:00 2001
-From: Miklos Vajna <vmiklos@collabora.com>
-Date: Mon, 27 Nov 2023 08:02:59 +0100
-Subject: tdf#158302 fix build against system-libxml-2.12
-
-Seen in a fedora:40 container, using --with-system-libcmis,
--with-system-liblangtag and --with-system-xmlsec.
-
-Change-Id: I9d748d3dc0b70dbfdfcb6b99c9ce8440bda6f326
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159980
-Tested-by: Jenkins
-Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
---
- drawinglayer/source/tools/primitive2dxmldump.cxx | 1 +
- filter/source/xsltfilter/LibXSLTTransformer.cxx  | 2 +-
- helpcompiler/source/HelpLinker.cxx               | 4 ++++
- include/xmloff/xmltoken.hxx                      | 2 +-
- sax/source/fastparser/fastparser.cxx             | 2 +-
- sc/source/core/tool/interpr7.cxx                 | 1 +
- sc/source/filter/xml/XMLExportDataPilot.cxx      | 2 +-
- sc/source/filter/xml/XMLExportDatabaseRanges.cxx | 2 +-
- sc/source/filter/xml/xmlfilti.cxx                | 6 +++---
- unoxml/source/dom/attr.cxx                       | 1 +
- unoxml/source/dom/document.cxx                   | 1 +
- unoxml/source/dom/documentbuilder.cxx            | 1 +
- unoxml/source/dom/entity.cxx                     | 1 +
- unoxml/source/xpath/xpathapi.cxx                 | 7 ++++++-
- xmloff/source/core/xmltoken.cxx                  | 2 +-
- xmloff/source/style/PageMasterStyleMap.cxx       | 2 +-
- xmlsecurity/inc/xmlsec-wrapper.h                 | 1 +
- xmlsecurity/inc/xmlsec/saxhelper.hxx             | 1 +
- 18 files changed, 28 insertions(+), 11 deletions(-)
-
-diff --git a/drawinglayer/source/tools/primitive2dxmldump.cxx b/drawinglayer/source/tools/primitive2dxmldump.cxx
-index 76aefec902ea..f3b9ef1bc919 100644
--- a/drawinglayer/source/tools/primitive2dxmldump.cxx
-+++ b/drawinglayer/source/tools/primitive2dxmldump.cxx
-@@ -15,6 +15,7 @@
- 
- #include <math.h>
- #include <memory>
-+#include <libxml/parser.h>
- #include <sal/log.hxx>
- 
- #include <drawinglayer/primitive2d/bitmapprimitive2d.hxx>
-diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx b/filter/source/xsltfilter/LibXSLTTransformer.cxx
-index 1a7c34805f1b..5e9a7c4bcd35 100644
--- a/filter/source/xsltfilter/LibXSLTTransformer.cxx
-+++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx
-@@ -333,7 +333,7 @@ namespace XSLT
-         }
-         else
-         {
-            xmlErrorPtr lastErr = xmlGetLastError();
-+            const xmlError* lastErr = xmlGetLastError();
-             OUString msg;
-             if (lastErr)
-                 msg = OStringToOUString(lastErr->message, RTL_TEXTENCODING_UTF8);
-diff --git a/helpcompiler/source/HelpLinker.cxx b/helpcompiler/source/HelpLinker.cxx
-index 3d52834dbe6b..898a8b26392a 100644
--- a/helpcompiler/source/HelpLinker.cxx
-+++ b/helpcompiler/source/HelpLinker.cxx
-@@ -815,7 +815,11 @@ static const HelpProcessingException* GpXMLParsingException = nullptr;
- 
- extern "C" {
- 
-+#if LIBXML_VERSION >= 21200
-+static void StructuredXMLErrorFunction(SAL_UNUSED_PARAMETER void *, const xmlError* error)
-+#else
- static void StructuredXMLErrorFunction(SAL_UNUSED_PARAMETER void *, xmlErrorPtr error)
-+#endif
- {
-     std::string aErrorMsg = error->message;
-     std::string aXMLParsingFile;
-diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
-index 4e6441841774..ba42fae4d035 100644
--- a/include/xmloff/xmltoken.hxx
-+++ b/include/xmloff/xmltoken.hxx
-@@ -744,7 +744,7 @@ namespace xmloff::token {
-         XML_EMBEDDED_VISIBLE_AREA,
-         XML_EMBOSSED,
-         XML_EMISSIVE_COLOR,
-        XML_EMPTY,
-+        XML_TOKEN_EMPTY,
-         XML_EMPTY_LINE_REFRESH,
-         XML_ENABLE_NUMBERING,
-         XML_ENABLED,
-diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
-index ec8065016a12..e0338e053cf0 100644
--- a/sax/source/fastparser/fastparser.cxx
-+++ b/sax/source/fastparser/fastparser.cxx
-@@ -578,7 +578,7 @@ Event& Entity::getEvent( CallbackType aType )
- OUString lclGetErrorMessage( xmlParserCtxtPtr ctxt, std::u16string_view sSystemId, sal_Int32 nLine )
- {
-     const char* pMessage;
-    xmlErrorPtr error = xmlCtxtGetLastError( ctxt );
-+    const xmlError* error = xmlCtxtGetLastError( ctxt );
-     if( error && error->message )
-         pMessage = error->message;
-     else
-diff --git a/sc/source/core/tool/interpr7.cxx b/sc/source/core/tool/interpr7.cxx
-index 352c7cf70e45..ecb4ea346396 100644
--- a/sc/source/core/tool/interpr7.cxx
-+++ b/sc/source/core/tool/interpr7.cxx
-@@ -31,6 +31,7 @@
- #include <cstring>
- #include <memory>
- #include <string_view>
-+#include <libxml/parser.h>
- 
- using namespace com::sun::star;
- 
-diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx
-index da65bec0dab7..bd5f16d828ff 100644
--- a/sc/source/filter/xml/XMLExportDataPilot.cxx
-+++ b/sc/source/filter/xml/XMLExportDataPilot.cxx
-@@ -123,7 +123,7 @@ void ScXMLExportDataPilot::WriteDPCondition(const ScQueryEntry& aQueryEntry, boo
- 
-     if (aQueryEntry.IsQueryByEmpty())
-     {
-        rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_OPERATOR, GetXMLToken(XML_EMPTY));
-+        rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_OPERATOR, GetXMLToken(XML_TOKEN_EMPTY));
-     }
-     else if (aQueryEntry.IsQueryByNonEmpty())
-     {
-diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
-index 6905e02d651b..e4307065bd92 100644
--- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
-+++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
-@@ -376,7 +376,7 @@ private:
-             case SC_EQUAL:
-             {
-                 if (rEntry.IsQueryByEmpty())
-                    return GetXMLToken(XML_EMPTY);
-+                    return GetXMLToken(XML_TOKEN_EMPTY);
-                 else if (rEntry.IsQueryByNonEmpty())
-                     return GetXMLToken(XML_NOEMPTY);
- 
-diff --git a/sc/source/filter/xml/xmlfilti.cxx b/sc/source/filter/xml/xmlfilti.cxx
-index 7585ce0c50fa..61f7cfe4a349 100644
--- a/sc/source/filter/xml/xmlfilti.cxx
-+++ b/sc/source/filter/xml/xmlfilti.cxx
-@@ -370,7 +370,7 @@ void ScXMLConditionContext::GetOperator(
-         rEntry.eOp = SC_BOTPERC;
-     else if (IsXMLToken(aOpStr, XML_BOTTOM_VALUES))
-         rEntry.eOp = SC_BOTVAL;
-    else if (IsXMLToken(aOpStr, XML_EMPTY))
-+    else if (IsXMLToken(aOpStr, XML_TOKEN_EMPTY))
-         rEntry.SetQueryByEmpty();
-     else if (aOpStr == u">")
-         rEntry.eOp = SC_GREATER;
-@@ -422,7 +422,7 @@ void SAL_CALL ScXMLConditionContext::endFastElement( sal_Int32 /*nElement*/ )
-     if (maQueryItems.empty())
-     {
-         ScQueryEntry::Item& rItem = rEntry.GetQueryItem();
-        if (IsXMLToken(sOperator, XML_EMPTY))
-+        if (IsXMLToken(sOperator, XML_TOKEN_EMPTY))
-             return;
-         if (IsXMLToken(sDataType, XML_NUMBER))
-         {
-@@ -753,7 +753,7 @@ void SAL_CALL ScXMLDPConditionContext::endFastElement( sal_Int32 /*nElement*/ )
-     else
-         aFilterField.eConnect = SC_AND;
-     pFilterContext->SetIsCaseSensitive(bIsCaseSensitive);
-    if (IsXMLToken(sOperator, XML_EMPTY))
-+    if (IsXMLToken(sOperator, XML_TOKEN_EMPTY))
-         aFilterField.SetQueryByEmpty();
-     else if (IsXMLToken(sOperator, XML_NOEMPTY))
-         aFilterField.SetQueryByNonEmpty();
-diff --git a/unoxml/source/dom/attr.cxx b/unoxml/source/dom/attr.cxx
-index dd974d910edb..d8d873cdf055 100644
--- a/unoxml/source/dom/attr.cxx
-+++ b/unoxml/source/dom/attr.cxx
-@@ -22,6 +22,7 @@
- #include <string.h>
- 
- #include <memory>
-+#include <libxml/entities.h>
- 
- #include <osl/diagnose.h>
- #include <sal/log.hxx>
-diff --git a/unoxml/source/dom/document.cxx b/unoxml/source/dom/document.cxx
-index cb48bd1635f8..0825fc2cd7ed 100644
--- a/unoxml/source/dom/document.cxx
-+++ b/unoxml/source/dom/document.cxx
-@@ -41,6 +41,7 @@
- #include <eventdispatcher.hxx>
- 
- #include <string.h>
-+#include <libxml/xmlIO.h>
- 
- #include <osl/diagnose.h>
- 
-diff --git a/unoxml/source/dom/documentbuilder.cxx b/unoxml/source/dom/documentbuilder.cxx
-index c3cd7663d2fc..3898d58e4be4 100644
--- a/unoxml/source/dom/documentbuilder.cxx
-+++ b/unoxml/source/dom/documentbuilder.cxx
-@@ -22,6 +22,7 @@
- #include <string.h>
- 
- #include <libxml/xmlerror.h>
-+#include <libxml/parser.h>
- 
- #include <memory>
- 
-diff --git a/unoxml/source/dom/entity.cxx b/unoxml/source/dom/entity.cxx
-index ccc8a0872499..98909dfe8f12 100644
--- a/unoxml/source/dom/entity.cxx
-+++ b/unoxml/source/dom/entity.cxx
-@@ -22,6 +22,7 @@
- #include <osl/diagnose.h>
- 
- #include <string.h>
-+#include <libxml/entities.h>
- 
- using namespace css::uno;
- using namespace css::xml::dom;
-diff --git a/unoxml/source/xpath/xpathapi.cxx b/unoxml/source/xpath/xpathapi.cxx
-index a60083983882..c2b753783176 100644
--- a/unoxml/source/xpath/xpathapi.cxx
-+++ b/unoxml/source/xpath/xpathapi.cxx
-@@ -26,6 +26,7 @@
- #include <libxml/xmlerror.h>
- #include <libxml/xpath.h>
- #include <libxml/xpathInternals.h>
-+#include <libxml/xmlIO.h>
- 
- #include <com/sun/star/xml/xpath/XPathException.hpp>
- 
-@@ -217,7 +218,7 @@ namespace XPath
-         return selectSingleNode(contextNode, expr);
-     }
- 
-    static OUString make_error_message(xmlErrorPtr pError)
-+    static OUString make_error_message(const xmlError* pError)
-     {
-         OUStringBuffer buf;
-         if (pError) {
-@@ -259,7 +260,11 @@ namespace XPath
-             SAL_WARN("unoxml", "libxml2 error: " << str);
-         }
- 
-+#if LIBXML_VERSION >= 21200
-+        static void structured_error_func(void *, const xmlError* error)
-+#else
-         static void structured_error_func(void *, xmlErrorPtr error)
-+#endif
-         {
-             SAL_WARN("unoxml", "libxml2 error: " << make_error_message(error));
-         }
-diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
-index 6879f37db295..e11dc0d16111 100644
--- a/xmloff/source/core/xmltoken.cxx
-+++ b/xmloff/source/core/xmltoken.cxx
-@@ -756,7 +756,7 @@ namespace xmloff::token {
-         TOKEN( "embedded-visible-area",           XML_EMBEDDED_VISIBLE_AREA ),
-         TOKEN( "embossed",                        XML_EMBOSSED ),
-         TOKEN( "emissive-color",                  XML_EMISSIVE_COLOR ),
-        TOKEN( "empty",                           XML_EMPTY ),
-+        TOKEN( "empty",                           XML_TOKEN_EMPTY ),
-         TOKEN( "empty-line-refresh",              XML_EMPTY_LINE_REFRESH ),
-         TOKEN( "enable-numbering",                XML_ENABLE_NUMBERING ),
-         TOKEN( "enabled",                         XML_ENABLED ),
-diff --git a/xmloff/source/style/PageMasterStyleMap.cxx b/xmloff/source/style/PageMasterStyleMap.cxx
-index 7b2cab4751aa..6f631289672b 100644
--- a/xmloff/source/style/PageMasterStyleMap.cxx
-+++ b/xmloff/source/style/PageMasterStyleMap.cxx
-@@ -157,7 +157,7 @@ const XMLPropertyMapEntry aXMLPageMasterStyleMap[] =
-     PLMAP( PROP_FootnoteLineRelativeWidth, XML_NAMESPACE_STYLE,    XML__EMPTY,     XML_TYPE_PERCENT8|MID_FLAG_SPECIAL_ITEM,    CTF_PM_FTN_LINE_WIDTH ),
-     PLMAP( PROP_FootnoteLineTextDistance, XML_NAMESPACE_STYLE,    XML__EMPTY,     XML_TYPE_MEASURE|MID_FLAG_SPECIAL_ITEM,    CTF_PM_FTN_LINE_DISTANCE ),
-     PLMAP( PROP_FootnoteLineWeight,        XML_NAMESPACE_STYLE,    XML_FOOTNOTE_SEP,    XML_TYPE_MEASURE16|MID_FLAG_ELEMENT_ITEM,    CTF_PM_FTN_LINE_WEIGHT ),
-    PLMAP( PROP_FootnoteLineStyle,     XML_NAMESPACE_STYLE,    XML_EMPTY,  XML_TYPE_STRING|MID_FLAG_ELEMENT_ITEM,  CTF_PM_FTN_LINE_STYLE ),
-+    PLMAP( PROP_FootnoteLineStyle,     XML_NAMESPACE_STYLE,    XML_TOKEN_EMPTY,  XML_TYPE_STRING|MID_FLAG_ELEMENT_ITEM,  CTF_PM_FTN_LINE_STYLE ),
-     PLMAP_EXT(PROP_GutterMargin, XML_NAMESPACE_LO_EXT, XML_MARGIN_GUTTER, XML_TYPE_MEASURE, CTF_PM_MARGINGUTTER),
- 
-     //////////////////////////////////////////////////////////////////////////
-diff --git a/xmlsecurity/inc/xmlsec-wrapper.h b/xmlsecurity/inc/xmlsec-wrapper.h
-index 7c6d267e8b73..3ad705400c52 100644
--- a/xmlsecurity/inc/xmlsec-wrapper.h
-+++ b/xmlsecurity/inc/xmlsec-wrapper.h
-@@ -23,6 +23,7 @@
- 
- #include <sal/types.h>
- 
-+#include <libxml/parser.h>
- #include <xmlsec/base64.h>
- #include <xmlsec/bn.h>
- #include <xmlsec/errors.h>
-diff --git a/xmlsecurity/inc/xmlsec/saxhelper.hxx b/xmlsecurity/inc/xmlsec/saxhelper.hxx
-index a49ccef1894c..a5863ffd0e2a 100644
--- a/xmlsecurity/inc/xmlsec/saxhelper.hxx
-+++ b/xmlsecurity/inc/xmlsec/saxhelper.hxx
-@@ -23,6 +23,7 @@
- 
- #include <string_view>
- 
-+#include <libxml/parser.h>
- #include <libxml/tree.h>
- 
- #include <rtl/ustring.hxx>
-- 
-cgit v1.2.1
-