diff --git a/changelog b/changelog index a2e654861..57b1a6377 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,12 @@ +libreoffice (4:7.6.6-0ubuntu0.23.10.1~bpo22.04.1) jammy-backports; urgency=medium + + * Backport from mantic (LP: #2062140) + * Disable GTK4 and QT6 support + * Use internal mdds, orcus, xmlsec, graphite and harfbuzz to meat + upstream requirements + + -- Rico Tzschichholz Tue, 26 Mar 2024 11:11:30 +0100 + libreoffice (4:7.6.6-0ubuntu0.23.10.1) mantic; urgency=medium * New upstream release (LP: #2058687) diff --git a/control b/control index 55c42e2af..2a9aef5cb 100644 --- a/control +++ b/control @@ -19,10 +19,6 @@ Build-Depends: ant , firebird-dev, flex, fontforge-nox | fontforge, - g++-12 [i386], - g++-12 [s390x], - gcc-12 [i386], - gcc-12 [s390x], gobject-introspection, gperf, java-common , @@ -32,7 +28,6 @@ Build-Depends: ant , libabw-dev (<< 0.2~), libabw-dev (>= 0.1), libarchive-zip-perl , - libatk1.0-dev, libavahi-client-dev, libbluetooth-dev [linux-any], libboost-date-time-dev, @@ -40,6 +35,8 @@ Build-Depends: ant , libboost-filesystem-dev, libboost-iostreams-dev, libboost-locale-dev, + libboost-program-options-dev, + libboost-system-dev, libbsh-java , libcairo2-dev, libcdr-dev (<< 0.2~), @@ -71,12 +68,9 @@ Build-Depends: ant , libgpg-error-dev, libgpgme-dev, libgpgmepp-dev, - libgraphite2-dev, libgstreamer-plugins-base1.0-dev, libgstreamer1.0-dev, libgtk-3-dev, - libgtk-4-dev, - libharfbuzz-dev (>= 5.1.0), libhsqldb1.8.0-java , libhunspell-dev, libhyphen-dev, @@ -93,8 +87,6 @@ Build-Depends: ant , libldap-dev, liblockfile-bin, liblpsolve55-dev, - libmdds-dev (<< 2.2~), - libmdds-dev (>= 2.1), libmspub-dev (<< 0.2~), libmspub-dev (>= 0.1), libmwaw-dev (<< 0.4~), @@ -105,8 +97,6 @@ Build-Depends: ant , libodfgen-dev (<< 0.2~), libodfgen-dev (>= 0.1), libopenjp2-7-dev [amd64 arm64 armhf ppc64el riscv64 s390x], - liborcus-dev (<< 0.19~), - liborcus-dev (>= 0.18), libpagemaker-dev, libpagemaker-dev (<< 0.1~), libpng-dev, @@ -141,7 +131,6 @@ Build-Depends: ant , libxkbfile-dev, libxml2-dev, libxml2-utils, - libxmlsec1-dev (>= 1.2.35), libxrandr-dev, libxrender-dev, libxslt1-dev, @@ -153,10 +142,7 @@ Build-Depends: ant , python3, python3-dev , python3-distutils , - qmake6, qt5-qmake, - qt6-base-dev, - qt6-base-dev-tools, qtbase5-dev, qtbase5-dev-tools, unixodbc-dev, @@ -168,10 +154,10 @@ Build-Depends: ant , Build-Depends-Arch: firebird3.0-server-core , fontconfig [amd64 arm64 armhf i386 ppc64el s390x] , fonts-crosextra-caladea [amd64 arm64 armhf i386 ppc64el s390x] , - fonts-crosextra-carlito (>= 20230309) [amd64 arm64 armhf i386 ppc64el s390x] , + fonts-crosextra-carlito (<< 20230309) [amd64 arm64 armhf i386 ppc64el s390x] , fonts-dejavu [amd64 arm64 armhf i386 ppc64el s390x] , fonts-hosny-amiri [amd64 arm64 armhf i386 ppc64el s390x] , - fonts-liberation (>= 1:2) [amd64 arm64 armhf i386 ppc64el s390x] , + fonts-liberation2 [amd64 arm64 armhf i386 ppc64el s390x] , fonts-linuxlibertine [amd64 arm64 armhf i386 ppc64el s390x] , fonts-noto-core [amd64 arm64 armhf i386 ppc64el s390x] , gdb [!ppc64el !s390x] , @@ -183,7 +169,6 @@ Build-Depends-Arch: firebird3.0-server-core , hyphen-en-us [!ppc64el !s390x] , imagemagick [!ppc64el !s390x] , libcppunit-dev , - liborcus-dev (>= 0.18.1) , locales [!ppc64el !s390x] , poppler-data [!ppc64el !s390x] , pstoedit [!ppc64el !s390x] , @@ -203,7 +188,7 @@ Build-Conflicts: amd-libopencl1, nvidia-libopencl1, systemd-coredump Standards-Version: 4.0.1 -Vcs-Git: https://git.launchpad.net/~libreoffice/ubuntu/+source/libreoffice -b ubuntu-mantic-7.6 +Vcs-Git: https://git.launchpad.net/~libreoffice/ubuntu/+source/libreoffice -b ubuntu-jammy-7.6 Vcs-Browser: https://git.launchpad.net/~libreoffice/ubuntu/+source/libreoffice Bugs: mailto:libreoffice@lists.launchpad.net Homepage: http://www.libreoffice.org @@ -5225,24 +5210,6 @@ Description: common data for LOKDocView This package contains architecture-independent data (e.g. the selection handlers). -Package: libreoffice-gtk4 -Architecture: amd64 arm64 armhf ppc64el riscv64 s390x -Depends: libreoffice-core (= ${binary:Version}), - ${misc:Depends}, - ${shlibs:Depends} -Suggests: libreofficekit-data -Replaces: libreoffice-core (<< 4:7.6.0~rc2) -Section: gnome -Enhances: libreoffice -Description: office productivity suite -- GTK+ 4 integration - LibreOffice is a full-featured office productivity suite that provides - a near drop-in replacement for Microsoft(R) Office. - . - This package contains the Gtk plugin for drawing LibreOffices widgets - with Gtk+ 4 and Gtk/GNOMEish print dialog. - . - You need to enable it manually by export SAL_USE_VCLPLUGIN=gtk4. - Package: libreoffice-kf5 Architecture: amd64 arm64 armhf ppc64el riscv64 s390x Depends: libreoffice-core (= ${binary:Version}), @@ -5276,21 +5243,6 @@ Description: office productivity suite -- Qt 5 integration You need to enable it manually by export SAL_USE_VCLPLUGIN=qt5 if you are not using Plasma. -Package: libreoffice-qt6 -Architecture: amd64 arm64 armhf ppc64el riscv64 s390x -Depends: libreoffice-core (= ${binary:Version}), - ${misc:Depends}, - ${shlibs:Depends} -Enhances: libreoffice -Description: office productivity suite -- Qt 6 integration - LibreOffice is a full-featured office productivity suite that provides - a near drop-in replacement for Microsoft(R) Office. - . - This package contains the Qt 6 plugin for drawing LibreOffices widgets - with Qt 6 and a Qt File Picker and print dialog. - . - You need to enable it manually by export SAL_USE_VCLPLUGIN=qt6. - Package: libreoffice-plasma Architecture: amd64 arm64 armhf ppc64el riscv64 s390x Depends: libreoffice-core (= ${binary:Version}), diff --git a/control.in b/control.in index e97313504..6754796a4 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-mantic-7.6 +Vcs-Git: https://git.launchpad.net/~libreoffice/ubuntu/+source/libreoffice -b ubuntu-jammy-7.6 Vcs-Browser: https://git.launchpad.net/~libreoffice/ubuntu/+source/libreoffice Bugs: @BUGS@ Homepage: http://www.libreoffice.org diff --git a/rules b/rules index 9d5fdab88..939dc21c8 100755 --- a/rules +++ b/rules @@ -212,7 +212,7 @@ ifeq "$(BUILD_PLASMA)" "y" KF5_QT5_DEPENDS := libreoffice-qt5 (= $${binary:Version}) endif endif -ENABLE_QT6=y +ENABLE_QT6=n # https://www.debian.org/doc/debian-policy/ says this is not defined and must # be ignored, but dh_strip mentions (and honours) it, so... ifneq (noautodbgsym,$(findstring noautodbgsym,$(DEB_BUILD_OPTIONS))) @@ -321,7 +321,7 @@ BUILD_GTK3=y ENABLE_INTROSPECTION=y endif endif -BUILD_GTK4=y +BUILD_GTK4=n ENABLE_EVO2=y ENABLE_GIO=y ENABLE_DCONF=y @@ -728,6 +728,9 @@ ifeq "$(DEB_VENDOR)" "Ubuntu" SYSTEM_STUFF := $(filter-out libfixmath, $(SYSTEM_STUFF)) SYSTEM_STUFF := $(filter-out frozen, $(SYSTEM_STUFF)) + SYSTEM_STUFF := $(filter-out xmlsec, $(SYSTEM_STUFF)) + SYSTEM_STUFF := $(filter-out graphite harfbuzz, $(SYSTEM_STUFF)) + BUGS=mailto:libreoffice@lists.launchpad.net USE_DWZ := n @@ -735,6 +738,9 @@ ifeq "$(DEB_VENDOR)" "Ubuntu" ENABLE_COINMP := n SYSTEM_STUFF := $(filter-out coinmp, $(SYSTEM_STUFF)) + SYSTEM_STUFF := $(filter-out mdds orcus, $(SYSTEM_STUFF)) + BOOKWORM_BACKPORT=y + 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 \; diff --git a/tests/control b/tests/control index 9d4910049..c665458b6 100644 --- a/tests/control +++ b/tests/control @@ -103,7 +103,7 @@ Restrictions: allow-stderr, skippable #Tests: cppunit-subsequentcheck #Architecture: amd64 arm64 riscv64 -#Depends: @builddeps@, libreoffice,libreoffice-core,libreoffice-common,libreoffice-java-common,libreoffice-writer,libreoffice-calc,libreoffice-impress,libreoffice-draw,libreoffice-math,libreoffice-base-core,libreoffice-base,libreoffice-style-breeze,libreoffice-style-colibre,libreoffice-style-sifr,libreoffice-style-elementary,libreoffice-style-karasa-jaga,libreoffice-style-sukapura,libreoffice-style-yaru,libreoffice-gnome,python3-uno,libreoffice-script-provider-python,libreoffice-script-provider-bsh,libreoffice-script-provider-js,libreoffice-sdbc-hsqldb,libreoffice-sdbc-mysql,libreoffice-base-drivers,python3-access2base,python3-scriptforge,libofficebean-java,libreoffice-uiconfig-common,libreoffice-uiconfig-base,libreoffice-uiconfig-calc,libreoffice-uiconfig-draw,libreoffice-uiconfig-impress,libreoffice-uiconfig-math,libreoffice-uiconfig-writer,uno-libs-private,libuno-sal3,libuno-cppu3,ure,ure-java,libunoloader-java,liblibreoffice-java,libreoffice-wiki-publisher,libreoffice-report-builder,libreoffice-report-builder-bin,libreoffice-uiconfig-report-builder,libreoffice-nlpsolver,fonts-opensymbol,libreoffice-dev,libreoffice-dev-gui,libreoffice-dev-common,libreofficekit-dev,libreoffice-gtk3,gir1.2-lokdocview-0.1,liblibreofficekitgtk,libreofficekit-data,libreoffice-gtk4,libreoffice-kf5,libreoffice-qt5,libreoffice-qt6,libreoffice-plasma,libreoffice-sdbc-postgresql,libreoffice-evolution,libreoffice-subsequentcheckbase,libreoffice-smoketest-data,libreoffice-librelogo,libreoffice-sdbc-firebird,libreoffice-style-tango,libunoil-java,libjuh-java,libridl-java,libjurt-java,libreoffice-officebean +#Depends: @builddeps@, libreoffice,libreoffice-core,libreoffice-common,libreoffice-java-common,libreoffice-writer,libreoffice-calc,libreoffice-impress,libreoffice-draw,libreoffice-math,libreoffice-base-core,libreoffice-base,libreoffice-style-breeze,libreoffice-style-colibre,libreoffice-style-sifr,libreoffice-style-elementary,libreoffice-style-karasa-jaga,libreoffice-style-sukapura,libreoffice-style-yaru,libreoffice-gnome,python3-uno,libreoffice-script-provider-python,libreoffice-script-provider-bsh,libreoffice-script-provider-js,libreoffice-sdbc-hsqldb,libreoffice-sdbc-mysql,libreoffice-base-drivers,python3-access2base,python3-scriptforge,libofficebean-java,libreoffice-uiconfig-common,libreoffice-uiconfig-base,libreoffice-uiconfig-calc,libreoffice-uiconfig-draw,libreoffice-uiconfig-impress,libreoffice-uiconfig-math,libreoffice-uiconfig-writer,uno-libs-private,libuno-sal3,libuno-cppu3,ure,ure-java,libunoloader-java,liblibreoffice-java,libreoffice-wiki-publisher,libreoffice-report-builder,libreoffice-report-builder-bin,libreoffice-uiconfig-report-builder,libreoffice-nlpsolver,fonts-opensymbol,libreoffice-dev,libreoffice-dev-gui,libreoffice-dev-common,libreofficekit-dev,libreoffice-gtk3,gir1.2-lokdocview-0.1,liblibreofficekitgtk,libreofficekit-data,libreoffice-kf5,libreoffice-qt5,libreoffice-plasma,libreoffice-sdbc-postgresql,libreoffice-evolution,libreoffice-subsequentcheckbase,libreoffice-smoketest-data,libreoffice-librelogo,libreoffice-sdbc-firebird,libreoffice-style-tango,libunoil-java,libjuh-java,libridl-java,libjurt-java,libreoffice-officebean #Restrictions: build-needed, rw-build-tree, allow-stderr # ## Those tests even work when there is no /usr/lib/libreoffice there in any way. @builddeps@ is enough. @@ -111,12 +111,12 @@ Restrictions: allow-stderr, skippable ## or whatever update broke it we should know #Tests: slowcheck #Architecture: amd64 arm64 riscv64 -##Depends: @builddeps@, libreoffice,libreoffice-core,libreoffice-common,libreoffice-java-common,libreoffice-writer,libreoffice-calc,libreoffice-impress,libreoffice-draw,libreoffice-math,libreoffice-base-core,libreoffice-base,libreoffice-style-breeze,libreoffice-style-colibre,libreoffice-style-sifr,libreoffice-style-elementary,libreoffice-style-karasa-jaga,libreoffice-style-sukapura,libreoffice-style-yaru,libreoffice-gnome,python3-uno,libreoffice-script-provider-python,libreoffice-script-provider-bsh,libreoffice-script-provider-js,libreoffice-sdbc-hsqldb,libreoffice-sdbc-mysql,libreoffice-base-drivers,python3-access2base,python3-scriptforge,libofficebean-java,libreoffice-uiconfig-common,libreoffice-uiconfig-base,libreoffice-uiconfig-calc,libreoffice-uiconfig-draw,libreoffice-uiconfig-impress,libreoffice-uiconfig-math,libreoffice-uiconfig-writer,uno-libs-private,libuno-sal3,libuno-cppu3,ure,ure-java,libunoloader-java,liblibreoffice-java,libreoffice-wiki-publisher,libreoffice-report-builder,libreoffice-report-builder-bin,libreoffice-uiconfig-report-builder,libreoffice-nlpsolver,fonts-opensymbol,libreoffice-dev,libreoffice-dev-gui,libreoffice-dev-common,libreofficekit-dev,libreoffice-gtk3,gir1.2-lokdocview-0.1,liblibreofficekitgtk,libreofficekit-data,libreoffice-gtk4,libreoffice-kf5,libreoffice-qt5,libreoffice-qt6,libreoffice-plasma,libreoffice-sdbc-postgresql,libreoffice-evolution,libreoffice-subsequentcheckbase,libreoffice-smoketest-data,libreoffice-librelogo,libreoffice-sdbc-firebird,libreoffice-style-tango,libunoil-java,libjuh-java,libridl-java,libjurt-java,libreoffice-officebean +##Depends: @builddeps@, libreoffice,libreoffice-core,libreoffice-common,libreoffice-java-common,libreoffice-writer,libreoffice-calc,libreoffice-impress,libreoffice-draw,libreoffice-math,libreoffice-base-core,libreoffice-base,libreoffice-style-breeze,libreoffice-style-colibre,libreoffice-style-sifr,libreoffice-style-elementary,libreoffice-style-karasa-jaga,libreoffice-style-sukapura,libreoffice-style-yaru,libreoffice-gnome,python3-uno,libreoffice-script-provider-python,libreoffice-script-provider-bsh,libreoffice-script-provider-js,libreoffice-sdbc-hsqldb,libreoffice-sdbc-mysql,libreoffice-base-drivers,python3-access2base,python3-scriptforge,libofficebean-java,libreoffice-uiconfig-common,libreoffice-uiconfig-base,libreoffice-uiconfig-calc,libreoffice-uiconfig-draw,libreoffice-uiconfig-impress,libreoffice-uiconfig-math,libreoffice-uiconfig-writer,uno-libs-private,libuno-sal3,libuno-cppu3,ure,ure-java,libunoloader-java,liblibreoffice-java,libreoffice-wiki-publisher,libreoffice-report-builder,libreoffice-report-builder-bin,libreoffice-uiconfig-report-builder,libreoffice-nlpsolver,fonts-opensymbol,libreoffice-dev,libreoffice-dev-gui,libreoffice-dev-common,libreofficekit-dev,libreoffice-gtk3,gir1.2-lokdocview-0.1,liblibreofficekitgtk,libreofficekit-data,libreoffice-kf5,libreoffice-qt5,libreoffice-plasma,libreoffice-sdbc-postgresql,libreoffice-evolution,libreoffice-subsequentcheckbase,libreoffice-smoketest-data,libreoffice-librelogo,libreoffice-sdbc-firebird,libreoffice-style-tango,libunoil-java,libjuh-java,libridl-java,libjurt-java,libreoffice-officebean #Restrictions: build-needed, rw-build-tree, allow-stderr, superficial # #Tests: unitcheck #Architecture: amd64 arm64 riscv64 -#Depends: @builddeps@, libreoffice,libreoffice-core,libreoffice-common,libreoffice-java-common,libreoffice-writer,libreoffice-calc,libreoffice-impress,libreoffice-draw,libreoffice-math,libreoffice-base-core,libreoffice-base,libreoffice-style-breeze,libreoffice-style-colibre,libreoffice-style-sifr,libreoffice-style-elementary,libreoffice-style-karasa-jaga,libreoffice-style-sukapura,libreoffice-style-yaru,libreoffice-gnome,python3-uno,libreoffice-script-provider-python,libreoffice-script-provider-bsh,libreoffice-script-provider-js,libreoffice-sdbc-hsqldb,libreoffice-sdbc-mysql,libreoffice-base-drivers,python3-access2base,python3-scriptforge,libofficebean-java,libreoffice-uiconfig-common,libreoffice-uiconfig-base,libreoffice-uiconfig-calc,libreoffice-uiconfig-draw,libreoffice-uiconfig-impress,libreoffice-uiconfig-math,libreoffice-uiconfig-writer,uno-libs-private,libuno-sal3,libuno-cppu3,ure,ure-java,libunoloader-java,liblibreoffice-java,libreoffice-wiki-publisher,libreoffice-report-builder,libreoffice-report-builder-bin,libreoffice-uiconfig-report-builder,libreoffice-nlpsolver,fonts-opensymbol,libreoffice-dev,libreoffice-dev-gui,libreoffice-dev-common,libreofficekit-dev,libreoffice-gtk3,gir1.2-lokdocview-0.1,liblibreofficekitgtk,libreofficekit-data,libreoffice-gtk4,libreoffice-kf5,libreoffice-qt5,libreoffice-qt6,libreoffice-plasma,libreoffice-sdbc-postgresql,libreoffice-evolution,libreoffice-subsequentcheckbase,libreoffice-smoketest-data,libreoffice-librelogo,libreoffice-sdbc-firebird,libreoffice-style-tango,libunoil-java,libjuh-java,libridl-java,libjurt-java,libreoffice-officebean +#Depends: @builddeps@, libreoffice,libreoffice-core,libreoffice-common,libreoffice-java-common,libreoffice-writer,libreoffice-calc,libreoffice-impress,libreoffice-draw,libreoffice-math,libreoffice-base-core,libreoffice-base,libreoffice-style-breeze,libreoffice-style-colibre,libreoffice-style-sifr,libreoffice-style-elementary,libreoffice-style-karasa-jaga,libreoffice-style-sukapura,libreoffice-style-yaru,libreoffice-gnome,python3-uno,libreoffice-script-provider-python,libreoffice-script-provider-bsh,libreoffice-script-provider-js,libreoffice-sdbc-hsqldb,libreoffice-sdbc-mysql,libreoffice-base-drivers,python3-access2base,python3-scriptforge,libofficebean-java,libreoffice-uiconfig-common,libreoffice-uiconfig-base,libreoffice-uiconfig-calc,libreoffice-uiconfig-draw,libreoffice-uiconfig-impress,libreoffice-uiconfig-math,libreoffice-uiconfig-writer,uno-libs-private,libuno-sal3,libuno-cppu3,ure,ure-java,libunoloader-java,liblibreoffice-java,libreoffice-wiki-publisher,libreoffice-report-builder,libreoffice-report-builder-bin,libreoffice-uiconfig-report-builder,libreoffice-nlpsolver,fonts-opensymbol,libreoffice-dev,libreoffice-dev-gui,libreoffice-dev-common,libreofficekit-dev,libreoffice-gtk3,gir1.2-lokdocview-0.1,liblibreofficekitgtk,libreofficekit-data,libreoffice-kf5,libreoffice-qt5,libreoffice-plasma,libreoffice-sdbc-postgresql,libreoffice-evolution,libreoffice-subsequentcheckbase,libreoffice-smoketest-data,libreoffice-librelogo,libreoffice-sdbc-firebird,libreoffice-style-tango,libunoil-java,libjuh-java,libridl-java,libjurt-java,libreoffice-officebean #Restrictions: build-needed, rw-build-tree, allow-stderr, superficial, skippable Test-Command: for i in /etc/apparmor.d/usr.lib.libreoffice.program.*; do /sbin/apparmor_parser --add --skip-cache --skip-kernel-load $i; done