pool/libreoffice
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Version update to 6.0.1.1:

Browse Source 
* various fixes all around
  * Fixes data exposure bsc#1080249 CVE-2018-1055
- Bump the version of libgpg-error
- Drop the libreoffice-poppler-0.62.patch merged upstream

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=597
This commit is contained in:
Tomáš Chvátal 2018-02-09 12:56:20 +00:00 committed by Git OBS Bridge
parent 5f7d170f08
commit 7cc2d988b3
11 changed files with 25 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libgpg-error-1.26.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4c4bcbc90116932e3acd37b37812d8653b1b189c1904985898e860af818aee69
size 798096

3
libgpg-error-1.27.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2
size 813060

3
libreoffice-6.0.0.3.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dc2171845ec19d5a0cece2c0052172011b2ec435cac80cb47637f2af94e19e3d
size 203284136

3
libreoffice-6.0.1.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8f802a9c6ed645218a07b34530113f357b694f2653d734fe8a9003068b5670a9
size 203420780

3
libreoffice-help-6.0.0.3.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9f4750a5dc087c1b700dc200ffe614932e4f854c185084207b79f5a8e2968442
size 2972556

3
libreoffice-help-6.0.1.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4466ffc014f5dd3bc7b2676c18e25687c95b00f0379b61c8db988091a4a5d647
size 2972872

31
libreoffice-poppler-0.62.patch
View File

@ -1,31 +0,0 @@
Index: libreoffice-6.0.0.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
===================================================================
--- libreoffice-6.0.0.1.orig/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ libreoffice-6.0.0.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -32,10 +32,12 @@
#pragma warning(push, 1)
#endif
-// sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1
+// sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1, then renamed to UnicodeMapFuncs.h in 0.62.0
// FIXME: we can't use #if POPPLER_CHECK_VERSION(0, 21, 0) && !POPPLER_CHECK_VERSION(0, 21, 1)
// because the internal poppler does not provide poppler-version.h and the macro always returns 0
-#if POPPLER_CHECK_VERSION(0, 21, 1)
+#if POPPLER_CHECK_VERSION(0, 62, 0)
+#include <UnicodeMapFuncs.h>
+#elif POPPLER_CHECK_VERSION(0, 21, 1)
#include <UTF8.h>
#elif POPPLER_CHECK_VERSION(0, 21, 0)
#include "UTF.h"
@@ -913,7 +915,11 @@ void PDFOutDev::drawChar(GfxState *state
);
// silence spurious warning
+#if POPPLER_CHECK_VERSION(0, 62, 0)
+ (void)&mapUTF16;
+#else
(void)&mapUCS2;
+#endif
char buf[9];
for( int i=0; i<uLen; ++i )

3
libreoffice-translations-6.0.0.3.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8afeb5cbb608e451a9b1acaef87601323faf403b490bd188edb5ddeedd60587e
size 139020268

3
libreoffice-translations-6.0.1.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:52a2ce93d87f0c248d08685f9eb37fd11c8e0196f8795fe516dd156ecdd21047
size 139061168

9
libreoffice.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Fri Feb 9 11:59:11 UTC 2018 - tchvatal@suse.com
- Version update to 6.0.1.1:
* various fixes all around
* Fixes data exposure bsc#1080249 CVE-2018-1055
- Bump the version of libgpg-error
- Drop the libreoffice-poppler-0.62.patch merged upstream
-------------------------------------------------------------------
Fri Feb 2 11:30:20 UTC 2018 - tchvatal@suse.com

10
libreoffice.spec
View File

@ -22,8 +22,8 @@
%define numbertext_version 0.9.5
# Urls
%define external_url http://dev-www.libreoffice.org/src/
#%define tarball_url http://download.documentfoundation.org/libreoffice/src/6.0.0
%define tarball_url http://dev-builds.libreoffice.org/pre-releases/src/
%define tarball_url http://download.documentfoundation.org/libreoffice/src/6.0.1
#%define tarball_url http://dev-builds.libreoffice.org/pre-releases/src/
# Enable the kde integration on openSUSE only
%if 0%{?is_opensuse}
%bcond_without kdeintegration
@ -46,7 +46,7 @@
%bcond_with system_gpgme
%endif
Name: libreoffice
Version: 6.0.0.3
Version: 6.0.1.1
Release: 0
Summary: A Free Office Suite (Framework)
License: LGPL-3.0+ and MPL-2.0+
@ -65,7 +65,7 @@ Source450: %{external_url}/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonu
Source452: %{external_url}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
# GPGME bundle list
Source1000: %{external_url}/gpgme-1.8.0.tar.bz2
Source1001: %{external_url}/libgpg-error-1.26.tar.bz2
Source1001: %{external_url}/libgpg-error-1.27.tar.bz2
Source1002: %{external_url}/libassuan-2.4.3.tar.bz2
# Internal bundled stuff we can't remove
# To build this we would pull cygwin; not worth it
@ -90,7 +90,6 @@ Patch1: scp2-user-config-suse.diff
Patch4: nlpsolver-no-broken-help.diff
Patch5: mediawiki-no-broken-help.diff
Patch6: kde5-configure-checks.patch
Patch7: libreoffice-poppler-0.62.patch
# try to save space by using hardlinks
Patch990: install-with-hardlinks.diff
BuildRequires: %{name}-share-linker
@ -880,7 +879,6 @@ Provides additional %{langname} translations and resources for %{project}. \
%patch4
%patch5
%patch6 -p1
%patch7 -p1
%patch990 -p1
# Disable some of the failing tests (some are random)