Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2021-10-11 15:30:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreoffice (Old) and /work/SRC/openSUSE:Factory/.libreoffice.new.2443 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice" Mon Oct 11 15:30:31 2021 rev:236 rq:922557 version:7.2.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2021-08-24 10:54:13.484372451 +0200 +++ /work/SRC/openSUSE:Factory/.libreoffice.new.2443/libreoffice.changes 2021-10-11 15:30:59.674785071 +0200 @@ -1,0 +2,32 @@ +Thu Sep 30 13:53:39 UTC 2021 - Danilo Spinella <danilo.spine...@suse.com> + +- Update to 7.2.2.1 +- Refresh pld-skia-patches.patch + +------------------------------------------------------------------- +Wed Sep 29 14:07:19 UTC 2021 - Andras Timar <andras.ti...@collabora.com> + +- Fix bsc#1189813: LO-L3: Shadow effect for tables in PPTX partly incorrect + * bsc1189813.patch + +------------------------------------------------------------------- +Fri Sep 24 13:39:16 UTC 2021 - Danilo Spinella <danilo.spine...@suse.com> + +- Add vendored poppler to use for all codestreams except Tumbleweed. + +------------------------------------------------------------------- +Thu Sep 23 11:45:36 UTC 2021 - Danilo Spinella <danilo.spine...@suse.com> + +- Use vendored boost for all codestreams except Tumbleweed. + Update boost vendored version. + +------------------------------------------------------------------- +Tue Sep 14 10:26:02 UTC 2021 - Danilo Spinella <danilo.spine...@suse.com> + +- Update to 7.2.1.2: + * LO minor release +- Added patch: + * pld-skia-patches.patch + * skia-freetype2.11.patch + +------------------------------------------------------------------- @@ -4,0 +37,15 @@ + +------------------------------------------------------------------- +Tue Aug 3 09:05:09 UTC 2021 - Mark??ta Machov?? <mmach...@suse.com> + +- Update to 7.2.0 + * LO major release +- Dropped patches: + * use-comphelper.patch + * bsc1184961.patch + * bsc1185505.patch + * bsc1185797.patch + * bsc1182969.patch + * bsc1187173.patch + * tdf142839.patch + * multicolumn-crash-fix.patch Old: ---- boost_1_71_0.tar.xz bsc1182969.patch bsc1187173.patch libreoffice-7.1.5.2.tar.xz libreoffice-7.1.5.2.tar.xz.asc libreoffice-help-7.1.5.2.tar.xz libreoffice-help-7.1.5.2.tar.xz.asc libreoffice-translations-7.1.5.2.tar.xz libreoffice-translations-7.1.5.2.tar.xz.asc multicolumn-crash-fix.patch pdfium-4306.tar.bz2 skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz tdf142839.patch use-comphelper.patch New: ---- boost_1_75_0.tar.xz bsc1189813.patch libcmis-0.5.2.tar.xz libreoffice-7.2.2.1.tar.xz libreoffice-7.2.2.1.tar.xz.asc libreoffice-help-7.2.2.1.tar.xz libreoffice-help-7.2.2.1.tar.xz.asc libreoffice-translations-7.2.2.1.tar.xz libreoffice-translations-7.2.2.1.tar.xz.asc pdfium-4500.tar.bz2 pld-skia-patches.patch poppler-21.01.0.tar.xz poppler-data-0.4.10.tar.gz skia-freetype2.11.patch skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice.spec ++++++ --- /var/tmp/diff_new_pack.7w0i1T/_old 2021-10-11 15:31:03.342790951 +0200 +++ /var/tmp/diff_new_pack.7w0i1T/_new 2021-10-11 15:31:03.346790958 +0200 @@ -46,7 +46,7 @@ %endif %bcond_with firebird Name: libreoffice -Version: 7.1.5.2 +Version: 7.2.2.1 Release: 0 Summary: A Free Office Suite (Framework) License: LGPL-3.0-or-later AND MPL-2.0+ @@ -87,11 +87,14 @@ Source2006: https://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar Source2007: https://dev-www.libreoffice.org/extern/odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar # PDFium is bundled everywhere -Source2008: %{external_url}/pdfium-4306.tar.bz2 +Source2008: %{external_url}/pdfium-4500.tar.bz2 # Single C file with patches from LO Source2009: %{external_url}/dtoa-20180411.tgz # Skia is part of chromium and bundled everywhere as by google only way is monorepo way -Source2010: %{external_url}/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz +Source2010: %{external_url}/skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz +# Fix the build with freetype-2.11 +Source2011: skia-freetype2.11.patch +Source2012: %{external_url}/libcmis-0.5.2.tar.xz # change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse # to avoid BerkleyDB incompatibility with the plain build Patch1: scp2-user-config-suse.diff @@ -99,18 +102,11 @@ # FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files Patch2: nlpsolver-no-broken-help.diff Patch3: mediawiki-no-broken-help.diff -# PATCH-FIX-UPSTREAM https://github.com/LibreOffice/core/commit/f14b83b38d35a585976ef5d422754d8e0d0266a6 ucp: fix call to getComponentContext -Patch4: use-comphelper.patch # PATCH-FIX-OPENSUSE boo#1186110 fix GCC 11 error Patch6: gcc11-fix-error.patch -# bsc#1182969 Multi column textbox in editengine -Patch9: bsc1182969.patch -# tdf#142839 Fix a regression caused by "Multi column textbox in editengine" -Patch10: tdf142839.patch -# Avoid crash getting default item for OWN_ATTR_TEXTCOLUMNS -Patch11: multicolumn-crash-fix.patch -# bsc#1187173, bsc#1186871 fix component handling for ucpdav1 when --with-webdav=serf -Patch12: bsc1187173.patch +Patch7: pld-skia-patches.patch +# bsc#1189813 LO-L3: Shadow effect for tables in PPTX partly incorrect +Patch8: bsc1189813.patch # Build with java 8 Patch101: 0001-Revert-java-9-changes.patch # try to save space by using hardlinks @@ -161,7 +157,6 @@ BuildRequires: pkgconfig BuildRequires: python3-lxml BuildRequires: python3-xml -BuildRequires: qrcodegen-devel BuildRequires: sac BuildRequires: ucpp BuildRequires: unixODBC-devel @@ -177,6 +172,7 @@ BuildRequires: pkgconfig(dbus-1) >= 0.60 BuildRequires: pkgconfig(epoxy) >= 1.2 BuildRequires: pkgconfig(expat) +BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glib-2.0) >= 2.40 BuildRequires: pkgconfig(glu) @@ -193,20 +189,20 @@ BuildRequires: pkgconfig(libabw-0.1) BuildRequires: pkgconfig(libcdr-0.1) >= 0.1 BuildRequires: pkgconfig(libclucene-core) -BuildRequires: pkgconfig(libcmis-0.5) >= 0.5.2 BuildRequires: pkgconfig(libe-book-0.1) >= 0.1.1 BuildRequires: pkgconfig(libeot) >= 0.01 BuildRequires: pkgconfig(libepubgen-0.1) -BuildRequires: pkgconfig(libetonyek-0.1) >= 0.1.8 +BuildRequires: pkgconfig(libetonyek-0.1) >= 0.1.10 BuildRequires: pkgconfig(libexttextcat) >= 3.1.1 BuildRequires: pkgconfig(libfreehand-0.1) BuildRequires: pkgconfig(liblangtag) BuildRequires: pkgconfig(libmspub-0.1) >= 0.1 -BuildRequires: pkgconfig(libmwaw-0.3) >= 0.3.16 +BuildRequires: pkgconfig(libmwaw-0.3) >= 0.3.19 BuildRequires: pkgconfig(libnumbertext) >= 1.0.6 BuildRequires: pkgconfig(libodfgen-0.1) >= 0.1.4 BuildRequires: pkgconfig(liborcus-0.16) BuildRequires: pkgconfig(libpagemaker-0.0) +BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libpq) BuildRequires: pkgconfig(libqxp-0.0) BuildRequires: pkgconfig(librevenge-0.0) >= 0.0.1 @@ -223,8 +219,6 @@ BuildRequires: pkgconfig(mythes) BuildRequires: pkgconfig(nspr) >= 4.8 BuildRequires: pkgconfig(nss) >= 3.9.3 -BuildRequires: pkgconfig(poppler) -BuildRequires: pkgconfig(poppler-cpp) BuildRequires: pkgconfig(python3) BuildRequires: pkgconfig(redland) BuildRequires: pkgconfig(sane-backends) @@ -232,6 +226,7 @@ BuildRequires: pkgconfig(xmlsec1-nss) >= 1.2.28 BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(xt) +BuildRequires: pkgconfig(zxing) Requires: liberation-fonts Requires: libreoffice-branding >= 6.0 Requires: libreoffice-icon-themes = %{version} @@ -262,9 +257,21 @@ Provides: %{name}-icon-theme-oxygen = %{version} Obsoletes: %{name}-icon-theme-oxygen < %{version} ExclusiveArch: aarch64 %{ix86} x86_64 ppc64le -%if 0%{?suse_version} < 1500 +%if 0%{?suse_version} < 1550 # Too old boost on the system -Source2020: %{external_url}/boost_1_71_0.tar.xz +Source2020: %{external_url}/boost_1_75_0.tar.xz +Source2023: %{external_url}/poppler-21.01.0.tar.xz +Source2024: %{external_url}/poppler-data-0.4.10.tar.gz +%else +BuildRequires: libboost_date_time-devel +BuildRequires: libboost_filesystem-devel +BuildRequires: libboost_iostreams-devel +BuildRequires: libboost_locale-devel +BuildRequires: libboost_system-devel +BuildRequires: pkgconfig(poppler) >= 21.01.0 +BuildRequires: pkgconfig(poppler-cpp) +%endif +%if 0%{?suse_version} < 1500 # Too old icu on the system Source2021: %{external_url}/icu4c-68_1-src.tgz Source2022: %{external_url}/icu4c-68_1-data.zip @@ -284,11 +291,6 @@ %else BuildRequires: gcc >= 7 BuildRequires: gcc-c++ >= 7 -BuildRequires: libboost_date_time-devel -BuildRequires: libboost_filesystem-devel -BuildRequires: libboost_iostreams-devel -BuildRequires: libboost_locale-devel -BuildRequires: libboost_system-devel # genbrk binary is required BuildRequires: icu BuildRequires: java-devel >= 9 @@ -362,6 +364,7 @@ Obsoletes: libreoffice-branding-openSUSE < 4.0.1 Provides: libreoffice-branding-SLE = 4.0.1 Obsoletes: libreoffice-branding-SLE < 4.0.1 +Supplements: (libreoffice and branding-openSUSE) BuildArch: noarch %description branding-upstream @@ -570,11 +573,11 @@ Summary: Gtk3 interface for LibreOffice Group: Productivity/Office/Suite Requires: %{name}-gnome = %{version} -Supplements: packageand(libreoffice:gnome-session) -Supplements: packageand(libreoffice:mate-session-manager) -Supplements: packageand(libreoffice:xfce4-session) +Supplements: (libreoffice and gnome-session) +Supplements: (libreoffice and mate-session-manager) +Supplements: (libreoffice and xfce4-session) %if !%{with kdeintegration} -Supplements: packageand(libreoffice:plasma5-workspace) +Supplements: (libreoffice and plasma5-workspace) %endif %description gtk3 @@ -981,18 +984,17 @@ %endif # Leap 42/SLE-12 %patch2 %patch3 -%patch4 -p1 %patch6 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 +%patch7 -p1 +%patch8 -p1 %if 0%{?suse_version} < 1500 %patch101 -p1 %endif %patch990 -p1 %patch991 -p1 +cp %{SOURCE2011} external/skia + # Disable some of the failing tests (some are random) %if 0%{?suse_version} < 1330 sed -i -e '/CppunitTest_desktop_lib/d' desktop/Module_desktop.mk @@ -1079,6 +1081,8 @@ --with-system-jars \ --with-system-ucpp \ --with-system-dicts \ + --with-system-libpng \ + --without-system-libcmis \ --with-vendor=SUSE \ --with-tls=nss \ --disable-openssl \ @@ -1128,8 +1132,11 @@ %else --disable-firebird-sdbc \ %endif -%if 0%{?suse_version} < 1500 +%if 0%{?suse_version} < 1550 --without-system-boost \ + --without-system-poppler \ +%endif +%if 0%{?suse_version} < 1500 --without-system-icu \ %endif --enable-evolution2 \ @@ -1194,8 +1201,6 @@ relative_target=`readlink $desktop | sed "s|%{_libdir}|../../%{_lib}|"` # create the link ln -sf $relative_target $desktop - # enable startup notification (bnc#796875) - grep -q "NoDisplay=true" $desktop || sed -i "s/\(\[Desktop Entry\]\)/\1\nStartupNotify=true/" $desktop # suse_update app=`echo $desktop | sed "s/.desktop//"` %suse_update_desktop_file $app @@ -1386,6 +1391,12 @@ mv tmplist file-lists/common_list.txt echo "%{_libdir}/libreoffice/program/libmysqlclo.so" >> file-lists/base_list.txt +# Remove empty files +rm %{buildroot}%{_libdir}/libreoffice/share/extensions/*/help/*.done +rm %{buildroot}%{_libdir}/libreoffice/share/extensions/*/help/*/*.ht_ +rm %{buildroot}%{_libdir}/libreoffice/share/extensions/wiki-publisher/help/sa-IN/help.key_ +rm %{buildroot}%{_libdir}/libreoffice/share/extensions/nlpsolver/locale/NLPSolverCommon_en_US.default + # We have ton of duped files so run over it %fdupes %{buildroot}%{_prefix} ++++++ boost_1_71_0.tar.xz -> boost_1_75_0.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/boost_1_71_0.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new.2443/boost_1_75_0.tar.xz differ: char 13, line 1 ++++++ bsc1182969.patch -> bsc1189813.patch ++++++ ++++ 6485 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/libreoffice/bsc1182969.patch ++++ and /work/SRC/openSUSE:Factory/.libreoffice.new.2443/bsc1189813.patch ++++++ libreoffice-7.1.5.2.tar.xz -> libreoffice-7.2.2.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-7.1.5.2.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new.2443/libreoffice-7.2.2.1.tar.xz differ: char 26, line 1 ++++++ libreoffice-help-7.1.5.2.tar.xz -> libreoffice-help-7.2.2.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-help-7.1.5.2.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new.2443/libreoffice-help-7.2.2.1.tar.xz differ: char 26, line 1 ++++++ libreoffice-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.7w0i1T/_old 2021-10-11 15:31:03.558791298 +0200 +++ /var/tmp/diff_new_pack.7w0i1T/_new 2021-10-11 15:31:03.558791298 +0200 @@ -1,2 +1,2 @@ # libreoffice devel package is de facto called libreoffice-sdk -addFilter("devel-file-in-non-devel-package") +#addFilter("devel-file-in-non-devel-package") ++++++ libreoffice-translations-7.1.5.2.tar.xz -> libreoffice-translations-7.2.2.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-translations-7.1.5.2.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new.2443/libreoffice-translations-7.2.2.1.tar.xz differ: char 26, line 1 ++++++ pdfium-4306.tar.bz2 -> pdfium-4500.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/libreoffice/pdfium-4306.tar.bz2 /work/SRC/openSUSE:Factory/.libreoffice.new.2443/pdfium-4500.tar.bz2 differ: char 11, line 1 ++++++ pld-skia-patches.patch ++++++ --- libreoffice-7.2.0.3/external/skia/UnpackedTarball_skia.mk.orig 2021-08-10 19:27:48.000000000 +0200 +++ libreoffice-7.2.0.3/external/skia/UnpackedTarball_skia.mk 2021-08-12 18:09:22.813517161 +0200 @@ -39,6 +39,7 @@ fix-warnings.patch.1 \ disable-freetype-colrv1.1 \ windows-libraries-system32.patch.1 \ + skia-freetype2.11.patch \ $(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1)) ++++++ skia-freetype2.11.patch ++++++ --- skia/src/ports/SkFontHost_FreeType_common.cpp.orig 2021-03-01 15:53:09.178606791 +0100 +++ skia/src/ports/SkFontHost_FreeType_common.cpp 2021-08-12 17:48:32.358901987 +0200 @@ -665,8 +665,13 @@ canvas->drawPaint(paint); break; } +#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11 + case FT_COLR_PAINTFORMAT_TRANSFORM: { + SkMatrix transform = ToSkMatrix(colrv1_paint.u.transform.affine); +#else case FT_COLR_PAINTFORMAT_TRANSFORMED: { SkMatrix transform = ToSkMatrix(colrv1_paint.u.transformed.affine); +#endif canvas->concat(transform); break; @@ -760,12 +765,20 @@ traverse_result = colrv1_start_glyph(canvas, palette, face, paint.u.colr_glyph.glyphID, FT_COLOR_NO_ROOT_TRANSFORM); break; +#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11 + case FT_COLR_PAINTFORMAT_TRANSFORM: +#else case FT_COLR_PAINTFORMAT_TRANSFORMED: +#endif canvas->saveLayer(nullptr, nullptr); // Traverse / draw operation will apply transform. colrv1_draw_paint(canvas, palette, face, paint); traverse_result = +#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11 + colrv1_traverse_paint(canvas, palette, face, paint.u.transform.paint); +#else colrv1_traverse_paint(canvas, palette, face, paint.u.transformed.paint); +#endif canvas->restore(); break; case FT_COLR_PAINTFORMAT_ROTATE: ++++++ skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz -> skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new.2443/skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz differ: char 15, line 1
