Manual merge of version 1:5.4.1-1+rpi1 and 1:5.4.2-3 to produce 1:5.4.2-3+rpi1

Merge libreoffice (1:5.4.2-3) import into refs/heads/workingbranch

ww8export-HAVE_MORE_FONTS

Gbp-Pq: Name ww8export-HAVE_MORE_FONTS.diff

use pkg-config --modversion to check for ICU version

... since icu-config is removed at least in Debians icu 59.1 packages.
icu-i18n exists since exactly 4.6 (which we require anyway) so we can
remove that check, too

Change-Id: I28bd1509dcc2c52e22f91fb26421fcd585323b24

Gbp-Pq: Name icu-no-icu-config.diff

stop-shipping-mimelnk-desktop-files

Gbp-Pq: Name stop-shipping-mimelnk-desktop-files.diff

gb_SUPPRESS_TESTS to build tests but not run them

Change-Id: I390b97bbacfc123b952be2b54cf1333b4d5c24a7

Gbp-Pq: Name gb_SUPPRESS_TESTS.diff

disable-unused-test-programs

Gbp-Pq: Name disable-unused-test-programs.diff

cppunit-optional

Gbp-Pq: Name cppunit-optional.diff

disable-some-sc-tests-with-internal-cppunit

# fails with internal cppunit:
#
# [build LNK] CppunitTest/libtest_sc_subsequent_filters_test.so
# S=/data/rene/git/LibreOffice/master && I=$S/instdir && W=$S/workdir &&  /usr/bin/ccache x86_64-linux-gnu-g++ -shared -Wl,-z,noexecstack   -Wl,-z,origin '-Wl,-rpath,$ORIGIN/../Library' -Wl,-rpath-link,$I/program -Wl,-z,defs -Wl,-rpath-link,/lib:/usr/lib -Wl,-z,combreloc  -Wl,--hash-style=gnu  -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo -Wl,-Bsymbolic-functions  -L$W/LinkTarget/StaticLibrary -L$I/sdk/lib  -L$I/program  -L$I/program  -L$W/LinkTarget/Library -Wl,-z,relro   -L/usr/lib/x86_64-linux-gnu  -L/usr/lib/x86_64-linux-gnu  -L/usr/lib/x86_64-linux-gnu   $W/CxxObject/sc/qa/unit/subsequent_filters-test.o      -Wl,--start-group    -L$W/UnpackedTarball/cppunit/src/cppunit/.libs -lcppunit  -lxml2 -lorcus-0.12 -lorcus-parser-0.12 -lboost_filesystem  -lboost_iostreams -lz -Wl,--end-group -Wl,--no-as-needed -lmergedlo -luno_cppu -luno_cppuhelpergcc3 -lforlo -lforuilo -li18nlangtag -looxlo -luno_sal -luno_salhelpergcc3 -lsclo -lscqahelper -lsubsequenttest -ltest -lunotest -lvbahelperlo  -o $W/LinkTarget/CppunitTest/libtest_sc_subsequent_filters_test.so
# /data/rene/git/LibreOffice/master/workdir/CxxObject/sc/qa/unit/subsequent_filters-test.o:(.data.rel.ro._ZTIN7CppUnit17AdditionalMessageE[_ZTIN7CppUnit17AdditionalMessageE]+0x10): undefined reference to `typeinfo for CppUnit::Message'
# collect2: error: ld returned 1 exit status
# /data/rene/git/LibreOffice/master/solenv/gbuild/LinkTarget.mk:598: recipe for target '/data/rene/git/LibreOffice/master/workdir/LinkTarget/CppunitTest/libtest_sc_subsequent_filters_test.so' failed
# make[4]: *** [/data/rene/git/LibreOffice/master/workdir/LinkTarget/CppunitTest/libtest_sc_subsequent_filters_test.so] Error 1
#
# interestingly, this works with system-cppunit...

Gbp-Pq: Name disable-some-sc-tests-with-internal-cppunit.diff

no-openssl

don't add -lssl etc if not needed (because we use system-postgresql)

Gbp-Pq: Name no-openssl.diff

system-officeotron-and-odfvalidator

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

Revert "always support packagekit if dbus is enabled"

This reverts commit f2984e95740cfbb9c74574f2a1225af3411d4901.

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

rsc-no-error-about-unknown-switch

