Merge libreoffice (4:25.2.3-2) import into refs/heads/workingbranch

[PATCH] implement --with-system-colamd (for internal lpsolve)

using suitesparse. Tested with both suitesparse 5.12.0 (Debian stable,
without pc) and 7.9.0 (Debian unstable, with .pc)

Change-Id: I6e0d014455ea2dec111aa3380bd49bd586dfad0a

Gbp-Pq: Name system-colamd.diff

disable-uitest-xmlsecurity-gpg

Gbp-Pq: Name disable-uitest-xmlsecurity-gpg.diff

fix-32bits-test-build

Gbp-Pq: Name fix-32bits-test-build.diff

lo-xlate-lang-add-tl

Gbp-Pq: Name lo-xlate-lang-add-tl.diff

[PATCH] sunjre: check all four possible OpenJDK variants for libjvm.so

Since OpenJDK 21, the "minimal" and "zero" variants of JVM no longer
reside in the "server" directory in $JAVA_HOME/lib, making the loader
unable to find libjvm.so. This regresses LO builds on platforms with
only those variants of JVM (i.e. without a HotSpot port).

Example error message is like this:

> exception occurred: Could not create Java implementation loader at
> ./stoc/source/javaloader/javaloader.cxx:551

Fix it by probing all four possible variant directories for libjvm.so.
This is tested on Debian unstable (loong64 port) to fix the packaging.

Link: https://bugs.openjdk.org/browse/JDK-8273494
Link: https://github.com/openjdk/jdk/pull/5440
Link: https://github.com/openjdk/jdk/commit/8fbcc8239a3fc04e56ebbd287c7bb5db731977b7
Change-Id: I3545f93054d7a3af0181e4c739c82efaaf8aeaed

Gbp-Pq: Name jdk-minimal-and-zero-paths.diff

pdfium-ports

Gbp-Pq: Name pdfium-ports.diff

adapt-for-new-carlito

Gbp-Pq: Name adapt-for-new-carlito.diff

we-dont-have-the-needed-fonts

Gbp-Pq: Name we-dont-have-the-needed-fonts.diff

do-not-abort-on-NON_APPLICATION_FONT_USE

Gbp-Pq: Name do-not-abort-on-NON_APPLICATION_FONT_USE.diff

moreIconsDialog-accesses-internet

Gbp-Pq: Name moreIconsDialog-accesses-internet.diff

Explicitly set fpu mode on armhf

Gbp-Pq: Name arm-fp-mode.diff

Support tofu+pgp trust model in GnuPG

Bug-Debian: https://bugs.debian.org/955271
Forwarded: no

GnuPG supports a trust-on-first-use layer that sits on top of the
standard PGP trust model. If this is enabled, 'gpg --list-keys' needs
write and lock permissions on the TOFU database to return any useful
data. Allow this access through AppArmor.

Gbp-Pq: Name apparmor-gnupg-tofu.diff

apparmor-updates

Gbp-Pq: Name apparmor-updates.diff

[PATCH] Resolves: rhbz#1432468 disable opencl by default

Change-Id: Ie037fcabdd219f195425979dd721501fb5527573

Gbp-Pq: Name no-opencl-per-default.diff

disable-shortcuts_tab_navigation-uitest

Gbp-Pq: Name disable-shortcuts_tab_navigation-uitest.diff

add-access2base-doc

Gbp-Pq: Name add-access2base-doc.diff

Add safer float comparisons to bridgetest equals()

Bug-Ubuntu: https://launchpad.net/bugs/1832360

Gbp-Pq: Name fix-flaky-bridgetest.diff

apparmor-opencl

apparmor: Add opencl support

AppArmor in Debian Buster now has OpenCL abstractions.

Include OpenCL abstractions to fix OpenCL usage in Calc.

Gbp-Pq: Name apparmor-opencl.diff

[PATCH] mariadb

Gbp-Pq: Name use-mariadb-java-instead-of-mysql-java.diff

disableClassPathURLCheck

