Hello community,
here is the log from the commit of package libreoffice for openSUSE:Factory
checked in at 2020-06-22 17:43:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libreoffice (Old)
and /work/SRC/openSUSE:Factory/.libreoffice.new.2956 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice"
Mon Jun 22 17:43:41 2020 rev:206 rq:815949 version:7.0.0.0.beta2
Changes:
--------
--- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2020-06-14
18:13:52.806555666 +0200
+++ /work/SRC/openSUSE:Factory/.libreoffice.new.2956/libreoffice.changes
2020-06-22 17:44:14.769527646 +0200
@@ -1,0 +2,42 @@
+Fri Jun 19 12:38:18 UTC 2020 - Tomáš Chvátal <tchva...@suse.com>
+
+- Add patch to fix bsc#1116658:
+ * pyuno-nopwd.patch
+
+-------------------------------------------------------------------
+Thu Jun 18 11:40:25 UTC 2020 - Tomáš Chvátal <tchva...@suse.com>
+
+- Update to 7.0.0.0.beta2:
+ * Beta candidate with all the new 7.0 series content
+- Remove merged patches:
+ * bsc1146025.diff
+ * bsc1157627.diff
+ * bsc1160687-2.diff
+ * bsc1160687-3.diff
+ * bsc1160687-4.diff
+ * bsc1160687-5.diff
+ * bsc1160687-6.diff
+ * bsc1160687-7.diff
+ * bsc1160687-8.diff
+ * bsc1165849-1.diff
+ * bsc1165849-2.diff
+ * bsc1165849-3.diff
+ * bsc1165870.diff
+ * bsc1172053.diff
+ * bsc1172189.diff
+ * replace-boost-bimap-in-sdext-pdfimport.patch
+ * fix_old_boost_spirit_namespace.patch
+- Rebase patch install-with-hardlinks.diff
+
+-------------------------------------------------------------------
+Thu Jun 18 07:58:11 UTC 2020 - Tomáš Chvátal <tchva...@suse.com>
+
+- Remove mime-info and application-registry dirs bsc#1062631
+
+-------------------------------------------------------------------
+Mon Jun 15 15:05:08 UTC 2020 - Andras Timar <andras.ti...@collabora.com>
+
+- Fix bsc#1172053 - LO-L3: Image disappears during roundtrip 365->Impress->365
+ * bsc1172053.diff
+
+-------------------------------------------------------------------
Old:
----
bsc1146025.diff
bsc1157627.diff
bsc1160687-2.diff
bsc1160687-3.diff
bsc1160687-4.diff
bsc1160687-5.diff
bsc1160687-6.diff
bsc1160687-7.diff
bsc1160687-8.diff
bsc1165849-1.diff
bsc1165849-2.diff
bsc1165849-3.diff
bsc1165870.diff
bsc1172189.diff
fix_old_boost_spirit_namespace.patch
libreoffice-6.4.4.2.tar.xz
libreoffice-6.4.4.2.tar.xz.asc
libreoffice-help-6.4.4.2.tar.xz
libreoffice-help-6.4.4.2.tar.xz.asc
libreoffice-translations-6.4.4.2.tar.xz
libreoffice-translations-6.4.4.2.tar.xz.asc
odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar
pdfium-3963.tar.bz2
replace-boost-bimap-in-sdext-pdfimport.patch
New:
----
dtoa-20180411.tgz
libreoffice-7.0.0.0.beta2.tar.xz
libreoffice-7.0.0.0.beta2.tar.xz.asc
libreoffice-help-7.0.0.0.beta2.tar.xz
libreoffice-help-7.0.0.0.beta2.tar.xz.asc
libreoffice-translations-7.0.0.0.beta2.tar.xz
libreoffice-translations-7.0.0.0.beta2.tar.xz.asc
odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar
pdfium-4137.tar.bz2
pyuno-nopwd.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libreoffice.spec ++++++
--- /var/tmp/diff_new_pack.wpYAlN/_old 2020-06-22 17:44:25.729562822 +0200
+++ /var/tmp/diff_new_pack.wpYAlN/_new 2020-06-22 17:44:25.733562835 +0200
@@ -50,7 +50,7 @@
%bcond_with system_gpgme
%endif
Name: libreoffice
-Version: 6.4.4.2
+Version: 7.0.0.0.beta2
Release: 0
Summary: A Free Office Suite (Framework)
License: LGPL-3.0-or-later AND MPL-2.0+
@@ -88,9 +88,11 @@
Source2005:
%{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
# Needed for integration tests
Source2006:
https://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
-Source2007:
https://dev-www.libreoffice.org/extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.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-3963.tar.bz2
+Source2008: %{external_url}/pdfium-4137.tar.bz2
+# Single C file with patches from LO
+Source2009: %{external_url}/dtoa-20180411.tgz
# 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
@@ -98,29 +100,8 @@
# 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
-Patch6: fix_old_boost_spirit_namespace.patch
-Patch7: poppler-0.86.patch
-Patch8: replace-boost-bimap-in-sdext-pdfimport.patch
-# Bug 1165870 - LO-L3: Image shadow that should be invisible shown as
extraneous line below
-Patch9: bsc1165870.diff
-# Bug 1160687 - LO-L3: Elements on title page mixed up
-Patch11: bsc1160687-2.diff
-Patch12: bsc1160687-3.diff
-Patch13: bsc1160687-4.diff
-Patch14: bsc1160687-5.diff
-Patch15: bsc1160687-6.diff
-Patch16: bsc1160687-7.diff
-Patch17: bsc1160687-8.diff
-# Bug 1165849 - LO-L3: Shadow size for rectangle is only a fraction of Office
365
-Patch18: bsc1165849-1.diff
-Patch19: bsc1165849-2.diff
-Patch20: bsc1165849-3.diff
-# Bug 1146025 - LO-L3: Colored textboxes in PPTX look very odd (SmartArt)
-Patch21: bsc1146025.diff
-# Bug 1157627 - LO-L3: Some XML-created shapes simply lost upon PPTX import (=
earth loses countries)
-Patch22: bsc1157627.diff
-# Bug 1172189 - LO-L3: Impress crashes midway opening a PPTX document
-Patch23: bsc1172189.diff
+Patch4: poppler-0.86.patch
+Patch5: pyuno-nopwd.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
@@ -150,7 +131,7 @@
BuildRequires: hyphen-devel
# genbrk binary is required
BuildRequires: icu
-BuildRequires: java-devel >= 1.8
+BuildRequires: java-devel >= 9.0
BuildRequires: junit4
BuildRequires: libbase
BuildRequires: libcppunit-devel >= 1.14.0
@@ -214,7 +195,7 @@
BuildRequires: pkgconfig(libfreehand-0.1)
BuildRequires: pkgconfig(liblangtag)
BuildRequires: pkgconfig(libmspub-0.1) >= 0.1
-BuildRequires: pkgconfig(libmwaw-0.3) >= 0.3.15
+BuildRequires: pkgconfig(libmwaw-0.3) >= 0.3.16
BuildRequires: pkgconfig(libnumbertext) >= 1.0.5
BuildRequires: pkgconfig(libodfgen-0.1) >= 0.1.4
BuildRequires: pkgconfig(liborcus-0.15)
@@ -223,11 +204,11 @@
BuildRequires: pkgconfig(libqxp-0.0)
BuildRequires: pkgconfig(librevenge-0.0) >= 0.0.1
BuildRequires: pkgconfig(librsvg-2.0)
-BuildRequires: pkgconfig(libstaroffice-0.0) >= 0.0.6
+BuildRequires: pkgconfig(libstaroffice-0.0) >= 0.0.7
BuildRequires: pkgconfig(libvisio-0.1) >= 0.1
BuildRequires: pkgconfig(libwpd-0.10) >= 0.10
BuildRequires: pkgconfig(libwpg-0.3)
-BuildRequires: pkgconfig(libwps-0.4) >= 0.4.10
+BuildRequires: pkgconfig(libwps-0.4) >= 0.4.11
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(libxslt)
BuildRequires: pkgconfig(libzmf-0.0)
@@ -315,6 +296,7 @@
BuildRequires: pkgconfig(Qt5Network)
BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(Qt5X11Extras)
+BuildRequires: pkgconfig(xcb-icccm)
%else
Provides: %{name}-kde4 = %{version}
Obsoletes: %{name}-kde4 < %{version}
@@ -596,7 +578,7 @@
Requires: make
Requires: ucpp
Requires: zip
-Recommends: java-devel >= 1.8
+Recommends: java-devel >= 9.0
Provides: libreoffice-ure-devel = %{version}
Obsoletes: libreoffice-ure-devel < %{version}
@@ -655,10 +637,10 @@
Requires(pre): libreoffice = %{version}
# the watchWindow extension is written in java
%ifarch %{ix86}
-Requires: jre-32 >= 1.8
+Requires: jre-32 >= 9.0
%endif
%ifarch x86_64 aarch64 ppc64le
-Requires: jre-64 >= 1.8
+Requires: jre-64 >= 9.0
%endif
%description calc-extensions
@@ -675,10 +657,10 @@
Requires(pre): libreoffice = %{version}
# the wiki extension is written in java
%ifarch %{ix86}
-Requires: jre-32 >= 1.8
+Requires: jre-32 >= 9.0
%endif
%ifarch x86_64 aarch64 ppc64le
-Requires: jre-64 >= 1.8
+Requires: jre-64 >= 9.0
%endif
%description writer-extensions
@@ -884,6 +866,7 @@
%langpack -l fa -n Farsi -s ctl -X
%langpack -l fi -n Finnish -r libreoffice-voikko -X -T
%langpack -l fr -n French -X -m fr_FR -T
+%langpack -l fur -n Friulian
%langpack -l fy -n Frisian -X
%langpack -l ga -n Irish -X
%langpack -l gd -n Gaelic -m gd_GB -X
@@ -976,23 +959,8 @@
%endif # Leap 42/SLE-12
%patch2
%patch3
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
+%patch4 -p1
+%patch5 -p1
%patch990 -p1
%patch991 -p1
@@ -1147,7 +1115,9 @@
--disable-coinmp \
--enable-symbols \
--with-gdrive-client-secret="${google_default_client_secret}" \
- --with-gdrive-client-id="${google_default_client_id}"
+ --with-gdrive-client-id="${google_default_client_id}" \
+ --disable-skia
+# no reason to build skia at the moment for us with gtk ui
# no coinormp packages for coinmp
# just call make here as we added the jobs in configure
@@ -1219,8 +1189,14 @@
dir=`echo $dir | sed -e "s|%{buildroot}||"`
echo "%dir $dir" >>file-lists/common_list.txt
done
-echo "%dir %{_datadir}/application-registry" >>file-lists/common_list.txt
-echo "%dir %{_datadir}/mime-info" >>file-lists/common_list.txt
+
+# remove obsolete content bsc#1062631
+rm -r %{buildroot}%{_datadir}/application-registry
+rm -r %{buildroot}%{_datadir}/mime-info
+grep -v %{_datadir}/mime-info file-lists/common_list.txt > tmplist
+mv tmplist file-lists/common_list.txt
+grep -v %{_datadir}/application-registry file-lists/common_list.txt > tmplist
+mv tmplist file-lists/common_list.txt
#################################
# Move split noarch data to share
@@ -1269,8 +1245,10 @@
echo "%{_datadir}/%{name}/program/shell" >> file-lists/branding_upstream.txt
for file in sofficerc \
intro.png \
- flat_logo.svg \
- shell/about.svg ; do
+ intro-highres.png \
+ shell/about.svg \
+ shell/logo.svg \
+ shell/logo_inverted.svg; do
mv "%{buildroot}%{_libdir}/%{name}/program/$file"
"%{buildroot}%{_datadir}/%{name}/program/$file"
ln -sf "%{_datadir}/%{name}/program/$file"
"%{buildroot}/%{_libdir}/%{name}/program/$file"
echo "%{_datadir}/%{name}/program/$file" >>
file-lists/branding_upstream.txt
@@ -1464,7 +1442,6 @@
%files -f file-lists/common_list.txt
# ignore helper files for brp-symlink check
%exclude %{_datadir}/%{name}/program/sofficerc
-%exclude %{_datadir}/%{name}/program/flat_logo.svg
%exclude %{_datadir}/%{name}/program/*.png
%exclude %{_datadir}/%{name}/program/shell/*.svg
%if 0%{?suse_version} < 1330
@@ -1570,22 +1547,7 @@
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/share
%dir %{_datadir}/%{name}/share/config
-%{_datadir}/%{name}/share/config/images_breeze.zip
-%{_datadir}/%{name}/share/config/images_breeze_dark.zip
-%{_datadir}/%{name}/share/config/images_breeze_dark_svg.zip
-%{_datadir}/%{name}/share/config/images_elementary.zip
-%{_datadir}/%{name}/share/config/images_colibre.zip
-%{_datadir}/%{name}/share/config/images_karasa_jaga.zip
-%{_datadir}/%{name}/share/config/images_karasa_jaga_svg.zip
-%{_datadir}/%{name}/share/config/images_sifr.zip
-%{_datadir}/%{name}/share/config/images_sifr_dark.zip
-%{_datadir}/%{name}/share/config/images_sifr_dark_svg.zip
-%{_datadir}/%{name}/share/config/images_sifr_svg.zip
-%{_datadir}/%{name}/share/config/images_tango.zip
-%{_datadir}/%{name}/share/config/images_helpimg.zip
-%{_datadir}/%{name}/share/config/images_breeze_svg.zip
-%{_datadir}/%{name}/share/config/images_colibre_svg.zip
-%{_datadir}/%{name}/share/config/images_elementary_svg.zip
+%{_datadir}/%{name}/share/config/images_*.zip
%files -f file-lists/branding_upstream.txt branding-upstream
++++++ install-with-hardlinks.diff ++++++
--- /var/tmp/diff_new_pack.wpYAlN/_old 2020-06-22 17:44:25.837563169 +0200
+++ /var/tmp/diff_new_pack.wpYAlN/_new 2020-06-22 17:44:25.837563169 +0200
@@ -1,8 +1,9 @@
-diff -urN libreoffice-4.1.0.0.beta1.old/solenv/bin/modules/installer/worker.pm
libreoffice-4.1.0.0.beta1/solenv/bin/modules/installer/worker.pm
---- libreoffice-4.1.0.0.beta1.old/solenv/bin/modules/installer/worker.pm
2013-05-27 14:04:19.186304208 +0200
-+++ libreoffice-4.1.0.0.beta1/solenv/bin/modules/installer/worker.pm
2013-05-27 15:10:46.283303732 +0200
-@@ -377,7 +377,7 @@
- symlink (readlink ("$sourcepath"), "$destdir$destination") || die
"Can't symlink $destdir$destination -> " . readlink ("$sourcepath") . "$!";
+Index: libreoffice-7.0.0.0.beta2/solenv/bin/modules/installer/worker.pm
+===================================================================
+--- libreoffice-7.0.0.0.beta2.orig/solenv/bin/modules/installer/worker.pm
++++ libreoffice-7.0.0.0.beta2/solenv/bin/modules/installer/worker.pm
+@@ -347,7 +347,7 @@ sub install_simple ($$$$$$)
+ `mkdir -p "$destdir$destination"`;
}
else {
- copy ("$sourcepath", "$destdir$destination") || die "Can't copy
file: $sourcepath -> $destdir$destination $!";
++++++ pdfium-3963.tar.bz2 -> pdfium-4137.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/libreoffice/pdfium-3963.tar.bz2
/work/SRC/openSUSE:Factory/.libreoffice.new.2956/pdfium-4137.tar.bz2 differ:
char 11, line 1
++++++ pyuno-nopwd.patch ++++++
>From 844af02198cace3c8f7776602810d8433d0b71d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caol...@redhat.com>
Date: Fri, 19 Jun 2020 11:32:00 +0100
Subject: [PATCH] tdf#121384 don't leave a bare trailing : in PYTHONPATH
Change-Id: I8d8183485f457c3e4385181fee07390c4bfef603
---
pyuno/source/loader/pyuno_loader.cxx | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/pyuno/source/loader/pyuno_loader.cxx
b/pyuno/source/loader/pyuno_loader.cxx
index 8556dfdde11f..ebb0b7ce5c8d 100644
--- a/pyuno/source/loader/pyuno_loader.cxx
+++ b/pyuno/source/loader/pyuno_loader.cxx
@@ -140,6 +140,7 @@ static void setPythonHome ( const OUString & pythonHome )
static void prependPythonPath( const OUString & pythonPathBootstrap )
{
OUStringBuffer bufPYTHONPATH( 256 );
+ bool bAppendSep = false;
sal_Int32 nIndex = 0;
while( true )
{
@@ -153,17 +154,23 @@ static void prependPythonPath( const OUString &
pythonPathBootstrap )
{
fileUrl = pythonPathBootstrap.copy(nIndex, nNew - nIndex);
}
+ if (bAppendSep)
+ bufPYTHONPATH.append( static_cast<sal_Unicode>(SAL_PATHSEPARATOR)
);
OUString systemPath;
osl_getSystemPathFromFileURL( fileUrl.pData, &(systemPath.pData) );
bufPYTHONPATH.append( systemPath );
- bufPYTHONPATH.append( static_cast<sal_Unicode>(SAL_PATHSEPARATOR) );
+ bAppendSep = true;
if( nNew == -1 )
break;
nIndex = nNew + 1;
}
const char * oldEnv = getenv( "PYTHONPATH");
if( oldEnv )
+ {
+ if (bAppendSep)
+ bufPYTHONPATH.append( static_cast<sal_Unicode>(SAL_PATHSEPARATOR)
);
bufPYTHONPATH.append( OUString(oldEnv, strlen(oldEnv),
osl_getThreadTextEncoding()) );
+ }
OUString envVar("PYTHONPATH");
OUString envValue(bufPYTHONPATH.makeStringAndClear());
--
2.27.0