Gbp-Pq: Name rsc-no-error-about-unknown-switch.diff

hppa-is-32bit

Gbp-Pq: Name hppa-is-32bit.diff

odk-no-dot

Gbp-Pq: Name odk-no-dot.diff

make ConnectivityTools a normal target, so we can pack it

Gbp-Pq: Name build-connectivitytools.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.

Gbp-Pq: Name javadoc-optional.diff

fix-internal-hsqldb-build

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

disable-flaky-tests

Gbp-Pq: Name disable-flaky-tests.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

mysqlcppconn-libmysqlclient-SONAME

Gbp-Pq: Name mysqlcppconn-libmysqlclient-SONAME.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

split-evoab

Gbp-Pq: Name split-evoab.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 (1:5.4.2-3) unstable; urgency=medium

  * debian/patches/ww8export-HAVE_MORE_FONTS.diff, debian/rules: revert
    change of -2. Actually doesn't work. (Did in a testbuild, but...)

[dgit import unpatched libreoffice 1:5.4.2-3]

Import libreoffice_5.4.2-3.debian.tar.xz

[dgit import tarball libreoffice 1:5.4.2-3 libreoffice_5.4.2-3.debian.tar.xz]

Import libreoffice_5.4.2.orig.tar.xz

[dgit import orig libreoffice_5.4.2.orig.tar.xz]

Import libreoffice_5.4.2.orig-helpcontent2.tar.xz

[dgit import orig libreoffice_5.4.2.orig-helpcontent2.tar.xz]

Import libreoffice_5.4.2.orig-translations.tar.xz

[dgit import orig libreoffice_5.4.2.orig-translations.tar.xz]

Manual merge of version 1:5.4.0-1+rpi1 and 1:5.4.1-1 to produce 1:5.4.1-1+rpi1

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

tdf#100501: Adapt to Java 9 (at least on Linux x86-64)

Checking with both jdk-9+181_linux-x64_bin.tar.gz and
jre-9+181_linux-x64_bin.tar.gz as currently available at
<http://jdk.java.net/9/> "JDK 9 Early-Access Builds":

For one, make SunVersion::init understand <http://openjdk.java.net/jeps/223>
"JEP 223: New Version-String Scheme" at least insofar as to accept strings like
"9" with less than three dot-separated segments (where the missing segments are
treated like "0").

For another, at least for Linux x86-64, libjvm.so is now apparently located in a
path without an "amd64" architecture segment, "lib/server/libjvm.so".  (But
could that also be "client"?)  Other platforms may need further adjustments.

Change-Id: Idcebc833472c81a1dc74dcdd481b0a37274a8713

Gbp-Pq: Name java9.diff

stop-shipping-mimelnk-desktop-files

Gbp-Pq: Name stop-shipping-mimelnk-desktop-files.diff

gb_SUPPRESS_TESTS to build tests but not run them

Change-Id: I390b97bbacfc123b952be2b54cf1333b4d5c24a7

Gbp-Pq: Name gb_SUPPRESS_TESTS.diff

disable-unused-test-programs

Gbp-Pq: Name disable-unused-test-programs.diff

cppunit-optional

Gbp-Pq: Name cppunit-optional.diff

disable-some-sc-tests-with-internal-cppunit

