diff --git a/changelog b/changelog index a510e0be..e01ec15a 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,14 @@ +libreoffice (1:7.1.7-0ubuntu0.20.04.1) focal-backports; urgency=medium + + * Backport from hirsute (LP: #1950467) + * Lower dpkg-dev requirement + - buildopts.mk is not available in dpkg-dev < 1.20.1 + * Lower libclucene-dev requirement + * Use internal orcus, libmwaw, libwps to meat upstream requirements + * Use internal neon27 while 0.31.1 is required + + -- Rico Tzschichholz Thu, 04 Nov 2021 16:22:24 +0100 + libreoffice (1:7.1.7-0ubuntu0.21.04.1) hirsute; urgency=medium * New upstream release (LP: #1948933) diff --git a/control b/control index 5da8f265..98a4c090 100644 --- a/control +++ b/control @@ -19,7 +19,7 @@ Build-Depends: ant (>= 1.7.0) [!hppa !mips64 !s390 !sparc] , default-libmysqlclient-dev, dh-apparmor, dh-python , - dpkg-dev (>= 1.20.1), + dpkg-dev (>= 1.18.2~), firebird-dev (>= 3.0.0.32483.ds4-4) [!hppa !mips64 !s390 !sparc], firebird3.0-server-core [!hppa !mips64 !s390 !sparc] , flex (>= 2.3.35), @@ -53,11 +53,13 @@ Build-Depends: ant (>= 1.7.0) [!hppa !mips64 !s390 !sparc] , libboost-filesystem-dev (>= 1.71), libboost-iostreams-dev (>= 1.71), libboost-locale-dev (>= 1.71), + libboost-program-options-dev (>= 1.71), + libboost-system-dev (>= 1.71), 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), libcmis-dev (<< 0.6~), libcmis-dev (>= 0.5.2~), libcommons-logging-java [!hppa !mips64 !s390 !sparc] , @@ -83,11 +85,13 @@ Build-Depends: ant (>= 1.7.0) [!hppa !mips64 !s390 !sparc] , libfreehand-dev (<< 0.2~), libfreehand-dev (>= 0.1), libfreetype6-dev (>= 2.2.0), + libgcrypt-dev, libgirepository1.0-dev (>= 1.32), libgl-dev, libglib2.0-dev (>= 2.38.0), libglib2.0-dev (>= 2.4), libglm-dev (>= 0.9.9~a2), + libgnutls-openssl-dev, libgpg-error-dev, libgpgme-dev, libgpgmepp-dev, @@ -115,18 +119,12 @@ Build-Depends: ant (>= 1.7.0) [!hppa !mips64 !s390 !sparc] , libmdds-dev (>= 1.5), libmspub-dev (<< 0.2~), libmspub-dev (>= 0.1), - libmwaw-dev (<< 0.4~), - libmwaw-dev (>= 0.3.1), - libmwaw-dev (>= 0.3.17) , libmythes-dev (>= 2:1.2), - libneon27-gnutls-dev (>= 0.31.1), libnspr4-dev, libnss3-dev (>= 3.12.3), libodfgen-dev (<< 0.2~), libodfgen-dev (>= 0.1), libopenjp2-7-dev, - liborcus-dev (<< 0.17~), - liborcus-dev (>= 0.16), libpagemaker-dev, libpagemaker-dev (<< 0.1~), libpng-dev, @@ -147,9 +145,6 @@ Build-Depends: ant (>= 1.7.0) [!hppa !mips64 !s390 !sparc] , libwpd-dev (>= 0.10), libwpg-dev (<< 0.4~), libwpg-dev (>= 0.3), - libwps-dev (<< 0.5~), - libwps-dev (>= 0.4), - libwps-dev (>= 0.4.12) , libx11-dev, libx11-xcb-dev, libxaw7-dev, @@ -198,7 +193,7 @@ 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-hirsute-7.1 +Vcs-Git: https://git.launchpad.net/~libreoffice/ubuntu/+source/libreoffice -b ubuntu-focal-7.1 Vcs-Browser: https://git.launchpad.net/~libreoffice/ubuntu/+source/libreoffice Bugs: mailto:libreoffice@lists.launchpad.net Homepage: http://www.libreoffice.org diff --git a/control.in b/control.in index 6c99be44..3c75af4a 100644 --- a/control.in +++ b/control.in @@ -11,7 +11,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-hirsute-7.1 +Vcs-Git: https://git.launchpad.net/~libreoffice/ubuntu/+source/libreoffice -b ubuntu-focal-7.1 Vcs-Browser: https://git.launchpad.net/~libreoffice/ubuntu/+source/libreoffice Bugs: @BUGS@ Homepage: http://www.libreoffice.org diff --git a/patches/fix-internal-neon-build.diff b/patches/fix-internal-neon-build.diff new file mode 100644 index 00000000..9fadc9aa --- /dev/null +++ b/patches/fix-internal-neon-build.diff @@ -0,0 +1,40 @@ +diff --git a/configure.ac b/configure.ac +index e333538a2601..d55d4961866f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -10716,7 +10716,6 @@ dnl =================================================================== + dnl Check for building gnutls + dnl =================================================================== + AC_MSG_CHECKING([whether to use gnutls]) +-if test "$WITH_WEBDAV" = "neon" -a "$with_system_neon" = no -a "$enable_openssl" = "no"; then + AC_MSG_RESULT([yes]) + AM_PATH_LIBGCRYPT() + PKG_CHECK_MODULES(GNUTLS, [gnutls],, +@@ -10724,9 +10723,6 @@ if test "$WITH_WEBDAV" = "neon" -a "$with_system_neon" = no -a "$enable_openssl" + available in the system to use as replacement.]])) + FilterLibs "${LIBGCRYPT_LIBS}" + LIBGCRYPT_LIBS="${filteredlibs}" +-else +- AC_MSG_RESULT([no]) +-fi + + AC_SUBST([LIBGCRYPT_CFLAGS]) + AC_SUBST([LIBGCRYPT_LIBS]) +diff --git a/external/neon/configs/config.h b/external/neon/configs/config.h +index 3f93d1e68132..bd18d032afbc 100644 +--- a/external/neon/configs/config.h ++++ b/external/neon/configs/config.h +@@ -89,6 +89,13 @@ + /* Define to 1 if you have the `gnutls_certificate_verify_peers2' function. */ + #define HAVE_GNUTLS_CERTIFICATE_VERIFY_PEERS2 + ++/* Define to 1 if you have the `gnutls_certificate_set_retrieve_function2' ++ function. */ ++#define HAVE_GNUTLS_CERTIFICATE_SET_RETRIEVE_FUNCTION2 ++ ++/* Define to 1 if you have the `gnutls_privkey_import_ext' function. */ ++#define HAVE_GNUTLS_PRIVKEY_IMPORT_EXT ++ + /* Define to 1 if you have the `gnutls_session_get_data2' function. */ + #define HAVE_GNUTLS_SESSION_GET_DATA2 + diff --git a/patches/series b/patches/series index 45a41d8e..3cc80801 100644 --- a/patches/series +++ b/patches/series @@ -46,6 +46,7 @@ pdfium-m68k.diff pdfium-use-system-libopenjpeg.diff apparmor-updates.diff apparmor-gnupg.diff +fix-internal-neon-build.diff disable-failing-arm64-tests.diff disable-flaky-arm-tests.diff fix-noto-sans-in-templates.diff diff --git a/rules b/rules index fb9383af..104156f2 100755 --- a/rules +++ b/rules @@ -626,6 +626,11 @@ ifeq "$(DEB_VENDOR)" "Ubuntu" ENABLE_COINMP := n SYSTEM_STUFF := $(filter-out coinmp, $(SYSTEM_STUFF)) + FOCAL_BACKPORT=y + SYSTEM_STUFF := $(filter-out orcus, $(SYSTEM_STUFF)) + SYSTEM_STUFF := $(filter-out libmwaw libwps, $(SYSTEM_STUFF)) + SYSTEM_STUFF := $(filter-out neon, $(SYSTEM_STUFF)) + 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 \; @@ -882,7 +887,11 @@ ifeq "$(ENABLE_PYTHON)" "y" endif BUILD_DEPS += , debhelper-compat (= 12) +ifneq "$(FOCAL_BACKPORT)" "y" BUILD_DEPS += , dpkg-dev (>= 1.20.1) +else + BUILD_DEPS += , dpkg-dev (>= 1.18.2~) +endif ifeq "$(RUN_MAKE_CHECK)" "y" BUILD_DEPS += , locales$(OOO_NO_CHECK_ARCHS) @@ -1110,7 +1119,7 @@ ifneq (,$(filter orcus, $(SYSTEM_STUFF))) endif 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 ifeq "$(USE_EXTERNAL_CXXLIBS)" "y" @@ -1429,6 +1438,8 @@ ifeq "$(ENABLE_WEBDAV)" "y" else BUILD_DEPS += , libneon$(NEONSONR)-dev (>= 0.31.1) endif + else + BUILD_DEPS += , libgnutls-openssl-dev, libgcrypt-dev endif else ifneq (,$(filter apr, $(SYSTEM_STUFF))) @@ -1560,8 +1571,12 @@ endif ## Build n projects in parallel? ## DEB_BUILD_OPTIONS=parallel= ## if not specified LibreOffices configure tries to find it out itself +ifneq "$(FOCAL_BACKPORT)" "y" include /usr/share/dpkg/buildopts.mk NUM_CPUS=$(DEB_BUILD_OPTION_PARALLEL) +else +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" # we need to specify it only if it differs, otherwise configure autodetects