Gbp-Pq: Name disableClassPathURLCheck.diff

apparmor-mesa

Gbp-Pq: Name apparmor-mesa.diff

[PATCH] apparmor: use dri-enumerate abstraction

Remove backported rule and use new dri-enumerate abstraction instead.
dri-enumerate is available in AppArmor 2.13, which recently migrated
into Debian Buster.

Change-Id: I64919edc1882f7bc1e65cfb94686464c5350f699

Gbp-Pq: Name apparmor-cleanups.diff

apparmor-allow-java.security

Gbp-Pq: Name apparmor-allow-java.security.diff

do-not-hide-test-output

Gbp-Pq: Name do-not-hide-test-output.diff

disable-java-in-odk-build-examples-on-zero-vm

Gbp-Pq: Name disable-java-in-odk-build-examples-on-zero-vm.diff

appstream-ignore-startcenter

Gbp-Pq: Name appstream-ignore-startcenter.diff

Hide startcenter and math from the shell

Bug-Ubuntu: https://launchpad.net/bugs/1696250
Forwarded: not-needed

Gbp-Pq: Name hide-math-desktop-file.patch

apparmor-complain

Gbp-Pq: Name apparmor-complain.diff

cppunit-optional

Gbp-Pq: Name cppunit-optional.diff

system-officeotron-and-odfvalidator

Gbp-Pq: Name system-officeotron-and-odfvalidator.diff

no-packagekit-per-default

Gbp-Pq: Name no-packagekit-per-default.diff

javadoc-optional

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gbp-Pq: Name javadoc-optional.diff

fix-internal-hsqldb-build

Gbp-Pq: Name fix-internal-hsqldb-build.diff

disable-flaky-tests

14:13 < mst__> _rene_, the toolkit unoapi tests are known to be flaky (in some
               system dependent way) e.g. on the Win@6 tinderbox it always
               crashes
14:14 < mst__> _rene_, sc.ScAccessible* tests also fail on some systems some of
               the time

Gbp-Pq: Name disable-flaky-tests.diff

debian-hardened-buildflags-no-LO-fstack-protector-strong

don't hardcode -fstack-protector-strong in configure.ac/gbuild. We get the
hardening flags from dpkg-buildflags anyway.

Gbp-Pq: Name debian-hardened-buildflags-no-LO-fstack-protector-strong.diff

debian-hardened-buildflags-CPPFLAGS

Gbp-Pq: Name debian-hardened-buildflags-CPPFLAGS.diff

mediwiki-oor-replace

Gbp-Pq: Name mediwiki-oor-replace.diff

make-package-modules-not-suck

Gbp-Pq: Name make-package-modules-not-suck.diff

jdbc-driver-classpaths

Gbp-Pq: Name jdbc-driver-classpaths.diff

reportdesign-mention-package

Gbp-Pq: Name reportdesign-mention-package.diff

sensible-lomua

===================================================================

Gbp-Pq: Name sensible-lomua.diff

help-msg-add-package-info

Gbp-Pq: Name help-msg-add-package-info.diff

mention-java-common-package

Gbp-Pq: Name mention-java-common-package.diff

install-fixes

Gbp-Pq: Name install-fixes.diff

build-against-shared-lpsolve

Gbp-Pq: Name build-against-shared-lpsolve.diff

debian-debug

Gbp-Pq: Name debian-debug.diff

splits-adapt-registry

Gbp-Pq: Name splits-adapt-registry.diff

jurt-soffice-location

commit b71107fb12e3c3125e0cb62c5a4f6636a80c6408
Author:     Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
AuthorDate: Tue Jun 7 11:52:37 2011 +0200
Commit:     Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
CommitDate: Tue Jun 7 11:52:37 2011 +0200

    on debian-based systems, we know where our soffice binary is

Gbp-Pq: Name jurt-soffice-location.diff

debian-opt

Gbp-Pq: Name debian-opt.diff