# fails with internal cppunit:
#
# [build LNK] CppunitTest/libtest_sc_subsequent_filters_test.so
# S=/data/rene/git/LibreOffice/master && I=$S/instdir && W=$S/workdir &&  /usr/bin/ccache x86_64-linux-gnu-g++ -shared -Wl,-z,noexecstack   -Wl,-z,origin '-Wl,-rpath,$ORIGIN/../Library' -Wl,-rpath-link,$I/program -Wl,-z,defs -Wl,-rpath-link,/lib:/usr/lib -Wl,-z,combreloc  -Wl,--hash-style=gnu  -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo -Wl,-Bsymbolic-functions  -L$W/LinkTarget/StaticLibrary -L$I/sdk/lib  -L$I/program  -L$I/program  -L$W/LinkTarget/Library -Wl,-z,relro   -L/usr/lib/x86_64-linux-gnu  -L/usr/lib/x86_64-linux-gnu  -L/usr/lib/x86_64-linux-gnu   $W/CxxObject/sc/qa/unit/subsequent_filters-test.o      -Wl,--start-group    -L$W/UnpackedTarball/cppunit/src/cppunit/.libs -lcppunit  -lxml2 -lorcus-0.12 -lorcus-parser-0.12 -lboost_filesystem  -lboost_iostreams -lz -Wl,--end-group -Wl,--no-as-needed -lmergedlo -luno_cppu -luno_cppuhelpergcc3 -lforlo -lforuilo -li18nlangtag -looxlo -luno_sal -luno_salhelpergcc3 -lsclo -lscqahelper -lsubsequenttest -ltest -lunotest -lvbahelperlo  -o $W/LinkTarget/CppunitTest/libtest_sc_subsequent_filters_test.so
# /data/rene/git/LibreOffice/master/workdir/CxxObject/sc/qa/unit/subsequent_filters-test.o:(.data.rel.ro._ZTIN7CppUnit17AdditionalMessageE[_ZTIN7CppUnit17AdditionalMessageE]+0x10): undefined reference to `typeinfo for CppUnit::Message'
# collect2: error: ld returned 1 exit status
# /data/rene/git/LibreOffice/master/solenv/gbuild/LinkTarget.mk:598: recipe for target '/data/rene/git/LibreOffice/master/workdir/LinkTarget/CppunitTest/libtest_sc_subsequent_filters_test.so' failed
# make[4]: *** [/data/rene/git/LibreOffice/master/workdir/LinkTarget/CppunitTest/libtest_sc_subsequent_filters_test.so] Error 1
#
# interestingly, this works with system-cppunit...

Gbp-Pq: Name disable-some-sc-tests-with-internal-cppunit.diff

no-openssl

don't add -lssl etc if not needed (because we use system-postgresql)

Gbp-Pq: Name no-openssl.diff

system-officeotron-and-odfvalidator

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

Revert "always support packagekit if dbus is enabled"

This reverts commit f2984e95740cfbb9c74574f2a1225af3411d4901.

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

rsc-no-error-about-unknown-switch

Gbp-Pq: Name rsc-no-error-about-unknown-switch.diff

hppa-is-32bit

Gbp-Pq: Name hppa-is-32bit.diff

odk-no-dot

Gbp-Pq: Name odk-no-dot.diff

make ConnectivityTools a normal target, so we can pack it

Gbp-Pq: Name build-connectivitytools.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.

Gbp-Pq: Name javadoc-optional.diff

fix-internal-hsqldb-build

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

disable-flaky-tests

Gbp-Pq: Name disable-flaky-tests.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

mysqlcppconn-libmysqlclient-SONAME

Gbp-Pq: Name mysqlcppconn-libmysqlclient-SONAME.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

split-evoab

