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-03-07 17:45:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libreoffice (Old)
and /work/SRC/openSUSE:Factory/.libreoffice.new.1958 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice"
Mon Mar 7 17:45:40 2022 rev:247 rq:959814 version:7.3.1.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2022-02-24
18:23:15.358661465 +0100
+++ /work/SRC/openSUSE:Factory/.libreoffice.new.1958/libreoffice.changes
2022-03-07 17:45:54.771137660 +0100
@@ -1,0 +2,18 @@
+Sat Mar 5 14:30:08 UTC 2022 - Bj??rn Lie <bjorn....@gmail.com>
+
+- Add poppler-22-03-0.patch: Fix build with poppler 22.03.0. Patch
+ lifted from arch linux.
+
+-------------------------------------------------------------------
+Fri Mar 4 09:49:17 UTC 2022 - Danilo Spinella <danilo.spine...@suse.com>
+
+- Update to 7.3.1.3
+
+-------------------------------------------------------------------
+Mon Feb 28 16:46:05 UTC 2022 - Danilo Spinella <danilo.spine...@suse.com>
+
+- Update to 7.3.1.2
+- Remove upstreamed patch:
+ * 0001-configure.ac-Update-kf5-include-lib-check-to-work-wi.patch
+
+-------------------------------------------------------------------
Old:
----
0001-configure.ac-Update-kf5-include-lib-check-to-work-wi.patch
libreoffice-7.3.1.1.tar.xz
libreoffice-7.3.1.1.tar.xz.asc
libreoffice-help-7.3.1.1.tar.xz
libreoffice-help-7.3.1.1.tar.xz.asc
libreoffice-translations-7.3.1.1.tar.xz
libreoffice-translations-7.3.1.1.tar.xz.asc
New:
----
curl-7.79.1.tar.xz
libreoffice-7.3.1.3.tar.xz
libreoffice-7.3.1.3.tar.xz.asc
libreoffice-help-7.3.1.3.tar.xz
libreoffice-help-7.3.1.3.tar.xz.asc
libreoffice-translations-7.3.1.3.tar.xz
libreoffice-translations-7.3.1.3.tar.xz.asc
poppler-22-03-0.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libreoffice.spec ++++++
--- /var/tmp/diff_new_pack.A0TEsk/_old 2022-03-07 17:45:59.251136366 +0100
+++ /var/tmp/diff_new_pack.A0TEsk/_new 2022-03-07 17:45:59.255136365 +0100
@@ -34,7 +34,9 @@
%else
%bcond_with kdeintegration
%endif
-%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 &&
0%{?is_opensuse})
+# Use bundled gpgme on SLE-15-SP3 onwards
+# Use system gpgme on TW and SLE15-SP4 or newer
+%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150400
%bcond_without system_gpgme
%else
# Hack in the bundled libs to not pop up on requires/provides to avoid
@@ -46,7 +48,7 @@
%endif
%bcond_with firebird
Name: libreoffice
-Version: 7.3.1.1
+Version: 7.3.1.3
Release: 0
Summary: A Free Office Suite (Framework)
License: LGPL-3.0-or-later AND MPL-2.0+
@@ -93,6 +95,7 @@
# Skia is part of chromium and bundled everywhere as by google only way is
monorepo way
Source2010:
%{external_url}/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz
Source2012: %{external_url}/libcmis-0.5.2.tar.xz
+Source2013: %{external_url}/curl-7.79.1.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
@@ -104,14 +107,14 @@
Patch6: gcc11-fix-error.patch
Patch9: fix_math_desktop_file.patch
Patch10: fix_gtk_popover_on_3.20.patch
-# PATCH-FIX-UPSTREAM boo#1196017 Fix KDE Frameworks 5.91 detection
-Patch11: 0001-configure.ac-Update-kf5-include-lib-check-to-work-wi.patch
# Build with java 8
Patch101: 0001-Revert-java-9-changes.patch
# try to save space by using hardlinks
Patch990: install-with-hardlinks.diff
# save time by relying on rpm check rather than doing stupid find+grep
Patch991: libreoffice-no-destdircheck.patch
+# PATCH-FIX-UPSTRAM poppler-22-03-0.patch
+Patch992: poppler-22-03-0.patch
BuildRequires: %{name}-share-linker
BuildRequires: ant
BuildRequires: autoconf
@@ -121,7 +124,10 @@
BuildRequires: bsh2
BuildRequires: commons-logging
BuildRequires: cups-devel
+# Use bundled curl on SLE-12-SP5
+%if 0%{suse_version} >= 1500
BuildRequires: curl-devel >= 7.68.0
+%endif
# Needed for tests
BuildRequires: dejavu-fonts
BuildRequires: doxygen >= 1.8.4
@@ -137,6 +143,7 @@
BuildRequires: graphviz
BuildRequires: hyphen-devel
BuildRequires: junit4
+BuildRequires: libassuan0
BuildRequires: libbase
BuildRequires: libcppunit-devel >= 1.14.0
BuildRequires: libcuckoo-devel
@@ -1008,13 +1015,13 @@
%patch3
%patch6 -p1
%patch9 -p1
-%patch11 -p1
%if 0%{?suse_version} < 1500
%patch10 -p1
%patch101 -p1
%endif
%patch990 -p1
%patch991 -p1
+%patch992 -p1
# Disable some of the failing tests (some are random)
%if 0%{?suse_version} < 1330
@@ -1161,6 +1168,7 @@
%endif
%if 0%{?suse_version} < 1500
--without-system-icu \
+ --without-system-curl \
%endif
--enable-evolution2 \
--enable-dbus \
++++++ libreoffice-7.3.1.1.tar.xz -> libreoffice-7.3.1.3.tar.xz ++++++
/work/SRC/openSUSE:Factory/libreoffice/libreoffice-7.3.1.1.tar.xz
/work/SRC/openSUSE:Factory/.libreoffice.new.1958/libreoffice-7.3.1.3.tar.xz
differ: char 26, line 1
++++++ libreoffice-help-7.3.1.1.tar.xz -> libreoffice-help-7.3.1.3.tar.xz ++++++
/work/SRC/openSUSE:Factory/libreoffice/libreoffice-help-7.3.1.1.tar.xz
/work/SRC/openSUSE:Factory/.libreoffice.new.1958/libreoffice-help-7.3.1.3.tar.xz
differ: char 27, line 1
++++++ libreoffice-translations-7.3.1.1.tar.xz ->
libreoffice-translations-7.3.1.3.tar.xz ++++++
/work/SRC/openSUSE:Factory/libreoffice/libreoffice-translations-7.3.1.1.tar.xz
/work/SRC/openSUSE:Factory/.libreoffice.new.1958/libreoffice-translations-7.3.1.3.tar.xz
differ: char 27, line 1
++++++ poppler-22-03-0.patch ++++++
diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
index ad6320139..e5f6d9c68 100644
--- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
@@ -138,6 +138,15 @@ int main(int argc, char **argv)
_setmode( _fileno( g_binary_out ), _O_BINARY );
#endif
+#if POPPLER_CHECK_VERSION(22, 3, 0)
+ PDFDoc aDoc( std::make_unique<GooString>(pFileName),
+ GooString(pOwnerPasswordStr),
+ GooString(pUserPasswordStr) );
+
+ PDFDoc aErrDoc( std::make_unique<GooString>(pErrFileName),
+ GooString(pOwnerPasswordStr),
+ GooString(pUserPasswordStr) );
+#else
PDFDoc aDoc( pFileName,
pOwnerPasswordStr,
pUserPasswordStr );
@@ -145,6 +154,7 @@ int main(int argc, char **argv)
PDFDoc aErrDoc( pErrFileName,
pOwnerPasswordStr,
pUserPasswordStr );
+#endif
// Check various permissions for aDoc.
PDFDoc &rDoc = aDoc.isOk()? aDoc: aErrDoc;
