From: Raspbian automatic forward porter Date: Fri, 28 Jan 2022 04:43:14 +0000 (+0000) Subject: Merge version 1:7.2.5-1+rpi1 and 1:7.3.0~rc2-3 to produce 1:7.3.0~rc2-3+rpi1 X-Git-Tag: archive/raspbian/1%7.3.0_rc2-3+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=381d27a0cea0723885c00ee0df8f58f495fcb700;p=libreoffice.git Merge version 1:7.2.5-1+rpi1 and 1:7.3.0~rc2-3 to produce 1:7.3.0~rc2-3+rpi1 --- 381d27a0cea0723885c00ee0df8f58f495fcb700 diff --cc debian/changelog index ac64b3c2e96,075ca8ccf9f..261c6839b67 --- a/debian/changelog +++ b/debian/changelog @@@ -1,69 -1,218 +1,231 @@@ - libreoffice (1:7.2.5-1+rpi1) bookworm-staging; urgency=medium ++libreoffice (1:7.3.0~rc2-3+rpi1) bookworm-staging; urgency=medium + + [changes brought forward from 1:6.0.2-1+rpi2 by Peter Michael Green at Fri, 27 Apr 2018 02:14:18 +0000] + * Disable testsuite. + + [changes introduced in 1:5.4.0-1+rpi1 by Peter Michael Green] + * Disable pdfium, it fails to build for armv6 + + [changes introduced in 1:7.2.4-3+rpi1 by Peter Michael Green] + * Use clang 11, newer versions cause armv7 contamination issues. + - -- Raspbian forward porter Mon, 17 Jan 2022 02:12:08 +0000 ++ -- Raspbian forward porter Fri, 28 Jan 2022 04:43:11 +0000 + - libreoffice (1:7.2.5-1) unstable; urgency=medium + libreoffice (1:7.3.0~rc2-3) unstable; urgency=medium - * New upstream release + * debian/tests/control.in: + - comment out build-needing autopkgtests again by request of the release + team; the infrastructure even on amd64 is not capable of handling it due + due autopkgtest shortcomings + * debian/control.help.in. + - move the browser Depends to Recommends: (closes: #1003864) + * debian/patches/apparmor-updates.diff: add patch to fix saving with + enforced apparmor again, thanks Vincas Dargis (closes: #1004038) - -- Rene Engelhard Wed, 05 Jan 2022 20:14:09 +0100 + -- Rene Engelhard Fri, 21 Jan 2022 20:35:38 +0100 - libreoffice (1:7.2.4-3) unstable; urgency=medium + libreoffice (1:7.3.0~rc2-2) unstable; urgency=medium + + * upload to unstable - * debian/patches/fix-Tdf126116-test.diff: add patch from gerrit; - fix upstream FTBFS timebomb + * debian/tests/control.in, debian/tests/uicheck-{sfx2,svx}: + also run uitests in sfx2 and svx + * debian/tests/control.in: try to optimize the order of the tests + a bit (especially for uicheck-*) to try reusing the testbed and + avoid costly copy(up|down)s - -- Rene Engelhard Thu, 23 Dec 2021 17:18:03 +0100 + -- Rene Engelhard Sun, 16 Jan 2022 11:30:18 +0100 + + libreoffice (1:7.3.0~rc2-1) experimental; urgency=medium + + * New upstream release candidate - libreoffice (1:7.2.4-2) unstable; urgency=medium + -- Rene Engelhard Wed, 12 Jan 2022 20:17:15 +0100 - * debian/patches/fix-e_book_client_connect_direct_sync-sig.diff: - as name says; from libreoffice-7-2 branch - * debian/patches/mdds-2.0-and-orcus-0.17.diff: update + libreoffice (1:7.3.0~rc1-2) experimental; urgency=medium + + * debian/patches/fix-uicheck-tests-on-i386.patch: update + * debian/patches/fix-Tdf126116-test.diff: add upstream patch from gerrit; + fix upstream FTBFS timebomb found by reproducible builds + + * debian/tests/*: rename "uno" to "testtools-bridgetest", since it's + more telling (and inside testtols anyway, uno is just the command + ran) + + -- Rene Engelhard Thu, 23 Dec 2021 17:23:03 +0100 + + libreoffice (1:7.3.0~rc1-1) experimental; urgency=medium + + * New upstream release candidate * debian/rules: + - add support (don't use it (yet)) for using --enable-cipher-openssl-backend + - limit llvm build-dep to le/skia-using archs + - build the mysqlc test only on the archs we run the actual test (at least + for now) - bump liborcus-dev build-depends to >= 0.17.2 if we run the tests - -- Rene Engelhard Fri, 17 Dec 2021 17:57:04 +0100 + -- Rene Engelhard Sun, 28 Nov 2021 16:46:17 +0100 - libreoffice (1:7.2.4-1) unstable; urgency=medium + libreoffice (1:7.3.0~beta1-4) experimental; urgency=medium - * New upstream release + * debian/rules: + - add explicit Build-Depends on llvm since clang doesn't pull in + llvm-xx-linker-tools anymore - * debian/patches/mdds-2.0-and-orcus-0.17.diff, debian/rules, - debian/shlibs.override.orcus: - build against mdds 2.0 and liborcus 0.17 + -- Rene Engelhard Sat, 11 Dec 2021 15:26:54 +0100 - -- Rene Engelhard Wed, 08 Dec 2021 19:45:20 +0100 + libreoffice (1:7.3.0~beta1-3) experimental; urgency=medium - libreoffice (1:7.2.3-2) unstable; urgency=medium + * debian/patches/fix-mysqlc-test.diff: as name says, from gerrit - * debian/changelog: fix (closes: #1000605) + * debian/rules: + - build the connectivity mysqlc test with the rest of the tests so it + doesn't do that in the actual autopkgtest test + - stop hardcoding clang-12 for ppc64el, add build-dep on clang (>= 1:12) + now that 13 is default in sid + * debian/libuno-sal3.symbols: update - -- Rene Engelhard Sun, 28 Nov 2021 15:05:29 +0000 + -- Rene Engelhard Sat, 11 Dec 2021 13:01:18 +0000 - libreoffice (1:7.2.3-1) unstable; urgency=medium + libreoffice (1:7.3.0~beta1-2) experimental; urgency=medium - * New upstream release + * debian/patches/revert-eabcfb3f18a6944d9ad89cecd3eb3ca7a2259cf3.diff: + as name says; revert broken change/test; from upstream gerrit - * debian/patches/icu-70.diff: backport from master; fix build/test - with icu 70 ("TestBreakIterator::testLao() had to be disabled/adapted.") + -- Rene Engelhard Sun, 28 Nov 2021 16:29:51 +0100 + + libreoffice (1:7.3.0~beta1-1) experimental; urgency=medium + + * New upstream beta release + + * debian/patches/pdfium-support-system-libopenjpeg-and-libabsl.diff: + don't use internal libabsl cody copy in pdfium; add conditionalization + for it and openjpeg2 * debian/rules: + - switch WEBDAV_LIB to the curl backend since it now has the test + coverage instead of neon and is default now anyways - actually only set TEST_TIMEOUT if we ignore the test results anyway... - * debian/control*.in: also apply 1:7.2.1-2/-3 changes for - libreoffice-core-nogui... + - add abseil and openjpeg2 to SYSTEM_STUFF if building pdfium + + -- Rene Engelhard Thu, 25 Nov 2021 20:17:04 +0100 + + libreoffice (1:7.3.0~alpha1-6) experimental; urgency=medium - -- Rene Engelhard Tue, 23 Nov 2021 18:52:54 +0100 + * debian/tests/unitcheck. + - remove broken mkdir -p of aboutbox.ui; add mkdir -p + instdir/share/config/soffice.cfg/vcl/ui/.dir which was intended... + + -- Rene Engelhard Wed, 17 Nov 2021 06:08:27 +0100 + + libreoffice (1:7.3.0~alpha1-5) experimental; urgency=medium + + * debian/tests/*, debian/tests/control.in: strip cppunit- from + cppunit-slowcheck and -unitcheck (the latter contains junit checks, too). + Keep it for cppunit-subsequentcheck since that ecplicitely disables + junit (which is tested in junit-subsequentcheck) + * debian/test/unitcheck: + - also filter out the unoidl module (no idea why it + worked in my run and not in ci, but...) + - don't allow test as root, the sal test fails miserably as root + - create missing instdir/share/config/soffice.cfg/vcl/ui/aboutbox.ui + * debian/tests/cppunit-subsequentcheck: add missing cd $SRCDIR + * debian/tests/control.in: + - move smoketest up again (before the test-extension*) tests to stress + it's importance (and it's restricted on archs where we have the + cpppunit tests having build-needed anyway) + + -- Rene Engelhard Mon, 15 Nov 2021 22:19:57 +0100 + + libreoffice (1:7.3.0~alpha1-4) experimental; urgency=medium + + * debian/rules: + - disable LTO on mips64el + - also uncomment smoketest.jar move to -smoketest-data again (although + effectively unused..) (closes: #998435) + - don't check for AUTOPKGTEST_TMP, it seems to not been set in build stage + already (add hack to grep for autopkgtest in pwd instead). + Don't run the checks in build* if in autopkgtest builds (as they are run + later anyway) + - Separate RUN_MAKE_CHECK into BUILD_TESTS/RUN_MAKE_CHECK + - use -g1 on autopkgtest builds (saving disc space/time on all those + copies...) + - don't specify --without-cppunit in CONFIGURE_FLAGS_INDEP per + default (only explicit build-indep builds) + * debian/tests/*, debian/tests/patches/*: + - move cppunit part out of smoketest-standalone.diff into + cppunit-standalone.diff + * debian/tests/control.in: + - make uno superficial, it only runs the bridgetest; remove it from + cppunit-subsequentcheck + - move smoketest after the cppunit tests and run it only on the + architectures those, too (also make it build-needed); add missing + libreoffice-smoketest-data dependency + * debian/tests/*: + - only create config_host.mk when not existing (e.g. architectures having + no tests with build-needed and thus there is no build which created it) + - don't try to run test-extension/odk-build-examples* as root, skip them + if doing so + * debian/tests/control.in, debian/rules: + - don't use @ as dependency in cppunit-* since -nogui conflict with the + "real" ones; populate by dh_listpackages but filter -nogui, -dev-doc and + the l10ns/helps out + * debian/control.in. + - bump ure depends to >= 1:7.3.0~ (closes: #998746) + * debian/tests/cppunit-*: + - fix syntax; add more needed .dir's + + -- Rene Engelhard Mon, 08 Nov 2021 23:06:01 +0100 + + libreoffice (1:7.3.0~alpha1-3) experimental; urgency=medium + + * debian/patches/cppunit-optional.diff: build more stuff in smoketest + not related to cppunit itself (e.g. TestExtension.{jar,oxt}) + + * debian/rules: + - build smoketestdoc.sxw again + + -- Rene Engelhard Sun, 31 Oct 2021 19:10:08 +0100 + + libreoffice (1:7.3.0~alpha1-2) experimental; urgency=medium + + * debian/rules: + - use --without-cppunit in build-indep + - use clang 12 on ppc64el (if building with LTO at least) + - fix autopkgtest builds; explicitely set PACKAGE_SDK_DOCS=n + + -- Rene Engelhard Sun, 31 Oct 2021 09:25:30 +0100 + + libreoffice (1:7.3.0~alpha1-1) experimental; urgency=medium + + * New upstream alpha release + - fixes --enable-lto build with clang (filters out -flto=X) + (closes: #985867) + + * debian/patches/filter-out-lto-flags.diff: remove, was incomplete since + the revert in 1:7.2.1-1 anyway + + * debian/rules: + - use --with-idlc-cpp=cpp to use cpp instead of ucpp and + adapt IDLC_CPP_DEPENDS for -dev accordingly + - build with LTO if we build with mergelibs + - only test the apparmor profiles' syntax on build-indep builds + (since that is where they are installed); move (dh-)apparmor build-deps + to Build-Depends-Indep + * debian/tests/* debian/rules:: + - run the cppunit tests (as superficial tests) and add + a test for manually running CppunitTest_connectivity_mysql_test after + preparing mariadb (also superficial) + - run the smoketest again now that we have a needs-build test anyway and + don't add a hacked smoketestdoc.sxw anymore into smoketest-data - use the + the just-built one + * debian/rules, debian/control.in, debian/joinctrl.py: add new + Build-Depends-Arch: containing the nocheck build-deps needed for make check + on arch-dep builds + * debian/watch: watch alphas/betas + + -- Rene Engelhard Fri, 29 Oct 2021 20:05:00 +0200 libreoffice (1:7.2.2-1) unstable; urgency=medium diff --cc debian/control index 5057a1f9d8f,5e2b99bcd39..ba3b7003b82 --- a/debian/control +++ b/debian/control @@@ -3,18 -3,21 +3,18 @@@ Section: editor Priority: optional Maintainer: Debian LibreOffice Maintainers Uploaders: Rene Engelhard , Chris Halls - Build-Depends: apparmor , - autoconf, + Build-Depends: autoconf, automake, bc, + binutils (>= 2.37-9) [ppc64], bison, bzip2, - clang (>= 1:11) [armel], - clang (>= 1:12) [ppc64el], - clang (>= 1:5.0.2) [alpha amd64 arm64 armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mipsel mips64el], + clang-11 [alpha amd64 arm64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mipsel mips64el ppc64el], coinor-libcoinmp-dev (>= 1.8.3-3), coinor-libcoinutils-dev (>= 2.10.14+repack1-1), + cpp, - debhelper (>= 10.10.4), debhelper-compat (= 12), default-jdk (>= 2:1.9) [!hppa !s390 !sparc !hurd-i386] , - dh-apparmor, dh-python , dpkg-dev (>= 1.20.1), dwz (>> 0.12-3), @@@ -27,6 -30,8 +27,7 @@@ gperf (>= 3.1), java-common (>= 0.61) , javahelper (>= 0.37~) , - junit4 (>= 4.8.2-2) [amd64 arm64] , + libabsl-dev, libabw-dev (<< 0.2~), libabw-dev (>= 0.1), libarchive-zip-perl [!hppa !mips64 !s390 !sparc] , diff --cc debian/rules index 8de1779022a,a3751d4d112..e414b84c91b --- a/debian/rules +++ b/debian/rules @@@ -602,8 -671,41 +673,41 @@@ USE_CLANG= # allow clang for skia? ALLOW_CLANG=y -CLANG_VERSION=default +CLANG_VERSION=11 + ifneq "$(shell echo $(USE_CLANG)$(ALLOW_CLANG) | grep y)" "" + # /usr/bin/ld: /usr/lib/llvm-11/bin/../lib/LLVMgold.so: error loading plugin: /usr/lib/llvm-11/bin/../lib/LLVMgold.so: cannot open shared object file: No such file or directory + # llvm-11-linker-tools does not contain this on ppc64el... + # for mips64el that doesn't exist so disable LTO there... + ifeq "$(ENABLE_LTO)" "y" + ifeq "$(DEB_HOST_ARCH)" "mips64el" + ENABLE_LTO=n + endif + BUILD_DEPS += , clang (>= 1:12) [ppc64el] + # since the llvm-defaults packages pointing to llvm 13(?) it apparently doesn't + # automatically pull in llvm-xx-linker-tools anymore which contains the needed LLVMgold.so + # (see above). + # So build-depend on llvm, too. + # We shouldn't depend on llvm-xx-linker-tools since this probably should be + # version-agnostic when the default changes (unless explicitely specified of course). + ifeq "$(USE_CLANG)" "y" + ifeq "$(CLANG_VERSION)" "default" + BUILD_DEPS += , llvm + else + BUILD_DEPS += , llvm-$(CLANG_VERSION)-linker-tools + endif + else + ifeq "$(ALLOW_CLANG)" "y" + ifeq "$(CLANG_VERSION)" "default" + BUILD_DEPS += , llvm [$(OOO_LE_ARCHS)] + else + BUILD_DEPS += , llvm-$(CLANG_VERSION)-linker-tools [$(OOO_LE_ARCHS)] + endif + endif + endif + endif + endif + ifeq "$(USE_CLANG)" "y" ENABLE_COMPILER_PLUGINS=n endif