diff --git a/changelog b/changelog index 061181d1..ab7f29b5 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,16 @@ +libreoffice (1:7.3.7-0ubuntu0.22.04.1~bpo18.04.1) bionic-backports; urgency=medium + + * Backport from jammy (LP: #1996082) + * Lower dpkg-dev requirement + - buildopts.mk is not available in dpkg-dev < 1.20.1 + * Lower libclucene-dev requirement + * Use internal abseil, gpgmepp, libmwaw, libwps, mdds, orcus, + cppunit, curl, xmlsec, libcmis, libcdr, libetonyek, + libvisio, libwpd, libwpg to meat upstream requirements + * Apparmor 2.13 is not available + + -- Rico Tzschichholz Tue, 08 Nov 2022 12:22:22 +0100 + libreoffice (1:7.3.7-0ubuntu0.22.04.1) jammy; urgency=medium * New upstream release (LP: #1995054) diff --git a/control b/control index 6779f8e8..ace56c7f 100644 --- a/control +++ b/control @@ -12,13 +12,13 @@ Build-Depends: ant (>= 1.7.0) , bison, bzip2, clang (>= 1:11) [armel], - clang (>= 1:5.0.2) [amd64 arm64 armhf], + clang (>= 1:5.0.2) [amd64 arm64 armhf i386], cpp, debhelper-compat (= 12), default-jdk (>= 2:1.9) [!hppa !s390 !sparc !hurd-i386] , default-libmysqlclient-dev, dh-python , - dpkg-dev (>= 1.20.1), + dpkg-dev (>= 1.18.2~), firebird-dev (>= 3.0.0.32483.ds4-4), flex (>= 2.3.35), fontforge-nox | fontforge, @@ -29,24 +29,22 @@ Build-Depends: ant (>= 1.7.0) , 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 , libavahi-client-dev, 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 (>= 1.65.1), + libboost-dev (>= 1.65.1), + libboost-filesystem-dev (>= 1.65.1), + libboost-iostreams-dev (>= 1.65.1), + libboost-locale-dev (>= 1.65.1), + libboost-program-options-dev (>= 1.65.1), + libboost-system-dev (>= 1.65.1), libc0.1 (>= 2.10.2-7) [kfreebsd-any], libcairo2-dev, - libcdr-dev (<< 0.2~), - libcdr-dev (>= 0.1), - libclucene-dev (>= 2.3.3.4+dfsg-1ubuntu2~), + libclucene-dev (>= 2.3.3.4-4.1), libcups2-dev, - libcurl4-gnutls-dev (>= 7.68), libdbus-1-dev (>= 0.60), libdconf-dev (>= 0.15.2), libe-book-dev (<< 0.2~), @@ -56,22 +54,17 @@ Build-Depends: ant (>= 1.7.0) , libepoxy-dev (>= 1.2), libepubgen-dev (<< 0.2~), libepubgen-dev (>= 0.1.0), - libetonyek-dev, - libetonyek-dev (<< 0.2~), libexpat1-dev, libexttextcat-dev (>= 3.4.1), - libfontconfig-dev, + libfontconfig1-dev, libfreehand-dev (<< 0.2~), libfreehand-dev (>= 0.1), - libfreetype-dev (>= 2.8.1), + libfreetype6-dev (>= 2.8.1), libgirepository1.0-dev (>= 1.32), libgl-dev, libglib2.0-dev (>= 2.38.0), libglib2.0-dev (>= 2.4), libglm-dev (>= 0.9.9~a2), - libgpg-error-dev, - libgpgme-dev, - libgpgmepp-dev (>= 1.14), libgraphite2-dev (>= 0.9.3), libgstreamer-plugins-base1.0-dev, libgstreamer1.0-dev, @@ -92,20 +85,14 @@ Build-Depends: ant (>= 1.7.0) , liblcms2-dev, libldap2-dev, liblpsolve55-dev (>= 5.5.0.13-5+b1), - libmdds-dev (<< 2.1~), - libmdds-dev (>= 2.0), libmspub-dev (<< 0.2~), libmspub-dev (>= 0.1), - libmwaw-dev (<< 0.4~), - libmwaw-dev (>= 0.3.1), libmythes-dev (>= 2:1.2), libnspr4-dev, libnss3-dev (>= 3.12.3), libodfgen-dev (<< 0.2~), libodfgen-dev (>= 0.1), libopenjp2-7-dev (>= 2.3), - liborcus-dev (<< 0.18~), - liborcus-dev (>= 0.17.2), libpagemaker-dev, libpagemaker-dev (<< 0.1~), libpng-dev (>= 1.6), @@ -119,15 +106,8 @@ Build-Depends: ant (>= 1.7.0) , librevenge-dev (<< 0.1~), libsane-dev, libsm-dev, + libssl-dev, libsuitesparse-dev (>= 1:3.4.0), - libvisio-dev (<< 0.2~), - libvisio-dev (>= 0.1), - libwpd-dev (<< 0.11~), - libwpd-dev (>= 0.10), - libwpg-dev (<< 0.4~), - libwpg-dev (>= 0.3), - libwps-dev (<< 0.5~), - libwps-dev (>= 0.4), libx11-dev, libx11-xcb-dev, libxaw7-dev, @@ -138,7 +118,6 @@ Build-Depends: ant (>= 1.7.0) , libxkbfile-dev, libxml2-dev (>= 2.8), libxml2-utils, - libxmlsec1-dev (>= 1.2.28), libxrandr-dev, libxrender-dev, libxslt1-dev, @@ -153,6 +132,7 @@ Build-Depends: ant (>= 1.7.0) , qt5-qmake (>= 5.6), qtbase5-dev (>= 5.6), qtbase5-dev-tools (>= 5.6), + qtchooser, unixodbc-dev (>= 2.2.11), unzip, x11proto-render-dev, @@ -173,17 +153,12 @@ Build-Depends-Arch: firebird3.0-server-core , hunspell-en-us , hyphen-en-us , imagemagick , - libcppunit-dev (>= 1.14) , libe-book-dev (>= 0.1.2) , - libetonyek-dev (>= 0.1.8) , - libmwaw-dev (>= 0.3.21) , - libwps-dev (>= 0.4.12) , locales , poppler-data , pstoedit , python3-lxml -Build-Depends-Indep: apparmor , - dh-apparmor, +Build-Depends-Indep: dh-apparmor, doxygen (>= 1.8.4) , gettext, graphviz , @@ -197,13 +172,13 @@ Build-Conflicts: amd-libopencl1, nvidia-glx-legacy-dev, nvidia-libopencl1 Standards-Version: 4.0.1 -Vcs-Git: https://git.launchpad.net/~libreoffice/ubuntu/+source/libreoffice -b ubuntu-jammy-7.3 +Vcs-Git: https://git.launchpad.net/~libreoffice/ubuntu/+source/libreoffice -b ubuntu-bionic-7.3 Vcs-Browser: https://git.launchpad.net/~libreoffice/ubuntu/+source/libreoffice Bugs: mailto:libreoffice@lists.launchpad.net Homepage: http://www.libreoffice.org Package: libreoffice -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Section: metapackages Depends: libreoffice-base, libreoffice-calc, @@ -304,7 +279,7 @@ Description: office productivity suite (metapackage) * bluez: Bluetooth support for Impress (slideshow remote control) Package: libreoffice-nogui -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Section: metapackages Depends: libreoffice-base-nogui, libreoffice-calc-nogui, @@ -397,7 +372,7 @@ Description: office productivity suite -- Indic language packages indic languages. Package: libreoffice-core -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Depends: fontconfig, fonts-opensymbol (>= 2:102.12), libreoffice-common (>> ${base-version}), @@ -450,7 +425,7 @@ Description: office productivity suite -- arch-dependent files LibreOffice. See the libreoffice package for more information. Package: libreoffice-core-nogui -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Depends: fontconfig, fonts-opensymbol (>= 2:102.12), libreoffice-common (>> ${base-version}), @@ -501,7 +476,7 @@ Depends: libreoffice-style-colibre, ${misc:Depends}, ${numbertext-data-recommends} Suggests: libreoffice-style -Recommends: fonts-liberation2 | ttf-mscorefonts-installer, apparmor (>= 2.13.1~), +Recommends: fonts-liberation2 | ttf-mscorefonts-installer, poppler-data, xdg-utils, ${pyuno-depends}, @@ -596,7 +571,7 @@ Description: office productivity suite -- common files for LibreOffice help for the LibreOffice Help. Package: libreoffice-writer -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Depends: libreoffice-base-core (= ${binary:Version}), libreoffice-common (>= 1:7.0.0~alpha~), libreoffice-core (= ${binary:Version}), @@ -617,7 +592,7 @@ Description: office productivity suite -- word processor This package contains the wordprocessor component for LibreOffice. Package: libreoffice-writer-nogui -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Depends: libreoffice-base-core (= ${binary:Version}), libreoffice-common (>= 1:7.0.0~alpha~), libreoffice-core-nogui (= ${binary:Version}) | libreoffice-core (= ${binary:Version}), @@ -639,7 +614,7 @@ Description: office productivity suite -- word processor (no GUI variant) This package contains the wordprocessor component for LibreOffice. Package: libreoffice-calc -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Depends: libreoffice-base-core (= ${binary:Version}), libreoffice-common (>= 1:7.0.0~alpha~), libreoffice-core (= ${binary:Version}), @@ -656,7 +631,7 @@ Description: office productivity suite -- spreadsheet This package contains the spreadsheet component for LibreOffice. Package: libreoffice-calc-nogui -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Depends: libreoffice-base-core (= ${binary:Version}), libreoffice-common (>= 1:7.0.0~alpha~), libreoffice-core-nogui (= ${binary:Version}) | libreoffice-core (= ${binary:Version}), @@ -674,7 +649,7 @@ Description: office productivity suite -- spreadsheet (no GUI variant) for use with libreoffice-core-nogui. Package: libreoffice-impress -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Depends: libreoffice-common (>= 1:7.0.0~alpha~), libreoffice-core (= ${binary:Version}), libreoffice-draw (= ${binary:Version}), @@ -693,7 +668,7 @@ Description: office productivity suite -- presentation This package contains the presentation component for LibreOffice. Package: libreoffice-impress-nogui -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Depends: libreoffice-common (>= 1:7.0.0~alpha~), libreoffice-core-nogui (= ${binary:Version}) | libreoffice-core (= ${binary:Version}), libreoffice-draw-nogui (= ${binary:Version}) | libreoffice-draw (= ${binary:Version}), @@ -710,7 +685,7 @@ Description: office productivity suite -- presentation (no GUI variant) This package contains the presentation component for LibreOffice. Package: libreoffice-draw -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Depends: libreoffice-common (>= 1:7.0.0~alpha~), libreoffice-core (= ${binary:Version}), ${misc:Depends}, @@ -728,7 +703,7 @@ Description: office productivity suite -- drawing This package contains the drawing component for LibreOffice. Package: libreoffice-draw-nogui -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Depends: libreoffice-common (>= 1:7.0.0~alpha~), libreoffice-core-nogui (= ${binary:Version}) | libreoffice-core (= ${binary:Version}), ${misc:Depends}, @@ -745,7 +720,7 @@ Description: office productivity suite -- drawing (no GUI variant) This package contains the drawing component for LibreOffice. Package: libreoffice-math -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Depends: fonts-opensymbol (>= 2:102.11), libreoffice-common (>= 1:7.0.0~alpha~), libreoffice-core (= ${binary:Version}), @@ -760,7 +735,7 @@ Description: office productivity suite -- equation editor This package contains the equation editor component for LibreOffice. Package: libreoffice-math-nogui -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Depends: fonts-opensymbol (>= 2:102.11), libreoffice-common (>= 1:7.0.0~alpha~), libreoffice-core-nogui (= ${binary:Version}) | libreoffice-core (= ${binary:Version}), @@ -775,7 +750,7 @@ Description: office productivity suite -- equation editor (no GUI variant) This package contains the equation editor component for LibreOffice. Package: libreoffice-base-core -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Depends: libreoffice-core (= ${binary:Version}) | libreoffice-core-nogui (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} @@ -793,9 +768,8 @@ Description: office productivity suite -- shared library libreoffice-sdbc-*). Package: libreoffice-base -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Section: database -Pre-Depends: dpkg (>= 1.19.1) Depends: libreoffice-base-core (= ${binary:Version}), libreoffice-base-drivers (= ${binary:Version}), libreoffice-common (>= 1:7.0.0~alpha~), @@ -813,7 +787,7 @@ Description: office productivity suite -- database This package contains the database component for LibreOffice. Package: libreoffice-base-nogui -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Section: database Depends: libreoffice-base-core (= ${binary:Version}), libreoffice-base-drivers (= ${binary:Version}), @@ -924,7 +898,7 @@ Description: office productivity suite -- Yaru symbol style This package contains the "yaru" symbol style. Package: libreoffice-gnome -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Depends: libreoffice-common (>= 1:7.0.0~alpha~), libreoffice-core (= ${binary:Version}), ${misc:Depends}, @@ -951,7 +925,7 @@ Description: office productivity suite -- GNOME integration Package: python3-uno Section: python -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Enhances: libreoffice Depends: libreoffice-common (>= 1:7.0.0~alpha~), libreoffice-core (= ${binary:Version}) | libreoffice-core-nogui (= ${binary:Version}), @@ -1039,7 +1013,7 @@ Depends: libreoffice-core-nogui | libreoffice-core, ${java:Depends}, ${misc:Depends}, ${shlibs:Depends} -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Section: database Enhances: libreoffice-base-drivers Description: HSQLDB SDBC driver for LibreOffice @@ -1051,7 +1025,7 @@ Description: HSQLDB SDBC driver for LibreOffice Package: libreoffice-sdbc-mysql Section: database -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Depends: libreoffice-core-nogui | libreoffice-core, ${misc:Depends}, ${shlibs:Depends} @@ -1067,13 +1041,13 @@ Package: libreoffice-base-drivers Depends: libreoffice-core-nogui | libreoffice-core, ${misc:Depends}, ${shlibs:Depends} -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Section: database Suggests: libjtds-java, libreoffice-sdbc-mysql | libmyodbc | libmariadb-java, libreoffice-sdbc-postgresql | odbc-postgresql | libpg-java, libsqliteodbc | tdsodbc | odbc-mdbtools -Recommends: libreoffice-sdbc-hsqldb [amd64 arm64 armhf ppc64el s390x], +Recommends: libreoffice-sdbc-hsqldb [amd64 arm64 armhf i386 ppc64el s390x], ${base-firebird-recommends} Replaces: libreoffice-base (<< 1:4.3.0-3), libreoffice-core (<< 1:6.2.0~beta1~) Breaks: libreoffice-base (<< 1:4.3.0-3) @@ -1140,7 +1114,7 @@ Depends: liblibreoffice-java, ${misc:Depends}, ${shlibs:Depends} Recommends: libreoffice-core-nogui | libreoffice-core -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Replaces: libreoffice-officebean (<< 1:6.4.0~rc2-1) Breaks: libreoffice-officebean (<< 1:6.4.0~rc2-1) Description: generic Java Bean wrapper for LibreOffice components @@ -4589,7 +4563,7 @@ Description: office productivity suite -- Chinese_traditional help Package: uno-libs-private Section: libs -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Depends: ${misc:Depends}, ${shlibs:Depends} Replaces: uno-libs3 Breaks: uno-libs3 @@ -4608,7 +4582,7 @@ Description: LibreOffice UNO runtime environment -- private libraries used by pu Package: libuno-sal3 Section: libs -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Depends: ${misc:Depends}, ${shlibs:Depends} Replaces: uno-libs3, ure (<< 5.0.0~rc2-1) Breaks: libreoffice-core (<< 1:4.3.0~), uno-libs3 @@ -4626,7 +4600,7 @@ Description: LibreOffice UNO runtime environment -- SAL public library Package: libuno-salhelpergcc3-3 Section: libs -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Depends: ${misc:Depends}, ${shlibs:Depends} Replaces: uno-libs3, ure (<< 5.0.0~rc2-1) Breaks: libreoffice-core (<< 1:4.3.0~), uno-libs3 @@ -4644,7 +4618,7 @@ Description: LibreOffice UNO runtime environment -- SAL helpers for C++ library Package: libuno-cppu3 Section: libs -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Depends: ${misc:Depends}, ${shlibs:Depends} Replaces: uno-libs3, ure (<< 5.0.0~rc2-1) Breaks: libreoffice-core (<< 1:4.3.0~), uno-libs3 @@ -4663,7 +4637,7 @@ Description: LibreOffice UNO runtime environment -- CPPU public library Package: libuno-cppuhelpergcc3-3 Section: libs -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Depends: uno-libs-private (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} @@ -4684,7 +4658,7 @@ Description: LibreOffice UNO runtime environment -- CPPU helper library Package: libuno-purpenvhelpergcc3-3 Section: libs -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Depends: ${misc:Depends}, ${shlibs:Depends} Replaces: uno-libs3, ure (<< 5.0.0~rc2-1) Breaks: libreoffice-core (<< 1:4.3.0~), uno-libs3 @@ -4703,7 +4677,7 @@ Description: LibreOffice UNO runtime environment -- "purpose environment" helper Package: ure Section: libs -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Depends: uno-libs-private (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} @@ -4734,7 +4708,7 @@ Description: LibreOffice UNO runtime environment Package: ure-java Section: java -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Depends: libunoloader-java, uno-libs-private (= ${binary:Version}), ure (= ${binary:Version}), @@ -4832,7 +4806,7 @@ Description: LibreOffice component for building database reports Package: libreoffice-report-builder-bin Section: misc -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Depends: libreoffice-base, libreoffice-core, ${misc:Depends}, ${shlibs:Depends} Description: LibreOffice component for building database reports -- libraries LibreOffice is a full-featured office productivity suite that provides @@ -4843,7 +4817,7 @@ Description: LibreOffice component for building database reports -- libraries Package: libreoffice-report-builder-bin-nogui Section: misc -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Depends: libreoffice-base-nogui | libreoffice-base, libreoffice-core-nogui | libreoffice-core, ${misc:Depends}, @@ -4891,7 +4865,7 @@ Description: OpenSymbol TrueType font Package: libreoffice-dev Section: devel -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Depends: libreoffice-core-nogui (= ${binary:Version}) | libreoffice-core (= ${binary:Version}), libreoffice-dev-common (= ${source:Version}), ${idlc-cpp-depends}, @@ -4912,7 +4886,7 @@ Description: office productivity suite -- SDK -- architecture-dependent parts Package: libreoffice-dev-gui Section: devel -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Depends: libreoffice-core (= ${binary:Version}), libreoffice-dev (= ${binary:Version}), libreoffice-dev-common (= ${source:Version}), @@ -4962,7 +4936,7 @@ Description: office productivity suite -- SDK documentation Package: libreofficekit-dev Section: libdevel -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Depends: gir1.2-lokdocview-0.1 (= ${binary:Version}), ${misc:Depends} Suggests: libgtk-3-dev Recommends: libreoffice-core, libreofficekit-data @@ -4977,7 +4951,7 @@ Description: LibreOfficeKit -- headers This package contains the headers needed for using LibreOfficeKit. Package: libreoffice-gtk3 -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Depends: libreoffice-core (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} @@ -4993,7 +4967,7 @@ Description: office productivity suite -- GTK+ 3 integration with Gtk+ 3 and Gtk/GNOMEish print dialog when running under GNOME. Package: gir1.2-lokdocview-0.1 -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Section: introspection Depends: liblibreofficekitgtk (= ${binary:Version}), ${gir:Depends}, @@ -5006,7 +4980,7 @@ Description: GTK3 widget wrapping LibreOffice functionality - introspection Package: liblibreofficekitgtk Section: gnome -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Depends: libreofficekit-data, ${misc:Depends}, ${shlibs:Depends} Replaces: libreoffice-gtk3 (<< 1:5.2.0~) Breaks: libreoffice-gtk3 (<< 1:5.2.0~) @@ -5028,7 +5002,7 @@ Description: common data for LOKDocView handlers). Package: libreoffice-kf5 -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Depends: libreoffice-core (= ${binary:Version}), ${kf5-qt5-depends}, ${misc:Depends}, @@ -5045,7 +5019,7 @@ Description: office productivity suite -- KDE Frameworks 5 integration Picker when running under Plasma. Package: libreoffice-qt5 -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Depends: libreoffice-core (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} @@ -5061,7 +5035,7 @@ Description: office productivity suite -- Qt 5 integration not using Plasma. Package: libreoffice-plasma -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Depends: libreoffice-core (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} @@ -5076,7 +5050,7 @@ Description: office productivity suite -- some Plasma integration Package: libreoffice-sdbc-postgresql Section: misc -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Depends: libreoffice-common (>= 1:7.0.0~alpha), libreoffice-core, ${misc:Depends}, @@ -5092,7 +5066,7 @@ Description: PostgreSQL SDBC driver for LibreOffice Homepage: http://wiki.documentfoundation.org/PostgreSQL-SDBC Package: libreoffice-evolution -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Section: gnome Depends: libreoffice-base, libreoffice-common (>= 1:7.0.0~alpha~), @@ -5153,7 +5127,7 @@ Depends: libreoffice-core-nogui | libreoffice-core, ${firebird-engine-depends}, ${misc:Depends}, ${shlibs:Depends} -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Section: database Enhances: libreoffice-base-drivers Description: Firebird SDBC driver for LibreOffice @@ -5276,7 +5250,7 @@ Description: transitional package for libreoffice-ogltrans Package: libreoffice-mysql-connector Section: oldlibs -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Depends: libreoffice-sdbc-mysql, ${misc:Depends} Description: transitional package for MariaDB/MySQL Connector extension for LibreOffice LibreOffice is a full-featured office productivity suite that provides @@ -5288,7 +5262,7 @@ Description: transitional package for MariaDB/MySQL Connector extension for Libr Package: libreoffice-avmedia-backend-gstreamer Section: oldlibs -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Depends: libreoffice-core (>> 1:6.3.0~rc1~), ${misc:Depends} Description: transitional package for GStreamer backend for LibreOffice LibreOffice is a full-featured office productivity suite that provides @@ -5300,7 +5274,7 @@ Description: transitional package for GStreamer backend for LibreOffice Package: libreoffice-kde5 Section: oldlibs -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Depends: libreoffice-kf5, libreoffice-plasma Description: transitional package for LibreOffice "KDE 5" integration LibreOffice is a full-featured office productivity suite that provides @@ -5355,7 +5329,7 @@ Description: transitional package for LibreOffice UNO runtime environment can be safely removed once installed. Package: libreoffice-officebean -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Section: oldlibs Depends: libofficebean-java (>= 1:6.4.0~rc2) Description: transitional package for libofficebean-java diff --git a/control.in b/control.in index d15bf23d..38c946a5 100644 --- a/control.in +++ b/control.in @@ -12,7 +12,7 @@ Build-Conflicts: nvidia-glx-dev, amd-libopencl1, nvidia-libopencl1 Standards-Version: 4.0.1 -Vcs-Git: https://git.launchpad.net/~libreoffice/ubuntu/+source/libreoffice -b ubuntu-jammy-7.3 +Vcs-Git: https://git.launchpad.net/~libreoffice/ubuntu/+source/libreoffice -b ubuntu-bionic-7.3 Vcs-Browser: https://git.launchpad.net/~libreoffice/ubuntu/+source/libreoffice Bugs: @BUGS@ Homepage: http://www.libreoffice.org @@ -575,7 +575,6 @@ Description: office productivity suite -- shared library Package: libreoffice-base Architecture: %OOO_BASE_ARCHS% Section: database -Pre-Depends: dpkg (>= 1.19.1) Depends: libreoffice-base-core (= ${binary:Version}), libreoffice-base-drivers (= ${binary:Version}), libreoffice-core (= ${binary:Version}), diff --git a/libreoffice-base.preinst.in b/libreoffice-base.preinst.in index 08ab83ab..2fb2286c 100644 --- a/libreoffice-base.preinst.in +++ b/libreoffice-base.preinst.in @@ -5,10 +5,10 @@ set -e #INCLUDE_SHELL_LIB# if [ upgrade = "$1" ] || dpkg --compare-versions "$2" lt 1:6.4.0~beta1-2; then - dpkg-divert --remove --no-rename \ + dpkg-divert --remove \ --divert /usr/lib/libreoffice/share/basic/dialog.xlc.noaccess \ /usr/lib/libreoffice/share/basic/dialog.xlc - dpkg-divert --remove --no-rename \ + dpkg-divert --remove \ --divert /usr/lib/libreoffice/share/basic/script.xlc.noaccess \ /usr/lib/libreoffice/share/basic/script.xlc # cleanup diff --git a/patches/boost-1.65.1.patch b/patches/boost-1.65.1.patch new file mode 100644 index 00000000..dcb05bb4 --- /dev/null +++ b/patches/boost-1.65.1.patch @@ -0,0 +1,26 @@ +From 80f2b7503dce0847afff65f39946c81d45584f41 Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz +Date: Sat, 8 Aug 2020 13:27:52 +0200 +Subject: [PATCH 1/2] Lower Boost baseline to 1.65.1 + +Change-Id: Ibc08c1d9864c3232077f57694209dadd3ff30dac +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 2a3fc498a458..66748656164d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -9479,7 +9479,7 @@ AC_MSG_CHECKING([which boost to use]) + if test "$with_system_boost" = "yes"; then + AC_MSG_RESULT([external]) + SYSTEM_BOOST=TRUE +- AX_BOOST_BASE([1.66],,[AC_MSG_ERROR([no suitable Boost found])]) ++ AX_BOOST_BASE([1.65.1],,[AC_MSG_ERROR([no suitable Boost found])]) + AX_BOOST_DATE_TIME + AX_BOOST_FILESYSTEM + AX_BOOST_IOSTREAMS +-- +2.27.0 + diff --git a/patches/icu-60.patch b/patches/icu-60.patch new file mode 100644 index 00000000..3de10556 --- /dev/null +++ b/patches/icu-60.patch @@ -0,0 +1,68 @@ +From: Rico Tzschichholz +Date: Sat, 22 Jan 2022 14:38:27 +0100 +Subject: Add ICU 60 adjustments + +--- a/i18nlangtag/source/languagetag/languagetagicu.cxx ++++ b/i18nlangtag/source/languagetag/languagetagicu.cxx +@@ -10,6 +10,7 @@ + #include + #include + ++#include + + // static + icu::Locale LanguageTagIcu::getIcuLocale( const LanguageTag & rLanguageTag ) + +--- a/i18nlangtag/qa/cppunit/test_languagetag.cxx ++++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx +@@ -857,9 +857,9 @@ void TestLanguageTag::testDisplayNames() + CPPUNIT_ASSERT_EQUAL( OUString("No linguistic content"), aStr); + + aStr = LanguageTagIcu::getDisplayName( LanguageTag("x-lala"), LanguageTag("en")); +- CPPUNIT_ASSERT_EQUAL( OUString("Unknown language (Private-Use=lala)"), aStr); ++ CPPUNIT_ASSERT_EQUAL( OUString("Private-Use=lala"), aStr); + aStr = LanguageTagIcu::getDisplayName( LanguageTag("x-lala"), LanguageTag("de")); +- CPPUNIT_ASSERT_EQUAL( OUString("Unbekannte Sprache (Privatnutzung=lala)"), aStr); ++ CPPUNIT_ASSERT_EQUAL( OUString("Privatnutzung=lala"), aStr); + aStr = LanguageTagIcu::getDisplayName( LanguageTag("en-GB"), LanguageTag("x-lala")); + CPPUNIT_ASSERT_EQUAL( OUString("en (GB)"), aStr); + aStr = LanguageTagIcu::getDisplayName( LanguageTag("en-GB-oxendict"), LanguageTag("x-lala")); + +--- a/i18npool/qa/cppunit/test_breakiterator.cxx ++++ b/i18npool/qa/cppunit/test_breakiterator.cxx +@@ -31,7 +31,9 @@ public: + + void testLineBreaking(); + void testWordBoundaries(); ++#if (U_ICU_VERSION_MAJOR_NUM >= 66) + void testGraphemeIteration(); ++#endif + void testWeak(); + void testAsian(); + void testThai(); +@@ -48,7 +50,9 @@ public: + CPPUNIT_TEST_SUITE(TestBreakIterator); + CPPUNIT_TEST(testLineBreaking); + CPPUNIT_TEST(testWordBoundaries); ++#if (U_ICU_VERSION_MAJOR_NUM >= 66) + CPPUNIT_TEST(testGraphemeIteration); ++#endif + CPPUNIT_TEST(testWeak); + CPPUNIT_TEST(testAsian); + CPPUNIT_TEST(testThai); +@@ -607,6 +607,7 @@ void TestBreakIterator::testWordBoundaries() + } + } + ++#if (U_ICU_VERSION_MAJOR_NUM >= 66) + //See https://bugs.libreoffice.org/show_bug.cgi?id=40292 + //See https://bz.apache.org/ooo/show_bug.cgi?id=80412 + //See https://bz.apache.org/ooo/show_bug.cgi?id=111152 +@@ -759,6 +760,7 @@ void TestBreakIterator::testGraphemeIteration() + CPPUNIT_ASSERT_EQUAL_MESSAGE("Should skip full grapheme", static_cast(0), nPos); + } + } ++#endif + + //A test to ensure that certain ranges and codepoints that are categorized as + //weak remain as weak, so that existing docs that depend on this don't silently diff --git a/patches/icu-66.patch b/patches/icu-66.patch new file mode 100644 index 00000000..7b477436 --- /dev/null +++ b/patches/icu-66.patch @@ -0,0 +1,15 @@ +From: Rico Tzschichholz +Date: Sat, 22 Jan 2022 09:24:55 +0100 +Subject: Adjust unit test of LanguageTagIcu::getDisplayName() for ICU 66 + +--- a/i18nlangtag/qa/cppunit/test_languagetag.cxx ++++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx +@@ -864,7 +864,7 @@ void TestLanguageTag::testDisplayNames() + CPPUNIT_ASSERT_EQUAL( OUString("en (GB, OXENDICT)"), aStr); + + aStr = LanguageTagIcu::getDisplayName( LanguageTag("unreg-and-bad"), LanguageTag("en")); +- CPPUNIT_ASSERT_EQUAL( OUString("unreg (Andorra, BAD)"), aStr); // a tad of a surprise.. ++ CPPUNIT_ASSERT_EQUAL( OUString("unreg (Andorra)"), aStr); // a tad of a surprise.. + + aStr = LanguageTagIcu::getDisplayName( LanguageTag("en-029"), LanguageTag("en")); + CPPUNIT_ASSERT_EQUAL( OUString("English (Caribbean)"), aStr); diff --git a/patches/series b/patches/series index bf1fd05e..87cf3e03 100644 --- a/patches/series +++ b/patches/series @@ -53,3 +53,6 @@ sfx2-Put-temp-file-for-offline-help-inside-user-s-do.patch tdf-108560-horribly-slow-to-paste-many-lines-into-ed.patch arm-fp-mode.diff moreIconsDialog-accesses-internet.diff +icu-66.patch +boost-1.65.1.patch +icu-60.patch diff --git a/rules b/rules index 6c4fc774..fbc498ee 100755 --- a/rules +++ b/rules @@ -90,7 +90,7 @@ endif ######### # Default package configuration # -OOO_ARCHS = amd64 arm64 armhf ppc64el s390x +OOO_ARCHS = amd64 arm64 armhf i386 ppc64el s390x PATCHSET=$(DEB_VENDOR) BUILD_DEPS=\ autoconf,\ @@ -102,7 +102,7 @@ BUILD_DEPS=\ fontforge-nox | fontforge, \ gperf (>= 3.1),\ libc0.1 (>= 2.10.2-7) [kfreebsd-any],\ - libfontconfig-dev,\ + libfontconfig1-dev,\ pkg-config,\ unzip,\ xsltproc,\ @@ -388,9 +388,9 @@ 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) + BUILD_DEPS += , libfreetype6-dev (>= 2.8.1) else - BUILD_DEPS += , libfreetype-dev (>= 2.2.0) + BUILD_DEPS += , libfreetype6-dev (>= 2.2.0) endif SYSTEM_STUFF += libpng ENABLE_NSS=y @@ -452,9 +452,9 @@ BUILD_PPC64EL=y BUILD_ARM64=y SYSTEM_STUFF += gpgmepp INSTALL_APPARMOR_PROFILES=y -ENABLE_APPARMOR_PROFILES=y +ENABLE_APPARMOR_PROFILES=n ifneq "$(AUTOPKGTEST_BUILD)" "y" - CHECK_APPARMOR_PROFILES=true + CHECK_APPARMOR_PROFILES=false endif SYSTEM_STUFF += libnumbertext SYSTEM_STUFF += box2d @@ -696,6 +696,17 @@ ifeq "$(DEB_VENDOR)" "Ubuntu" ENABLE_COINMP := n SYSTEM_STUFF := $(filter-out coinmp, $(SYSTEM_STUFF)) + SYSTEM_STUFF := $(filter-out mdds orcus, $(SYSTEM_STUFF)) + SYSTEM_STUFF := $(filter-out abseil libmwaw libwps, $(SYSTEM_STUFF)) + SYSTEM_STUFF := $(filter-out gpgmepp, $(SYSTEM_STUFF)) + + SYSTEM_STUFF := $(filter-out cppunit xmlsec, $(SYSTEM_STUFF)) + SYSTEM_STUFF := $(filter-out libcmis, $(SYSTEM_STUFF)) + SYSTEM_STUFF := $(filter-out libcdr libetonyek libvisio libwpd libwpg, $(SYSTEM_STUFF)) + SYSTEM_STUFF := $(filter-out curl, $(SYSTEM_STUFF)) + + BOOST_MINVER= (>= 1.65.1) + ON_BUILDD := $(shell if [ "`whoami`" = buildd -o -f /CurrentlyBuilding ] || echo $(CURDIR) | grep -q \/build\/buildd; then echo y; else echo n; fi) ifeq ($(ON_BUILDD),y) buildd_discspace_hack:=find workdir/ -type f -name '*.o' -exec mv {} {}_org \; -exec touch -r {}_org {} \; -exec rm {}_org \; @@ -854,7 +865,6 @@ ifeq "$(ENABLE_PDFIMPORT)" "y" ifeq "$(ENABLE_PDFIUM)" "n" CONFIGURE_FLAGS += --disable-pdfium else - SYSTEM_STUFF += abseil SYSTEM_STUFF += openjpeg ifneq (,$(filter openjpeg, $(SYSTEM_STUFF))) BUILD_DEPS += , libopenjp2-7-dev (>= 2.3) @@ -1002,7 +1012,7 @@ ifeq "$(ENABLE_PYTHON)" "y" endif BUILD_DEPS += , debhelper-compat (= 12) - BUILD_DEPS += , dpkg-dev (>= 1.20.1) + BUILD_DEPS += , dpkg-dev (>= 1.18.2~) ifeq "$(RUN_MAKE_CHECK)" "y" BUILD_DEPS_ARCH += , locales$(OOO_NO_CHECK_ARCHS) @@ -1230,7 +1240,7 @@ endif ifeq "$(ENABLE_XMLHELP)" "y" ifneq (,$(filter clucene, $(SYSTEM_STUFF))) - BUILD_DEPS += , libclucene-dev (>= 2.3.3.4+dfsg-1ubuntu2~) + BUILD_DEPS += , libclucene-dev (>= 2.3.3.4-4.1) endif endif @@ -1376,6 +1386,9 @@ ifeq "$(ENABLE_QT5)" "y" BUILD_DEPS += , libglib2.0-dev (>= 2.4) BUILD_DEPS += , libxcb1-dev BUILD_DEPS += , libxcb-icccm4-dev + # for correct qmake/moc + BUILD_DEPS += , qtchooser + export QT_SELECT=5 endif ifeq "$(ENABLE_QT6)" "y" CONFIGURE_FLAGS += --enable-qt6 @@ -1385,11 +1398,11 @@ endif ifeq "$(ENABLE_MARIADB)" "y" ifeq "$(MYSQL_FLAVOUR)" "default" - BUILD_DEPS += , default-libmysqlclient-dev + BUILD_DEPS += , default-libmysqlclient-dev, libssl-dev else ifeq "$(MYSQL_FLAVOUR)" "mysql" ifneq (,$(filter mariadb, $(SYSTEM_STUFF))) - BUILD_DEPS += , libmysqlclient-dev + BUILD_DEPS += , libmysqlclient-dev, libssl-dev endif MARIADBCONFIG=/usr/bin/mysql_config endif @@ -1712,11 +1725,10 @@ endif ## Build n projects in parallel? ## DEB_BUILD_OPTIONS=parallel= ## if not specified LibreOffices configure tries to find it out itself -include /usr/share/dpkg/buildopts.mk ifeq "$(DEB_HOST_ARCH)" "amd64" NUM_CPUS=3 else -NUM_CPUS=$(DEB_BUILD_OPTION_PARALLEL) +NUM_CPUS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n 's/^\(.* \)\?parallel=\([0-9]\+\).*$$/\2/p') endif AVAIL_CPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1) ifeq "$(PARALLEL_BUILD)" "y" diff --git a/tests/control b/tests/control index 8d4bf338..f595827e 100644 --- a/tests/control +++ b/tests/control @@ -20,12 +20,12 @@ Restrictions: superficial # the installed LO. works standalone, though, so it's patched out of the # smoketest. Do it here separately. Tests: test-extension -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Depends: libreoffice-core-nogui, libreoffice-common, libreoffice-java-common, libreoffice-smoketest-data, default-jdk Restrictions: allow-stderr, superficial, skippable Tests: test-extension-shared -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Depends: libreoffice-core-nogui, libreoffice-common, libreoffice-java-common, libreoffice-smoketest-data, default-jdk Restrictions: allow-stderr, needs-root, superficial @@ -62,12 +62,12 @@ Depends: @builddeps@, libreoffice-core, libreoffice-writer, python3-uno Restrictions: allow-stderr Tests: uicheck-sc -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Depends: @builddeps@, libreoffice-core, libreoffice-calc, libreoffice-draw, python3-uno, libreoffice-l10n-he, libreoffice-l10n-zh-tw, libreoffice-java-common, libreoffice-writer Restrictions: allow-stderr Tests: uicheck-sw -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Depends: @builddeps@, libreoffice-core, libreoffice-writer, libreoffice-draw, libreoffice-calc, libreoffice-base, python3-uno, libreoffice-l10n-he, libreoffice-l10n-zh-tw, libreoffice-librelogo, libreoffice-java-common Restrictions: allow-stderr, needs-internet, skippable @@ -86,12 +86,12 @@ Depends: libreoffice-dev, libreoffice-dev-doc Restrictions: superficial Tests: odk-build-examples -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Depends: @builddeps@, libreoffice-core-nogui, libreoffice-dev, libreoffice-dev-doc, python3-uno Restrictions: allow-stderr, skippable Tests: odk-build-examples-java -Architecture: amd64 arm64 armhf ppc64el s390x +Architecture: amd64 arm64 armhf i386 ppc64el s390x Depends: @builddeps@, libreoffice-core-nogui, libreoffice-dev, libreoffice-dev-doc, libreoffice-java-common, libofficebean-java Restrictions: allow-stderr, skippable