diff --git a/recipes-libreoffice/libreoffice/libreoffice-native.bb b/recipes-libreoffice/libreoffice/libreoffice-native.bb index 8a10761..cff9697 100644 --- a/recipes-libreoffice/libreoffice/libreoffice-native.bb +++ b/recipes-libreoffice/libreoffice/libreoffice-native.bb @@ -18,31 +18,16 @@ DEPENDS += " \ lcms-native \ nss-native \ cppunit-native \ - libabw-native \ - libcdr-native \ - libe-book-native \ - libfreehand-native \ hunspell-native \ mythes-native \ clucene-core-native \ - libcmis-native \ - libpagemaker-native \ glm-native \ - libetonyek-native \ vigra-native \ - libvisio-native \ libexttextcat-native \ hyphen-native \ unzip-native \ liblangtag-native \ lpsolve-native \ - libwpd-native \ - libwpg-native \ - libwps-native \ - libcdr-native \ - libmspub-native \ - libmwaw-native \ - libodfgen-native \ mdds-1.5-native \ " @@ -51,12 +36,18 @@ SRC_URI += " \ file://0002-cppuhelper-defaultbootstrap-output-debug-information.patch \ file://0003-add-gengal-debug-information.patch \ file://0004-gengal-fix-path-to-redirectrc.patch \ + file://0005-Do-not-check-download-lib-unnecessary-for-native-bui.patch \ + file://0006-Do-not-fetch-fonts-for-native-tools.patch \ " EXTRA_OECONF += " \ --without-java \ \ --disable-gui \ + --disable-extensions \ + --disable-extension-integration \ + \ + --disable-mariadb-sdbc \ --disable-postgresql-sdbc \ --disable-lotuswordpro \ --disable-firebird-sdbc \ @@ -65,6 +56,9 @@ EXTRA_OECONF += " \ --disable-scripting-javascript \ --disable-pdfimport \ --disable-coinmp \ + --disable-opencl \ + --disable-zxing \ + --disable-cmis \ " do_configure() { diff --git a/recipes-libreoffice/libreoffice/libreoffice-native/0005-Do-not-check-download-lib-unnecessary-for-native-bui.patch b/recipes-libreoffice/libreoffice/libreoffice-native/0005-Do-not-check-download-lib-unnecessary-for-native-bui.patch new file mode 100644 index 0000000..2b63be0 --- /dev/null +++ b/recipes-libreoffice/libreoffice/libreoffice-native/0005-Do-not-check-download-lib-unnecessary-for-native-bui.patch @@ -0,0 +1,78 @@ +From ecbbe1230e6cc2558cf0cacecb380d990b1aa65f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Thu, 19 Aug 2021 15:35:53 +0200 +Subject: [PATCH] Do not check / download lib unnecessary for native build +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Andreas Müller +--- + configure.ac | 50 -------------------------------------------------- + 1 file changed, 50 deletions(-) + +diff --git a/configure.ac b/configure.ac +index b629d5a..58aa736 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -9237,57 +9237,7 @@ else + fi + AC_SUBST([ENABLE_EOT]) + +-dnl =================================================================== +-dnl Check for DLP libs +-dnl =================================================================== +-AS_IF([test "$COM" = "MSC"], +- [librevenge_libdir="${WORKDIR}/LinkTarget/Library"], +- [librevenge_libdir="${WORKDIR}/UnpackedTarball/librevenge/src/lib/.libs"] +-) +-libo_CHECK_SYSTEM_MODULE([librevenge],[REVENGE],[librevenge-0.0 >= 0.0.1],["-I${WORKDIR}/UnpackedTarball/librevenge/inc"],["-L${librevenge_libdir} -lrevenge-0.0"]) +- +-libo_CHECK_SYSTEM_MODULE([libodfgen],[ODFGEN],[libodfgen-0.1]) +- +-libo_CHECK_SYSTEM_MODULE([libepubgen],[EPUBGEN],[libepubgen-0.1]) +- +-AS_IF([test "$COM" = "MSC"], +- [libwpd_libdir="${WORKDIR}/LinkTarget/Library"], +- [libwpd_libdir="${WORKDIR}/UnpackedTarball/libwpd/src/lib/.libs"] +-) +-libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.10],["-I${WORKDIR}/UnpackedTarball/libwpd/inc"],["-L${libwpd_libdir} -lwpd-0.10"]) +- +-libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.3]) +- +-libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.4]) +-libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.12]) +- +-libo_CHECK_SYSTEM_MODULE([libvisio],[VISIO],[libvisio-0.1]) +- +-libo_CHECK_SYSTEM_MODULE([libcdr],[CDR],[libcdr-0.1]) +- +-libo_CHECK_SYSTEM_MODULE([libmspub],[MSPUB],[libmspub-0.1]) +- +-libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.1]) +-libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.19]) +- +-libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1]) +-libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.10]) +- +-libo_CHECK_SYSTEM_MODULE([libfreehand],[FREEHAND],[libfreehand-0.1]) +- +-libo_CHECK_SYSTEM_MODULE([libebook],[EBOOK],[libe-book-0.1]) +-libo_PKG_VERSION([EBOOK], [libe-book-0.1], [0.1.2]) +- +-libo_CHECK_SYSTEM_MODULE([libabw],[ABW],[libabw-0.1]) +- +-libo_CHECK_SYSTEM_MODULE([libpagemaker],[PAGEMAKER],[libpagemaker-0.0]) +- +-libo_CHECK_SYSTEM_MODULE([libqxp],[QXP],[libqxp-0.0]) +- +-libo_CHECK_SYSTEM_MODULE([libzmf],[ZMF],[libzmf-0.0]) + +-libo_CHECK_SYSTEM_MODULE([libstaroffice],[STAROFFICE],[libstaroffice-0.0]) +-libo_PKG_VERSION([STAROFFICE], [libstaroffice-0.0], [0.0.7]) + + dnl =================================================================== + dnl Check for system lcms2 +-- +2.31.1 + diff --git a/recipes-libreoffice/libreoffice/libreoffice-native/0006-Do-not-fetch-fonts-for-native-tools.patch b/recipes-libreoffice/libreoffice/libreoffice-native/0006-Do-not-fetch-fonts-for-native-tools.patch new file mode 100644 index 0000000..da3d1b9 --- /dev/null +++ b/recipes-libreoffice/libreoffice/libreoffice-native/0006-Do-not-fetch-fonts-for-native-tools.patch @@ -0,0 +1,46 @@ +From 2821815a425c4c944e1106f2790945fb09f0ee2a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Thu, 19 Aug 2021 17:52:36 +0200 +Subject: [PATCH] Do not fetch fonts for native tools +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Andreas Müller +--- + Makefile.fetch | 19 ------------------- + 1 file changed, 19 deletions(-) + +diff --git a/Makefile.fetch b/Makefile.fetch +index 3c5b7ed..f76b304 100644 +--- a/Makefile.fetch ++++ b/Makefile.fetch +@@ -171,25 +171,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S + $(call fetch_Optional,MDDS,MDDS_TARBALL) \ + $(call fetch_Optional,ZXING,ZXING_TARBALL) \ + $(call fetch_Optional,MDNSRESPONDER,MDNSRESPONDER_TARBALL) \ +- $(call fetch_Optional,MORE_FONTS,FONT_CALADEA_TARBALL) \ +- $(call fetch_Optional,MORE_FONTS,FONT_CARLITO_TARBALL) \ +- $(call fetch_Optional,MORE_FONTS,FONT_DEJAVU_TARBALL) \ +- $(call fetch_Optional,MORE_FONTS,FONT_GENTIUM_TARBALL) \ +- $(call fetch_Optional,MORE_FONTS,FONT_LIBERATION_NARROW_TARBALL) \ +- $(call fetch_Optional,MORE_FONTS,FONT_LIBERATION_TARBALL) \ +- $(call fetch_Optional,MORE_FONTS,FONT_LINLIBERTINEG_TARBALL) \ +- $(call fetch_Optional,MORE_FONTS,FONT_SOURCECODE_TARBALL) \ +- $(call fetch_Optional,MORE_FONTS,FONT_SOURCESANS_TARBALL) \ +- $(call fetch_Optional,MORE_FONTS,FONT_SOURCESERIF_TARBALL) \ +- $(call fetch_Optional,MORE_FONTS,FONT_EMOJIONE_COLOR_TARBALL) \ +- $(call fetch_Optional,MORE_FONTS,FONT_NOTO_TARBALL) \ +- $(call fetch_Optional,MORE_FONTS,FONT_CULMUS_TARBALL) \ +- $(call fetch_Optional,MORE_FONTS,FONT_LIBRE_HEBREW_TARBALL) \ +- $(call fetch_Optional,MORE_FONTS,FONT_ALEF_TARBALL) \ +- $(call fetch_Optional,MORE_FONTS,FONT_AMIRI_TARBALL) \ +- $(call fetch_Optional,MORE_FONTS,FONT_KACST_TARBALL) \ +- $(call fetch_Optional,MORE_FONTS,FONT_REEM_TARBALL) \ +- $(call fetch_Optional,MORE_FONTS,FONT_SCHEHERAZADE_TARBALL) \ + $(call fetch_Optional,MSPUB,MSPUB_TARBALL) \ + $(call fetch_Optional,MWAW,MWAW_TARBALL) \ + $(call fetch_Optional,MYTHES,MYTHES_TARBALL) \ +-- +2.31.1 + diff --git a/recipes-libreoffice/libreoffice/libreoffice-version.inc b/recipes-libreoffice/libreoffice/libreoffice-version.inc index 8006bd7..cc96d41 100644 --- a/recipes-libreoffice/libreoffice/libreoffice-version.inc +++ b/recipes-libreoffice/libreoffice/libreoffice-version.inc @@ -1,5 +1,5 @@ -PV = "7.1.5.2" -DIRV = "7.1.5" +PV = "7.2.0.4" +DIRV = "7.2.0" SRC_URI += "http://download.documentfoundation.org/libreoffice/src/${DIRV}/libreoffice-${PV}.tar.xz" -SRC_URI[sha256sum] = "aeaf30367665bdfdcf780d2b28e304352255de778db41d32d12cd77d5b2385ce" +SRC_URI[sha256sum] = "28aac16d3b33ed8196be5ff0b5108dec36b73f85a68b857e221850d15b715576" diff --git a/recipes-libreoffice/libreoffice/libreoffice.bb b/recipes-libreoffice/libreoffice/libreoffice.bb index 88671ce..edbd2d3 100644 --- a/recipes-libreoffice/libreoffice/libreoffice.bb +++ b/recipes-libreoffice/libreoffice/libreoffice.bb @@ -18,7 +18,7 @@ SRC_URI += " \ file://0010-Support-install-to-find-bash-completion.in.patch \ " -SRC_URI[translations.sha256sum] = "b86740debc717bdeca918ba068ead6c7a16e70a232eeac43bbb31e2a02d0c559" +SRC_URI[translations.sha256sum] = "e1bc3c859b3d0f33f9c29f4d66a7194eac5c06ec860006adb77a8458378f9d23" DEPENDS += " \ ${BPN}-native \ @@ -52,7 +52,6 @@ DEPENDS += " \ libwpd \ libcdr \ librevenge \ - libcmis \ libfreehand \ libe-book \ libmwaw \ @@ -91,6 +90,9 @@ export STAGING_INCDIR # 3. --enable-scripting-javascript / rhino meta-java # 4. Libreoffice Base embedded db / hsqldb meta-java +# Notes: +# * With 7.2.0.4 lo requires a tailored libcmis so we cannot use ours + EXTRA_OECONF += " \ --without-java \ --with-lang=ALL \ @@ -113,10 +115,17 @@ EXTRA_OECONF += " \ --with-system-glm \ --with-system-redland \ --with-system-libabw \ - --with-system-libcmis \ + --with-system-libwps \ + --with-system-libwpg \ + --with-system-libwpd \ + --with-system-libcdr \ + --with-system-librevenge \ + --with-system-libfreehand \ --with-system-libebook \ + --with-system-libmwaw \ --with-system-libetonyek \ --with-system-libvisio \ + --with-system-libmspub \ --with-system-libpagemaker \ --with-system-libodfgen \ --with-system-libexttextcat \ diff --git a/recipes-libreoffice/libreoffice/libreoffice.inc b/recipes-libreoffice/libreoffice/libreoffice.inc index 12a3388..71fa867 100644 --- a/recipes-libreoffice/libreoffice/libreoffice.inc +++ b/recipes-libreoffice/libreoffice/libreoffice.inc @@ -53,33 +53,14 @@ EXTRA_OECONF = " \ --with-system-lcms2 \ --with-system-nss \ --with-system-cppunit \ - --with-system-libabw \ - --with-system-libcdr \ - --with-system-libebook \ - --with-system-libfreehand \ --with-system-hunspell \ --with-system-mythes \ --with-system-clucene \ - --with-system-libcmis \ - --with-system-libpagemaker \ --with-system-glm \ - --with-system-libetonyek \ - --with-system-libvisio \ --with-system-libexttextcat \ --with-system-altlinuxhyph \ - --with-system-librevenge \ - --with-system-libabw \ - --with-system-libcdr \ - --with-system-libebook \ - --with-system-libfreehand \ --with-system-liblangtag \ --with-system-zlib \ --with-system-lpsolve \ - --with-system-libwpd \ - --with-system-libwpg \ - --with-system-libwps \ - --with-system-libcdr \ - --with-system-libmspub \ - --with-system-libmwaw \ --with-system-mdds \ " diff --git a/recipes-libreoffice/libreoffice/libreoffice/0002-Makefile.in-avoid-building-target-cross-toolset.patch b/recipes-libreoffice/libreoffice/libreoffice/0002-Makefile.in-avoid-building-target-cross-toolset.patch index d1aed2f..5eb683d 100644 --- a/recipes-libreoffice/libreoffice/libreoffice/0002-Makefile.in-avoid-building-target-cross-toolset.patch +++ b/recipes-libreoffice/libreoffice/libreoffice/0002-Makefile.in-avoid-building-target-cross-toolset.patch @@ -14,18 +14,18 @@ Signed-off-by: Andreas Müller 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in -index 393e94f..5cdb930 100644 +index f9a2644..c1a8f53 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -280,7 +280,7 @@ bootstrap: check-if-root compilerplugins +@@ -282,7 +282,7 @@ bootstrap: check-if-root compilerplugins # Note: this will pipe through all gbuild targets to ... gbuild # with some translations like "check"->"unitcheck subsequentcheck uicheck" for historic reasons # --build: bootstrap fetch $(if $(CROSS_COMPILING),cross-toolset) \ +-build: bootstrap fetch $(if $(CROSS_COMPILING),cross-toolset,install-gdb-printers) \ +build: bootstrap fetch \ - $(if $(filter check,$(MAKECMDGOALS)),$(if $(COMPILER_PLUGINS),$(if $(LODE_HOME),clang-format-check))) \ - install-gdb-printers + $(if $(filter check,$(MAKECMDGOALS)),$(if $(COMPILER_PLUGINS),$(if $(LODE_HOME),clang-format-check))) $(MAKE) $(PARALLELISM_OPTION) $(IWYU_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $(build_goal) + ifeq ($(OS),iOS) -- -2.21.0 +2.31.1