From: Peter Michael Green Date: Thu, 14 Dec 2023 23:40:35 +0000 (+0000) Subject: Manual merge of version 4:7.4.7-1+rpi1 and 4:7.6.4~rc1-1 to produce 4:7.6.4~rc1-1... X-Git-Tag: archive/raspbian/4%7.6.4_rc1-1+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1a9f247b57b47459f81732c55b0e19f14a1763e6;p=libreoffice.git Manual merge of version 4:7.4.7-1+rpi1 and 4:7.6.4~rc1-1 to produce 4:7.6.4~rc1-1+rpi1 --- 1a9f247b57b47459f81732c55b0e19f14a1763e6 diff --cc debian/changelog index 971ed33c575,e1a975f6d11..3fe41f00083 --- a/debian/changelog +++ b/debian/changelog @@@ -1,20 -1,395 +1,408 @@@ - libreoffice (4:7.4.7-1+rpi1) bookworm-staging; urgency=medium ++libreoffice (4:7.6.4~rc1-1+rpi1) trixie-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 Sat, 29 Jul 2023 11:30:18 +0000 ++ -- Peter Michael Green Wed, 20 Dec 2023 07:24:12 +0000 + - libreoffice (4:7.4.7-1) bookworm; urgency=medium + libreoffice (4:7.6.4~rc1-1) unstable; urgency=medium - * "New" upstream release + * New upstream release candidate + -- Rene Engelhard Thu, 30 Nov 2023 19:47:03 +0100 + + libreoffice (4:7.6.3-2) unstable; urgency=medium + + * debian/rules: + - ooops, revert unintended use of internal mdds, orcus + + -- Rene Engelhard Mon, 27 Nov 2023 19:15:44 +0100 + + libreoffice (4:7.6.3-1) unstable; urgency=medium + + * LibreOffice 7.6.3 final release (identical to rc2) + + * upload to unstable + + * debian/tests/testtools-bridgetest-with-java: re-gen config_host.mk if + ENABLE_JAVA=n (testtools-bridgetest-without-java run before) + * debian/rules: + - revert back to using gnutls on bookworm-backports, librdf0-dev doesn't + allow the ssl alternative yet... + - add -fexcess-precision=fast to DEB_CFLAGS_MAINT_APPEND + and (although supposedly no effect) DEB_CXXFLAGS_MAINT_APPEND since + it seems it fixes the bridgetest problem on s390x/nojava; + remove strict gcc-12/-13 build-dep on s390x again + + -- Rene Engelhard Mon, 27 Nov 2023 17:35:03 +0100 + + libreoffice (4:7.6.3~rc2-2) experimental; urgency=medium + + * debian/control.ure.in: + - make ure-java actutally Architecture: %OOO_JAVA_ARCHS% + * debian/rules: + - support nogir build profile + * debian/control.gtk3.in: add Build-Profiles: + * debian/tests/control*in: update for no-Java builds + - split testtools-bridgetest into with-java/without-java variants + - add new %OOO_JAVA_AND_NOGUI_ARCHS% + - make test-extensions-*, odk-build-examples-java + Architecture: %OOO_JAVA_AND_NOGUI_ARCHS% + - make sdk-complete %OOO_JAVA_ARCHS% + + -- Rene Engelhard Sun, 19 Nov 2023 13:15:15 +0000 + + libreoffice (4:7.6.3~rc2-1) experimental; urgency=medium + + * New upstream release candidate + + * debian/control*in: + - add missing Build-Profiles: + - add missing Build-Profiles: + * debian/rules: + - disable Java on ppc64el, s390x and armhf. Java bridge broken, + works without Java + - fix/improve no-Java builds: + + don't try to install dbreport config modules into + -uiconfig-report-builder if the report builder is disabled + + switch OOO_BASE_ARCHS/OOO_REPORTBUILDER_ARCHS variables + (build base on all architectures instead of Java architectures + and report-builder-* only on archs where Java is enabled, not on + "all base archs"); there's -sdbc-{mysql,postgresql,firebird} anyway + + don't try to build Jar_{OOoRunner,test,ConnectivityTools} if Java is + disabled as an extra safety net (instead of checking for junit only) + - remove riscv64 from OOO_CHECK_ARCHS to run only the "smoketest tests" + - bump libcmis build-dep to >= 0.6.1 + - build against libcurl4-openssl-dev instead of gnutls + + -- Rene Engelhard Fri, 17 Nov 2023 07:05:17 +0100 + + libreoffice (4:7.6.3~rc1-2) experimental; urgency=medium + + * debian/rules: + - readd fonts-crosextra-caladea build-dep; Cambria usage is back + * debian/control.in: + - duplicate Replaces: as Breaks: in -uiconfig-* (closes: #1055267) + + -- Rene Engelhard Fri, 03 Nov 2023 17:59:51 +0100 + + libreoffice (4:7.6.3~rc1-1) experimental; urgency=medium + + * New upstream release candidate + + * debian/rules: + - re-enable cmis; bump libcmis build-dep to >= 0.6.0 + + -- Rene Engelhard Fri, 03 Nov 2023 06:14:16 +0100 + + libreoffice (4:7.6.2-5) experimental; urgency=medium + + * oops, reupload with correct control + + -- Rene Engelhard Tue, 31 Oct 2023 05:03:27 +0000 + + libreoffice (4:7.6.2-4) experimental; urgency=medium + + * debian/patches/patches/orcus-make-reference-resolver-available.diff: add + from upstream master; fix tests with orcus 0.19 + + * debian/rules: + - bump gcc build-deps to gcc defaulting to --disable-s390-excess-float-precision + on s390x - the bridge test fails otherwise (with-Java still fails, + though...) + * debian/control: regen with proper Bugs:, oops + + -- Rene Engelhard Mon, 30 Oct 2023 18:57:35 +0000 + + libreoffice (4:7.6.2-3) experimental; urgency=medium + + * debian/patches/kahansum-test-SSE2.diff: backport from upstream + libreoffice-7-6 branch to fix test failure on !amd64 + + -- Rene Engelhard Wed, 18 Oct 2023 20:45:52 +0200 + + libreoffice (4:7.6.2-2) experimental; urgency=medium + + * debian/rules: + - allow liborcus 0.19, it's supposed to be API/ABI-compatible with 0.18 + + -- Rene Engelhard Tue, 03 Oct 2023 14:13:35 +0200 + + libreoffice (4:7.6.2-1) experimental; urgency=medium + + * New upstream release + + * merge from Ubuntu: + [ Rico Tzschichholz ] + - debian/rules: build with -ffp-contract=off on s390x, too + + * debian/patches/fix-ppc64el-bridges.diff: add from upstream gerrit + * debian/rules: + - go sure and add Build-Conflicts: against clang if arch is not in + OOO_CLANG_ARCHS since ./configure will pick up an installed clang + anyways otherwise + - remove special-casing of using gcc-12 on s390x. While it fails with + gcc 12 *and* 13 13 actually somehow has *lesser* failures, so just use + that one + + -- Rene Engelhard Mon, 02 Oct 2023 21:53:56 +0200 + + libreoffice (4:7.6.1~rc2-2) experimental; urgency=medium + + * merge from Ubuntu: + [ Rico Tzschichholz ] + - debian/rules: Fix move of + /usr/lib/libreoffice/share/config/soffice.cfg/simpress + - debian/tests/control: testtools-bridgetest requires default-jdk + - debian/patches/fix-armhf-linker.diff: Fix linking of libswlo.so + on armhf + + * debian/tests/control.in: add ure-java and liblibreoffice-java to + testtools-bridgetests' dependencies, too + + -- Rene Engelhard Mon, 11 Sep 2023 10:16:34 +0530 + + libreoffice (4:7.6.1~rc2-1) experimental; urgency=medium + + * New upstream release candidate + + * debian/rules: + - build with -ffp-contract=off on ppc64el + + -- Rene Engelhard Thu, 07 Sep 2023 17:29:44 +0200 + + libreoffice (4:7.6.1~rc1-1) experimental; urgency=medium + + * New upstream release candidate + + * debian/rules: + - fix install of template(s) on bn-IN + + -- Rene Engelhard Wed, 23 Aug 2023 18:51:26 +0200 + + libreoffice (4:7.6.0~rc3-1) experimental; urgency=medium + + * New upstream release candidate + + * debian/patches/fix-{riscv64,loong64}-bridges.diff: as name says; from + upstream master + * debian/patches/curl-8.2.0.diff: add from upstream master; Adapt test + code to cURL 8.2.0 + + -- Rene Engelhard Tue, 08 Aug 2023 21:57:28 +0200 + + libreoffice (4:7.6.0~rc2-2) experimental; urgency=medium + + * debian/patches/fix-pdfexport-test.diff: add missing piece (as done + in upstream libreoffice-7.6.0.2-buildfix1 tag) to fix pdfexport test + + * debian/rules: + - use gcc for skia on mipsel/mips64el, too + + -- Rene Engelhard Sat, 29 Jul 2023 10:47:21 +0200 + + libreoffice (4:7.6.0~rc2-1) experimental; urgency=medium + + [ Rene Engelhard ] + * New upstream release candidate + + * debian/control.reportbuilder.in: also fix version in Replaces: here + (closes: #1041899) + * debian/watch: watch rcs again + * debian/rules, debian/control.gtk4.in: move libavmediagtk.so to -gtk4 + + [ merge from Ubuntu ] + * debian/rules: + - use gcc for skia on ppc64el for now + + -- Rene Engelhard Wed, 26 Jul 2023 20:19:42 +0200 + + libreoffice (4:7.6.0~rc1-2) experimental; urgency=medium + + [ merge from Ubuntu ] + * debian/rules: + + Use gcc-12 on s390x + + Build-dep on fonts-* regardless to provide a more complete testbed + + [ Rene Engelhard ] + * debian/patches/dp_platform-riscv64-and-loongarch64.diff: actually make + riscv64 and loongarch64 known to "the deployment" + * debian/tests/patches/smoketest-disable-extension-tests.diff: run the smoketest + also when extensions are disabled; we patch that out of the smoketest then + anyway + + * debian/rules: + - add more "no-make-check checks". sal, cppu(helper), comphelper, unoidl + - build with noopt (aka -O0) on riscv64 (closes: #1039906) + - force clang-14 | clang (<< 1:15~) on ppc64el for now + - introduce new OOO_AUTOPKGTEST_ARCHS ("archs where autopkgtest + theoretically are ran") and restrict the fonts-* build-deps to those + (so that fonts-* needed in the uitests are there) + - rm -f libdeploymentgui.so unconditionally for core-nogui; also remove when the + arch is not in OOO_EXTENSIONS_ARCHS; also remove unopkg.bin and libunopkgapp.so + from core if we built without extension support + - also force gcc-12 for i386 + + -- Rene Engelhard Mon, 24 Jul 2023 20:33:16 +0000 + + libreoffice (4:7.6.0~rc1-1) experimental; urgency=medium + + * New upstream release candidate + + * debian/patches/we-dont-have-the-needed-fonts.diff: disable test which + needs fonts neither provided in Debian (nor even upstream) + * debian/patches/bash-completion-updates.diff: add pages to lowriters bash + completion (closes: #1033186) + * debian/temporarily-disable-test-metadata-test.diff: remove, apparently + works now + * debian/patches/fix-i386-build.diff: as name says, from upstream gerrit + + * debian/control.in: + - fix version in Replaces: in -uiconfig-* + * debian/rules: + - use --disable-cve-tests on 32bit archs. Fails consistently there on one + CVE which was a memory leak in tiff and a excpected failure here anyway. + Fixed in tiff ages ago and we're not really supposed to test others' CVEs as + we use external libs anyway + - again run full make check on amd64/arm64/riscv64(!) (and armhf); make fatal + - only run testtools' bridgetest, "smoketest" as smoketest and the pyuno + tests on all architectures except amd64/amd64/riscv64/armhf + - build-depend on libcppunit-dev on all archs + - clean up some make-check-only Build-Depends(-Arch) + - move impress' own soffice.cfg which didn't yet end up in + uiconfig-impress actually there (e.g. layoutlist.xml, which is needed by + Draw) + * debian/tests/smoketest: run smoketest using make subsquentcheck in smoketest + * debian/rules, debian/control.in: + - change fonts-liberation2 Build-Depends/Recommends in -common to + fonts-liberation (>= 1:2) + - change fonts-liberation2 Build-Depends to fonts-liberation (>= 1:2) + + -- Rene Engelhard Fri, 07 Jul 2023 19:25:47 +0200 + + libreoffice (4:7.6.0~beta1-3) experimental; urgency=medium + + * debian/patches/fix-arm64-tests.diff: as name says, from upstream + libreoffice-7-6 branch + * debian/source/include-binaries: add changed .emf files + + * debian/patches/adapt-for-new-carlito.diff: as name says; adapt two + (and disable one for now since iit has calculated values..) test(s) which + break with fonts-crosextra-carlito 20230309. Bump build-dependency. + Revert all of this for bookworm-backports. + + * debian/rules: + - restrict -2 changes to make test failures only fatal on release + architectures + upcoming release architectures (like riscv64). + Still build and run the tests on all architectures. + * debian/rules, debian/control.in: + - recommend fonts-liberation+fonts-liberation-sans-narrow instead of both + fonts-liberation and fonts-liberation2; keep old recommends + for bookworm-backports, thanks Fabian Greffrath for the MR + + -- Rene Engelhard Sat, 24 Jun 2023 00:01:05 +0200 + + libreoffice (4:7.6.0~beta1-2) experimental; urgency=medium + + * merge from Ubuntu: + - Update tests/patches/testtools-standalone.diff + * debian/rules, debian/control.in: + - remove version constraints on build-deps and pre-depends fullfillable + since oldstable (or stable if oldstable didn't contain it even) + * debian/rules: + - make all architectures' make check fatal again based on discussion + on #debian-release (especially needed to prevent riscv64 entering + the archive with miserably failing the tests) + - also enable the junit tests on all architectures + + -- Rene Engelhard Sat, 10 Jun 2023 17:50:50 +0200 + + libreoffice (4:7.6.0~beta1-1) experimental; urgency=medium + + * New upstream beta release + + * debian/rules, debian/control.in, debian/tests/control.in, + debian/tests/scriptforge-import: split scriptforge.py into a new + python3-scriptforge and install to standard path as it (as for + access2base) is supposed to be a import'able library + * debian/rules: handle upstream feature to handle their coredumps with + coredumpctl on test failures during tests. build-depend on + add systemd , systemd-coredump , jq + on archs running the tests if USE_SYSTEMD=y (That one is off per default + since it apparently doesn't work in chroots); add Build-Conflicts to + systemd-coredump to not "accidentially" enable it somewhere + to handle their coredumps with coredumpctl upstream + * debian/rules: + - enable gtk4 (at least for experimental for now to save NEW if we want + to actually do it) + * debian/rules, debian/control*.in: + - remove UI related workarounds and split all the .xml/.ui into extra + -uiconfig-xyz packages. Make impress-nogui depend on uiconfig-impress + - and also draw depend on it in addition to -uiconfig-draw + + -- Rene Engelhard Fri, 09 Jun 2023 16:29:31 +0200 + + libreoffice (4:7.5.4-1) unstable; urgency=medium + + * LibreOffice 7.5.4 final release (identical to rc2) + + * upload to unstable + + * debian/rules: + - give up and don't remove ui files anymore in nogui for now; planned + to be changed to shared packages later + + -- Rene Engelhard Mon, 05 Jun 2023 20:26:03 +0200 + + libreoffice (4:7.5.4~rc2-1) experimental; urgency=medium + + * New upstream release candidate + + * debian/rules: + - don't remove tabviewbar.ui in -impress-nogui (closes: #1028290) + + -- Rene Engelhard Wed, 31 May 2023 19:14:16 +0200 + + libreoffice (4:7.5.4~rc1-4) experimental; urgency=medium + + * debian/rules: + - fix duplicate ppc64el in clang (>= 8.0.1) build-dep causing it not + ending up in the .dsc alltogether. + Introduce new OOO_{,NO_}CLANG_ARCHS. + - use the same architecture !-list for llvm, too + + -- Rene Engelhard Thu, 18 May 2023 21:34:31 +0200 + + libreoffice (4:7.5.4~rc1-3) experimental; urgency=medium + + * debian/rules: + - micro-optimize freetype build-dep after the clang change in + 4:7.5.4~rc1-1: + use OOO_LE_ARCHS for >= 2.8.1 and add any BE arch for >= 2.2.0 + - oops, set PACKAGE_GEN=y per default + + -- Rene Engelhard Thu, 18 May 2023 18:44:02 +0200 + + libreoffice (4:7.5.4~rc1-2) experimental; urgency=medium + + * oops, actually include tarballs/ + + -- Rene Engelhard Thu, 18 May 2023 11:23:13 +0200 + + libreoffice (4:7.5.4~rc1-1) experimental; urgency=medium + + * New upstream release candidate + + * debian/rules, debian/control.in: + - move share/config/soffice.cfg/simpress/{layoutlist,objectlist,styles}.xml + and share/config/modules/soffice.cfg/simpress/ui/sidebarslidebackground.ui + from -impress to -draw since without them Draw doesn't start anymore * debian/control.postgresql.in: - depend on libreoffice-core-nogui | libreoffice-core (like the other -sdbc-*) (closes: #1034792) diff --cc debian/control index dc127f12b9d,24b6503fc0f..d4722c5b04b --- a/debian/control +++ b/debian/control @@@ -9,38 -9,37 +9,36 @@@ Build-Depends: autoconf binutils (>= 2.37-9) [ppc64], bison, bzip2, - clang [!alpha !hppa !ia64 !m68k !mips !mipsel !mips64 !mips64el !powerpc !powerpcspe !ppc64 !ppc64el !s390x !sparc !sparc64], + 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, + coinor-libcoinmp-dev, + coinor-libcoinutils-dev, debhelper-compat (= 12), default-jdk (>= 2:1.9) [!hppa !hurd-i386 !kfreebsd-amd64 !kfreebsd-i386 !hurd-i386 !powerpcspe !s390 !sparc] , dh-python , - dpkg-dev (>= 1.20.1), - dwz (>> 0.12-3), - firebird-dev (>= 3.0.0.32483.ds4-4) [!hppa !kfreebsd-amd64 !kfreebsd-i386 !mips64 !powerpcspe !s390 !sparc], - flex (>= 2.3.35), + firebird-dev, + flex, fontforge-nox | fontforge, - g++ (>= 4:7), - gcc (>= 4:7), - gobject-introspection (>= 1.32.0), - gperf (>= 3.1), - java-common (>= 0.61) , - javahelper (>= 0.37~) , - libabsl-dev, + g++-12 [i386], + gcc-12 [i386], + gobject-introspection , + gperf, + java-common (>= 0.75) , + javahelper , - junit4 [amd64 arm64] , + libabsl-dev [alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 loong64 m68k mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el riscv64 s390x sparc sparc64], libabw-dev (<< 0.2~), libabw-dev (>= 0.1), - libarchive-zip-perl [!hppa !kfreebsd-amd64 !kfreebsd-i386 !mips64 !powerpcspe !s390 !sparc] , + libarchive-zip-perl [!armhf !hppa !kfreebsd-amd64 !kfreebsd-i386 !mips64 !powerpcspe !ppc64el !s390x !sparc] , + libatk1.0-dev, libavahi-client-dev, - libbase-java [!hppa !kfreebsd-amd64 !kfreebsd-i386 !mips64 !powerpcspe !s390 !sparc] , + libbase-java [!armhf !hppa !kfreebsd-amd64 !kfreebsd-i386 !mips64 !powerpcspe !ppc64el !s390x !sparc] , libbluetooth-dev [linux-any], - libboost-date-time-dev (>= 1.71), - libboost-dev (>= 1.71), - libboost-filesystem-dev (>= 1.71), - libboost-iostreams-dev (>= 1.71), - libboost-locale-dev (>= 1.71), + libboost-date-time-dev, + libboost-dev, + libboost-filesystem-dev, + libboost-iostreams-dev, + libboost-locale-dev, libbox2d-dev, - libc0.1 (>= 2.10.2-7) [kfreebsd-any], + libbsh-java , libcairo2-dev, libcdr-dev (<< 0.2~), libcdr-dev (>= 0.1), @@@ -229,11 -231,13 +230,12 @@@ Build-Conflicts: amd-libopencl1 fontconfig-config (= 2.14.1-1) , fontconfig-config (= 2.14.1-2) , fontconfig-config (= 2.14.1-3) , - fonts-opensymbol , nvidia-glx-dev, nvidia-glx-legacy-dev, - nvidia-libopencl1 + nvidia-libopencl1, + systemd-coredump Standards-Version: 4.0.1 - Vcs-Git: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice.git + Vcs-Git: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice.git -b debian-experimental-7.6 Vcs-Browser: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice Bugs: Homepage: http://www.libreoffice.org diff --cc debian/rules index 86ff8793b85,85032f528ea..2d9a51c21ae --- a/debian/rules +++ b/debian/rules @@@ -369,15 -366,17 +368,17 @@@ SYSTEM_STUFF += san ENABLE_PDFIMPORT=y ENABLE_POPPLER=y SYSTEM_STUFF += poppler -ENABLE_PDFIUM=y +ENABLE_PDFIUM=n - ifneq (big,$(DEB_HOST_ARCH_ENDIAN)) - ENABLE_SKIA=y - endif - # see https://cgit.freedesktop.org/libreoffice/core/commit/?id=a0edcc68f94915a78fcc08e70d2cdd752abd9ebb - ifeq "$(ENABLE_SKIA)" "y" - BUILD_DEPS += , libfreetype-dev (>= 2.8.1) + PACKAGE_GEN=y + ifeq "$(PACKAGE_GEN)" "y" + # keep packaging gen (s390x is a release arch...), just disable skia. In contrast for + # alpha and ia64 (ports-only) where skia also is disabled we set PACKAGE_GEN=n later in + # the architecture specific settings + ifneq (big,$(DEB_HOST_ARCH_ENDIAN)) + ENABLE_SKIA=y + endif else - BUILD_DEPS += , libfreetype-dev (>= 2.2.0) + ENABLE_SKIA=n endif SYSTEM_STUFF += libpng ENABLE_NSS=y