Gbp-Pq: Name split-evoab.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 (1:5.4.1-1) unstable; urgency=medium

  * New upstream release
    - fixes middle click paste (closes: #871588)

  * debian/patches/stop-shipping-mimelnk-desktop-files.diff: as name says
    (closes: #872001)
  * debian/patches/java9.diff: backport Java 9 patch from master

  * debian/rules:
    - install appstream stuff into /usr/share/metainfo. sigh.
    - make -writer-dbgsym recommend -core-dbgsym as it wants some gdb stuff
      from it
    - set UNO_LIBS_DBG_ROOT to fix gdb helper installation for uno-libs3 again
      and make -core-dbgsym recommends uno-libs3-dbgsym (same reason as above)
    - generate and install apparmor profiles
    - be consequent and bump the build-dependencies for the DLP libs when
      we run the tests; based on patch by Rico Tzschichholz
    - run dh_strip_nondeterminism
    - disable -kde and the (unmaintained for LO) oxygen theme.
      Qt4 should go away. See
      https://lists.debian.org/debian-devel-announce/2017/08/msg00006.html
    - set locale to en-US.UTF-8 also for make check, the dbaccess tests
      fail in some frenchy locale...
    - remove libbz2-dev from Build-Depends, coinutils got fixed
    - move pagein-{calc,draw,impress,writer} to their respective packages
    - move dk.mk from -dev-common to -dev as it's not arch-indep, thanks
      Rico Tzschichholz
  * debian/scripts/gid2pkgdirs.sh: fix move of types/*.rdb and services/*.rdb
    to core and move pagein-common there too. They reference libmergedlo.so
    which doesn't exist on all archs (closes: #873443)
  * debian/control*in:
    - move to policy 4.0.1; extra -> optional
    - Breaks/Replaces for above

[dgit import unpatched libreoffice 1:5.4.1-1]

Import libreoffice_5.4.1.orig.tar.xz

[dgit import orig libreoffice_5.4.1.orig.tar.xz]

Import libreoffice_5.4.1.orig-helpcontent2.tar.xz

[dgit import orig libreoffice_5.4.1.orig-helpcontent2.tar.xz]

Import libreoffice_5.4.1.orig-translations.tar.xz

[dgit import orig libreoffice_5.4.1.orig-translations.tar.xz]

Import libreoffice_5.4.1-1.debian.tar.xz

[dgit import tarball libreoffice 1:5.4.1-1 libreoffice_5.4.1-1.debian.tar.xz]

Regenerate debian/control

Disable pdfium, it seems to fail to build on armv6

Manual merge of version 1:5.3.5~rc1-3+rpi1 and 1:5.4.0-1 to produce 1:5.4.0-1+rpi1

pseudomerge to tie together broken upstream history

Merge libreoffice (1:5.3.5~rc1-3+rpi1) import into refs/heads/workingbranch

use ifeq "$(SDK_AUTO_DEPLOYMENT)" "YES"

... instead of ifneq "$(SDK_AUTO_DEPLOYMENT)" "", as the variable is = NO
if disabled

Change-Id: I7dd2d165235f5cb7e55a8fed628ada71b04c7881

Gbp-Pq: Name examples-fix-SDK_AUTO_DEPLOYMENT-check.diff

sdk-cat-sed-bin

Gbp-Pq: Name sdk-cat-sed-bin.diff

Re-enable building with ICU 59, tdf#108043 follow-up

After having reverted to internal ICU 58, still be able to build with ICU 59.

Change-Id: If2cf651aaacee5f64bee737f9da140b913ebd510
Reviewed-on: https://gerrit.libreoffice.org/38154
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
Gbp-Pq: Name icu-59-uchar.diff

odk settings.mk: add various missing JAVA_PROC_TYPE overrides for Linux arches

... which were missing since ~ ever but now break the odk_build-examples test
with /usr/bin/ld: cannot find -ljawt

Change-Id: Ie504ce0c8e21c7d58f1b7e591505940a2f80a2ea

Gbp-Pq: Name odk-settings-JAVA_PROC_TYPE.diff

use (new) -mlong-jump-table-offsets on m68k for libxo

Change-Id: I6e2886e2de4f3502c74f1e367216066352994865

Gbp-Pq: Name m68k-use-mlong-jump-table-offsets.diff

gtk3: implement opengl support for slideshow

all of them work, except "Fall" doesn't look right, but it has
the exact same problem under gtk2/gen to.

Change-Id: I73cb9c0fb8211f727198be78d90d4f80a4f8c7c8
Reviewed-on: https://gerrit.libreoffice.org/31214
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Gbp-Pq: Name gtk3-opengl-slideshow.diff

change from glew to epoxy

because that works under wayland out of the box and gtk3 uses it already

Change-Id: Iefaac31e325534a81a5389f752804af917c1baef
Reviewed-on: https://gerrit.libreoffice.org/31213
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Gbp-Pq: Name change-from-glew-to-epoxy.diff

m68k-alignment

Gbp-Pq: Name m68k-alignment.diff

no-openssl

don't add -lssl etc if not needed (because we use system-postgresql)

Gbp-Pq: Name no-openssl.diff

system-officeotron-and-odfvalidator

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

Revert "always support packagekit if dbus is enabled"

This reverts commit f2984e95740cfbb9c74574f2a1225af3411d4901.

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

rsc-no-error-about-unknown-switch

Gbp-Pq: Name rsc-no-error-about-unknown-switch.diff

hppa-is-32bit

Gbp-Pq: Name hppa-is-32bit.diff

odk-no-dot

Gbp-Pq: Name odk-no-dot.diff

make ConnectivityTools a normal target, so we can pack it

Gbp-Pq: Name build-connectivitytools.diff

lo-xlate-lang-update

Gbp-Pq: Name lo-xlate-lang-update.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.

Gbp-Pq: Name javadoc-optional.diff

fix-internal-hsqldb-build

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