libreoffice (4:25.2.3-2) unstable; urgency=medium

  * debian/patches/avmedia-qt-use-gstreamer-frame-grabber-by-default.diff:
    revert (for now), actually FTBFS

[dgit import unpatched libreoffice 4:25.2.3-2]

Import libreoffice_25.2.3-2.debian.tar.xz

[dgit import tarball libreoffice 4:25.2.3-2 libreoffice_25.2.3-2.debian.tar.xz]

Import libreoffice_25.2.3.orig.tar.xz

[dgit import orig libreoffice_25.2.3.orig.tar.xz]

Import libreoffice_25.2.3.orig-helpcontent2.tar.xz

[dgit import orig libreoffice_25.2.3.orig-helpcontent2.tar.xz]

Import libreoffice_25.2.3.orig-translations.tar.xz

[dgit import orig libreoffice_25.2.3.orig-translations.tar.xz]

Merge libreoffice (4:25.2.2-1) import into refs/heads/workingbranch

tdf#165870 qt avmedia: Handle null media player

QtPlayer::m_xMediaPlayer can be null, e.g. in a PPTX file
created in PowerPoint that contains an external video link to
Youtube, so handle that case gracefully instead of asserting/crashing.

Backtrace of assert getting triggered without this change in place:

    1 __pthread_kill_implementation pthread_kill.c 44 0x7ffff789e95c
    2 __pthread_kill_internal pthread_kill.c 89 0x7ffff789e9ff
    3 __GI_raise raise.c 26 0x7ffff7849cc2
    4 __GI_abort abort.c 73 0x7ffff78324ac
    5 __assert_fail_base assert.c 118 0x7ffff7832420
    6 avmedia::qt::QtPlayer::stop QtPlayer.cxx 75 0x7fff980b1675
    7 avmedia::qt::QtPlayer::disposing QtPlayer.cxx 281 0x7fff980b34f7
    8 cppu::WeakComponentImplHelperBase::dispose implbase.cxx 104 0x7ffff5b3de60
    9 cppu::PartialWeakComponentImplHelper<com::sun::star::media::XPlayer, com::sun::star::media::XPlayerNotifier, com::sun::star::lang::XServiceInfo>::dispose compbase.hxx 90 0x7fff980b0455
    10 avmedia::qt::QtManager::createPlayer QtManager.cxx 32 0x7fff980afc7e
    11 non-virtual thunk to avmedia::qt::QtManager::createPlayer(rtl::OUString const&) 0x7fff980afdbc
    12 avmedia::priv::MediaWindowImpl::createPlayer mediawindow_impl.cxx 212 0x7ffff0bf0d40
    13 avmedia::priv::MediaWindowImpl::createPlayer mediawindow_impl.cxx 193 0x7ffff0bf0a7e
    14 avmedia::MediaWindow::createPlayer mediawindow.cxx 364 0x7ffff0be5860
    15 slideshow::internal::ViewMediaShape::implInitializeMediaPlayer viewmediashape.cxx 391 0x7fff65284f52
    16 slideshow::internal::ViewMediaShape::implInitialize viewmediashape.cxx 309 0x7fff652839ab
    17 slideshow::internal::ViewMediaShape::startMedia viewmediashape.cxx 107 0x7fff652832b1
    18 slideshow::internal::(anonymous namespace)::MediaShape::implStartIntrinsicAnimation mediashape.cxx 212 0x7fff6526578e
    19 slideshow::internal::ExternalShapeBase::ExternalShapeBaseListener::enableAnimations externalshapebase.cxx 68 0x7fff65259ccd
    [...]

Change-Id: I6978f27d9b756a0fa8492d06bed57e805ca23a0c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183228
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
(cherry picked from commit b1576ba17a4111f02fc6f8e27c09c78dbd7fd963)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183230
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Gbp-Pq: Name qt-avmedia-handle-null-media-player.diff

Revert "tdf#164201 docx convert-to: prefer Word 2010–365 Document, not 2007"

