Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2022-09-22 14:49:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreoffice (Old) and /work/SRC/openSUSE:Factory/.libreoffice.new.2275 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice" Thu Sep 22 14:49:19 2022 rev:259 rq:1005202 version:7.4.1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2022-09-09 18:25:02.128531568 +0200 +++ /work/SRC/openSUSE:Factory/.libreoffice.new.2275/libreoffice.changes 2022-09-22 14:49:32.430383058 +0200 @@ -1,0 +2,20 @@ +Wed Sep 21 12:34:50 UTC 2022 - Danilo Spinella <danilo.spine...@suse.com> + +- Revert changes that cause problems with the libreoffice window + in KDE, bsc#1203502 + * bsc1203502.patch + +------------------------------------------------------------------- +Fri Sep 16 13:39:02 UTC 2022 - Danilo Spinella <danilo.spine...@suse.com> + +- Update to 7.4.1.2: + https://wiki.documentfoundation.org/Releases/7.4.1/RC2 +- Fix build on SLE-15-SP3 + +------------------------------------------------------------------- +Thu Sep 15 10:20:54 UTC 2022 - Danilo Spinella <danilo.spine...@suse.com> + +- Fix build with poppler 22.09 on TW + * poppler-22.09.0.patch + +------------------------------------------------------------------- Old: ---- libreoffice-7.4.1.1.tar.xz libreoffice-7.4.1.1.tar.xz.asc libreoffice-help-7.4.1.1.tar.xz libreoffice-help-7.4.1.1.tar.xz.asc libreoffice-translations-7.4.1.1.tar.xz libreoffice-translations-7.4.1.1.tar.xz.asc New: ---- bsc1203502.patch libreoffice-7.4.1.2.tar.xz libreoffice-7.4.1.2.tar.xz.asc libreoffice-help-7.4.1.2.tar.xz libreoffice-help-7.4.1.2.tar.xz.asc libreoffice-translations-7.4.1.2.tar.xz libreoffice-translations-7.4.1.2.tar.xz.asc poppler-22.09.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice.spec ++++++ --- /var/tmp/diff_new_pack.etYF6L/_old 2022-09-22 14:49:37.254392877 +0200 +++ /var/tmp/diff_new_pack.etYF6L/_new 2022-09-22 14:49:37.258392885 +0200 @@ -49,7 +49,7 @@ %endif %bcond_with firebird Name: libreoffice -Version: 7.4.1.1 +Version: 7.4.1.2 Release: 0 Summary: A Free Office Suite (Framework) License: LGPL-3.0-or-later AND MPL-2.0+ @@ -107,6 +107,10 @@ Patch6: gcc11-fix-error.patch Patch9: fix_math_desktop_file.patch Patch10: fix_gtk_popover_on_3.20.patch +Patch11: poppler-22.09.0.patch +# PATCH-FIX-UPSTREAM revert changes that cause problems with the libreoffice window +# in KDE, bsc#1203502 +Patch12: bsc1203502.patch # Build with java 8 Patch101: 0001-Revert-java-9-changes.patch # try to save space by using hardlinks @@ -124,6 +128,7 @@ BuildRequires: cups-devel BuildRequires: fixmath-devel BuildRequires: libwebp-devel +BuildRequires: zlib-devel %if %{with system_curl} BuildRequires: curl-devel >= 7.68.0 %else @@ -140,6 +145,7 @@ # Needed for tests BuildRequires: google-carlito-fonts BuildRequires: abseil-cpp-devel +BuildRequires: dragonbox-devel BuildRequires: gperf >= 3.1 BuildRequires: graphviz BuildRequires: hyphen-devel @@ -173,7 +179,6 @@ BuildRequires: xml-commons-apis BuildRequires: xz BuildRequires: zip -BuildRequires: cmake(dragonbox) BuildRequires: perl(Archive::Zip) BuildRequires: perl(Digest::MD5) BuildRequires: pkgconfig(apr-util-1) @@ -217,6 +222,7 @@ BuildRequires: pkgconfig(librevenge-0.0) >= 0.0.1 BuildRequires: pkgconfig(librsvg-2.0) BuildRequires: pkgconfig(libstaroffice-0.0) >= 0.0.7 +BuildRequires: pkgconfig(libtiff-4) BuildRequires: pkgconfig(libvisio-0.1) >= 0.1 BuildRequires: pkgconfig(libwpd-0.10) >= 0.10 BuildRequires: pkgconfig(libwpg-0.3) @@ -283,8 +289,6 @@ # Too old icu on the system Source2021: %{external_url}/icu4c-71_1-src.tgz Source2022: %{external_url}/icu4c-71_1-data.zip -BuildRequires: gcc7 -BuildRequires: gcc7-c++ BuildRequires: java-devel >= 1.8 BuildRequires: libBox2D-devel BuildRequires: libmysqlclient-devel @@ -297,8 +301,6 @@ Requires(post): update-desktop-files Requires(postun):update-desktop-files %else -BuildRequires: gcc >= 7 -BuildRequires: gcc-c++ >= 7 # genbrk binary is required BuildRequires: icu BuildRequires: java-devel >= 9 @@ -310,6 +312,14 @@ BuildConflicts: java-headless < 9 BuildRequires: pkgconfig(libopenjp2) %endif +# Dragonbox requires gcc11 +%if 0%{?suse_version} > 1550 +BuildRequires: gcc >= 11 +BuildRequires: gcc-c++ >= 11 +%else +BuildRequires: gcc11 +BuildRequires: gcc11-c++ +%endif %if 0%{?suse_version} # needed by python3_sitelib BuildRequires: python-rpm-macros @@ -1020,6 +1030,10 @@ %patch10 -p1 %patch101 -p1 %endif +%if 0%{?suse_version} > 1550 +%patch11 -p1 +%endif +%patch12 -p1 %patch990 -p1 %patch991 -p1 @@ -1074,9 +1088,9 @@ CXXFLAGS="$ARCH_FLAGS" export ARCH_FLAGS CFLAGS CXXFLAGS -%if 0%{?suse_version} < 1500 -export CC=gcc-7 -export CXX=g++-7 +%if 0%{?suse_version} < 1550 +export CC=gcc-11 +export CXX=g++-11 %endif # Fake the epoch stuff in generated zip files @@ -1112,6 +1126,8 @@ --with-system-ucpp \ --with-system-dicts \ --with-system-libpng \ + --with-system-dragonbox \ + --with-system-libfixmath \ --without-system-libcmis \ --with-vendor=SUSE \ --with-tls=nss \ ++++++ bsc1203502.patch ++++++ ++++ 4843 lines (skipped) ++++++ libreoffice-7.4.1.1.tar.xz -> libreoffice-7.4.1.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-7.4.1.1.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new.2275/libreoffice-7.4.1.2.tar.xz differ: char 27, line 1 ++++++ libreoffice-help-7.4.1.1.tar.xz -> libreoffice-help-7.4.1.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-help-7.4.1.1.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new.2275/libreoffice-help-7.4.1.2.tar.xz differ: char 26, line 1 ++++++ libreoffice-translations-7.4.1.1.tar.xz -> libreoffice-translations-7.4.1.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-translations-7.4.1.1.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new.2275/libreoffice-translations-7.4.1.2.tar.xz differ: char 27, line 1 ++++++ poppler-22.09.0.patch ++++++ https://gerrit.libreoffice.org/c/core/+/139249 >From 8bad83bf044661357b02b695e6f53e2e19dea396 Mon Sep 17 00:00:00 2001 From: Sam James <s...@gentoo.org> Date: Fri, 2 Sep 2022 04:31:18 +0100 Subject: [PATCH] Fix build with Poppler 22.09.0 With Poppler 22.09.0, LO fails to build with: ``` /var/tmp/portage/app-office/libreoffice-7.3.5.2/work/libreoffice-7.3.5.2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx:682:36: error: too many arguments to function call, expected single argument 'start', have 3 arguments state->getLineDash(&dashArray, &arrayLen, &startOffset); ~~~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~ /usr/include/poppler/GfxState.h:1506:32: note: 'getLineDash' declared here const std::vector<double> &getLineDash(double *start) ^ 1 error generated. ``` Poppler changed the getLineDash interface: ``` - void getLineDash(double **dash, int *length, double *start) + const std::vector<double> &getLineDash(double *start) ``` Signed-off-by: Sam James <s...@gentoo.org> Change-Id: I29e18f20d7650a7fcac1bc8ab4aaa04aaa2ab8fb --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx @@ -678,8 +678,16 @@ void PDFOutDev::updateLineDash(GfxState *state) return; assert(state); - double* dashArray; int arrayLen; double startOffset; + int arrayLen; double startOffset; +#if POPPLER_CHECK_VERSION(22, 9, 0) + const double* dashArray; + const std::vector<double> &dash = state->getLineDash(&startOffset); + dashArray = dash.data(); + arrayLen = dash.size(); +#else + double* dashArray; state->getLineDash(&dashArray, &arrayLen, &startOffset); +#endif printf( "updateLineDash" ); if( arrayLen && dashArray )
