diff --git a/changelog b/changelog index 55a09f9d..af504d7e 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,14 @@ +libreoffice (1:7.3.5-0ubuntu0.22.04.1~bpo20.04.1) focal-backports; urgency=medium + + * Backport from jammy (LP: #1987045) + * Lower dpkg-dev requirement + - buildopts.mk is not available in dpkg-dev < 1.20.1 + * Lower libclucene-dev requirement + * Use internal abseil, cuckoo, gpgmepp, libmwaw, libwps, mdds, orcus + to meat upstream requirements + + -- Rico Tzschichholz Fri, 19 Aug 2022 12:25:17 +0200 + libreoffice (1:7.3.5-0ubuntu0.22.04.1) jammy; urgency=medium * New upstream release (LP: #1981966) diff --git a/control b/control index d6a21074..b060898f 100644 --- a/control +++ b/control @@ -18,7 +18,7 @@ Build-Depends: ant (>= 1.7.0) , 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,7 +29,6 @@ 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 , @@ -40,12 +39,13 @@ Build-Depends: ant (>= 1.7.0) , 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~), - libcuckoo-dev, + libclucene-dev (>= 2.3.3.4-4.1), libcups2-dev, libcurl4-gnutls-dev (>= 7.68), libdbus-1-dev (>= 0.60), @@ -70,9 +70,6 @@ Build-Depends: ant (>= 1.7.0) , 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, @@ -93,20 +90,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, @@ -127,8 +118,6 @@ Build-Depends: ant (>= 1.7.0) , 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, @@ -177,8 +166,6 @@ Build-Depends-Arch: firebird3.0-server-core , 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 , @@ -198,7 +185,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-jammy-7.3 +Vcs-Git: https://git.launchpad.net/~libreoffice/ubuntu/+source/libreoffice -b ubuntu-focal-7.3 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 d15bf23d..90a5afc1 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-focal-7.3 Vcs-Browser: https://git.launchpad.net/~libreoffice/ubuntu/+source/libreoffice Bugs: @BUGS@ Homepage: http://www.libreoffice.org 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 041e24f7..6fabe09c 100644 --- a/patches/series +++ b/patches/series @@ -52,3 +52,4 @@ yaru-ubuntu-default.diff sfx2-Put-temp-file-for-offline-help-inside-user-s-do.patch arm-fp-mode.diff moreIconsDialog-accesses-internet.diff +icu-66.patch diff --git a/rules b/rules index c75b7c71..238fdec4 100755 --- a/rules +++ b/rules @@ -697,6 +697,11 @@ ifeq "$(DEB_VENDOR)" "Ubuntu" ENABLE_COINMP := n SYSTEM_STUFF := $(filter-out coinmp, $(SYSTEM_STUFF)) + SYSTEM_STUFF := $(filter-out cuckoo, $(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)) + 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 \; @@ -855,7 +860,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) @@ -1003,7 +1007,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) @@ -1234,7 +1238,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 @@ -1716,11 +1720,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"