This reverts 25.2.0.2 commit 858c452e5e6b7acad6932df7d1cd2f0950d47f33
on the 25.2 branch only. It is fine to remain on 25.8.

Reason for revert: There is a follow-up commit in bug 164201 that is necessary for Microsoft to be able to fully read the document. That necessary piece is only in 25.8. Making this seemingly simple change has a lot more implications than expected (primarily by Microsoft not being able to read files created according to their own specs). So I am not comfortable recommending that it be backported to a nearly-stable 25.2. Thus simply revert this optimistically-backported commit.

The specific problem that lead to the follow-up patch was the loss of create/modified date/time fields (seen only in MS Word).

The specific problem that lead to this revert is content controls only showing the placeholder text, and not the real text (seen only in MS Word).

Change-Id: I2e3d0e835282938dff86d80b17b8bb22958a0622
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183222
Reviewed-by: Justin Luth <jluth@mail.com>
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Gbp-Pq: Name revert-858c452e5e6b7acad6932df7d1cd2f0950d47f33.diff

[PATCH] implement --with-system-colamd (for internal lpsolve)

using suitesparse. Tested with both suitesparse 5.12.0 (Debian stable,
without pc) and 7.9.0 (Debian unstable, with .pc)

Change-Id: I6e0d014455ea2dec111aa3380bd49bd586dfad0a

Gbp-Pq: Name system-colamd.diff

disable-uitest-xmlsecurity-gpg

Gbp-Pq: Name disable-uitest-xmlsecurity-gpg.diff

fix-32bits-test-build

Gbp-Pq: Name fix-32bits-test-build.diff

lo-xlate-lang-add-tl

Gbp-Pq: Name lo-xlate-lang-add-tl.diff

[PATCH] sunjre: check all four possible OpenJDK variants for libjvm.so

Since OpenJDK 21, the "minimal" and "zero" variants of JVM no longer
reside in the "server" directory in $JAVA_HOME/lib, making the loader
unable to find libjvm.so. This regresses LO builds on platforms with
only those variants of JVM (i.e. without a HotSpot port).

Example error message is like this:

> exception occurred: Could not create Java implementation loader at
> ./stoc/source/javaloader/javaloader.cxx:551

Fix it by probing all four possible variant directories for libjvm.so.
This is tested on Debian unstable (loong64 port) to fix the packaging.

Link: https://bugs.openjdk.org/browse/JDK-8273494
Link: https://github.com/openjdk/jdk/pull/5440
Link: https://github.com/openjdk/jdk/commit/8fbcc8239a3fc04e56ebbd287c7bb5db731977b7
Change-Id: I3545f93054d7a3af0181e4c739c82efaaf8aeaed

Gbp-Pq: Name jdk-minimal-and-zero-paths.diff

pdfium-ports

Gbp-Pq: Name pdfium-ports.diff

adapt-for-new-carlito

Gbp-Pq: Name adapt-for-new-carlito.diff

we-dont-have-the-needed-fonts

Gbp-Pq: Name we-dont-have-the-needed-fonts.diff

do-not-abort-on-NON_APPLICATION_FONT_USE

Gbp-Pq: Name do-not-abort-on-NON_APPLICATION_FONT_USE.diff

moreIconsDialog-accesses-internet

Gbp-Pq: Name moreIconsDialog-accesses-internet.diff

Explicitly set fpu mode on armhf

Gbp-Pq: Name arm-fp-mode.diff

Support tofu+pgp trust model in GnuPG

Bug-Debian: https://bugs.debian.org/955271
Forwarded: no

GnuPG supports a trust-on-first-use layer that sits on top of the
standard PGP trust model. If this is enabled, 'gpg --list-keys' needs
write and lock permissions on the TOFU database to return any useful
data. Allow this access through AppArmor.

Gbp-Pq: Name apparmor-gnupg-tofu.diff

apparmor-updates

Gbp-Pq: Name apparmor-updates.diff

[PATCH] Resolves: rhbz#1432468 disable opencl by default

Change-Id: Ie037fcabdd219f195425979dd721501fb5527573

Gbp-Pq: Name no-opencl-per-default.diff

disable-shortcuts_tab_navigation-uitest

Gbp-Pq: Name disable-shortcuts_tab_navigation-uitest.diff

add-access2base-doc

Gbp-Pq: Name add-access2base-doc.diff

Add safer float comparisons to bridgetest equals()

Bug-Ubuntu: https://launchpad.net/bugs/1832360

Gbp-Pq: Name fix-flaky-bridgetest.diff

apparmor-opencl

apparmor: Add opencl support

AppArmor in Debian Buster now has OpenCL abstractions.

Include OpenCL abstractions to fix OpenCL usage in Calc.

Gbp-Pq: Name apparmor-opencl.diff

[PATCH] mariadb

Gbp-Pq: Name use-mariadb-java-instead-of-mysql-java.diff

disableClassPathURLCheck

Gbp-Pq: Name disableClassPathURLCheck.diff

apparmor-mesa

Gbp-Pq: Name apparmor-mesa.diff

[PATCH] apparmor: use dri-enumerate abstraction

Remove backported rule and use new dri-enumerate abstraction instead.
dri-enumerate is available in AppArmor 2.13, which recently migrated
into Debian Buster.

Change-Id: I64919edc1882f7bc1e65cfb94686464c5350f699

Gbp-Pq: Name apparmor-cleanups.diff

apparmor-allow-java.security

Gbp-Pq: Name apparmor-allow-java.security.diff

do-not-hide-test-output

Gbp-Pq: Name do-not-hide-test-output.diff

disable-java-in-odk-build-examples-on-zero-vm

Gbp-Pq: Name disable-java-in-odk-build-examples-on-zero-vm.diff

appstream-ignore-startcenter

Gbp-Pq: Name appstream-ignore-startcenter.diff

Hide startcenter and math from the shell

Bug-Ubuntu: https://launchpad.net/bugs/1696250
Forwarded: not-needed

Gbp-Pq: Name hide-math-desktop-file.patch

apparmor-complain

Gbp-Pq: Name apparmor-complain.diff

cppunit-optional

Gbp-Pq: Name cppunit-optional.diff

system-officeotron-and-odfvalidator

Gbp-Pq: Name system-officeotron-and-odfvalidator.diff

no-packagekit-per-default

Gbp-Pq: Name no-packagekit-per-default.diff

javadoc-optional

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gbp-Pq: Name javadoc-optional.diff

fix-internal-hsqldb-build

Gbp-Pq: Name fix-internal-hsqldb-build.diff

disable-flaky-tests

14:13 < mst__> _rene_, the toolkit unoapi tests are known to be flaky (in some
               system dependent way) e.g. on the Win@6 tinderbox it always
               crashes
14:14 < mst__> _rene_, sc.ScAccessible* tests also fail on some systems some of
               the time

Gbp-Pq: Name disable-flaky-tests.diff

debian-hardened-buildflags-no-LO-fstack-protector-strong

don't hardcode -fstack-protector-strong in configure.ac/gbuild. We get the
hardening flags from dpkg-buildflags anyway.

Gbp-Pq: Name debian-hardened-buildflags-no-LO-fstack-protector-strong.diff

debian-hardened-buildflags-CPPFLAGS

Gbp-Pq: Name debian-hardened-buildflags-CPPFLAGS.diff

mediwiki-oor-replace

Gbp-Pq: Name mediwiki-oor-replace.diff

make-package-modules-not-suck

Gbp-Pq: Name make-package-modules-not-suck.diff

jdbc-driver-classpaths

Gbp-Pq: Name jdbc-driver-classpaths.diff

reportdesign-mention-package

Gbp-Pq: Name reportdesign-mention-package.diff

sensible-lomua

===================================================================

Gbp-Pq: Name sensible-lomua.diff

help-msg-add-package-info

Gbp-Pq: Name help-msg-add-package-info.diff