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

- Version bump to 5.0 rc3:

Browse Source 
* Various more fixes closing on the 5.0 release
- Removed upstreamed patches:
  * fix-old-poppler.patch
  * mdds-old-gcc.patch

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=300
This commit is contained in:
Tomáš Chvátal 2015-07-14 09:14:44 +00:00 committed by Git OBS Bridge
parent c874467e33
commit 11d646fe48
12 changed files with 23 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fix-old-poppler.patch
View File

@ -1,14 +0,0 @@
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index cc64db4..d2602c1 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -114,7 +114,7 @@ namespace pdfi
bool operator==(const FontAttributes& rFont) const
{
- return familyName.cmp(
+ return const_cast<GooString*>(&familyName)->cmp(
const_cast<GooString*>(&rFont.familyName))==0 &&
isEmbedded == rFont.isEmbedded &&
isBold == rFont.isBold &&

3
language-subtag-registry-2014-12-03.tar.bz2
View File

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

3
language-subtag-registry-2015-06-08.tar.bz2 Normal file
View File

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

3
libreoffice-5.0.0.2.tar.xz
View File

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

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

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

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

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

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

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

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

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

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

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

9
libreoffice.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Tue Jul 14 09:00:37 UTC 2015 - tchvatal@suse.com
- Version bump to 5.0 rc3:
* Various more fixes closing on the 5.0 release
- Removed upstreamed patches:
* fix-old-poppler.patch
* mdds-old-gcc.patch
-------------------------------------------------------------------
Fri Jul 3 07:04:45 UTC 2015 - tchvatal@suse.com

10
libreoffice.spec
View File

@ -65,7 +65,7 @@ Requires: python-importlib
%endif
# This is used due to the need for beta releases
Name: libreoffice
Version: 5.0.0.2
Version: 5.0.0.3
Release: 0
Summary: A Free Office Suite (Framework)
License: Apache-2.0 and Artistic-1.0 and BSD-3-Clause and BSD-4-Clause and GPL-2.0+ and LPPL-1.3c and LGPL-2.1+ and LGPL-3.0 and MPL-1.1 and MIT and SUSE-Public-Domain and W3C
@ -153,7 +153,7 @@ Source2058: %{external_url}/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.
Source2059: %{external_url}/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
Source2060: %{external_url}/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz
Source2061: %{external_url}/b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz
Source2062: %{external_url}/language-subtag-registry-2014-12-03.tar.bz2
Source2062: %{external_url}/language-subtag-registry-2015-06-08.tar.bz2
# Make for old distros where too old gnumake resides
Source3000: http://ftp.gnu.org/gnu/make/make-4.1.tar.bz2
# change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse
@ -168,10 +168,6 @@ Patch4: nlpsolver-no-broken-help.diff
Patch5: mediawiki-no-broken-help.diff
# PATCH-FIX-SUSE: do not declare java6 available for without system libs build
Patch7: 0001-Make-HAVE_JAVA6-be-always-false.patch
# PATCH-FIX-UPSTREAM: old poppler is broken without this
Patch8: fix-old-poppler.patch
# PATCH-FIX-UPSTREAM: old gcc needs patch for mdds to work
Patch9: mdds-old-gcc.patch
# try to save space by using hardlinks
Patch990: install-with-hardlinks.diff
BuildRequires: %{name}-share-linker
@ -972,8 +968,6 @@ Provides additional %{langname} translations and resources for %{project}. \
%if !%{with systemlibs}
%patch7 -p1
%endif
%patch8 -p1
%patch9 -p1
%patch990 -p1
# 256x256 icons
tar -xjf %{SOURCE20}

83
mdds-old-gcc.patch
View File

@ -1,83 +0,0 @@
From 18ebffdb0e1c2fb40f15065f289172c2903a90ab Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Mon, 29 Jun 2015 14:31:57 +0200
Subject: fix build of libetonyek with older versions of gcc
Change-Id: I19586eaae36fac7fa750614e6e31eff1a1e8440c
diff --git a/external/mdds/0001-another-step-to-allow-fst-to-use-any-value-type.patch.1 b/external/mdds/0001-another-step-to-allow-fst-to-use-any-value-type.patch.1
new file mode 100644
index 0000000..0c5b928
--- /dev/null
+++ b/external/mdds/0001-another-step-to-allow-fst-to-use-any-value-type.patch.1
@@ -0,0 +1,55 @@
+From 5fc9214fb94595e1a2c0b9e0285037f5a2fa59bf Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Mon, 29 Jun 2015 14:28:42 +0200
+Subject: [PATCH] another step to allow fst to use any value type
+
+For some reason this is not a problem on modern compilers...
+---
+ include/mdds/flat_segment_tree.hpp | 1 -
+ include/mdds/flat_segment_tree_def.inl | 2 +-
+ src/flat_segment_tree_test.cpp | 4 ++++
+ 3 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/include/mdds/flat_segment_tree.hpp b/include/mdds/flat_segment_tree.hpp
+index b656bc3..02cf87e 100644
+--- a/include/mdds/flat_segment_tree.hpp
++++ b/include/mdds/flat_segment_tree.hpp
+@@ -32,7 +32,6 @@
+ #include <sstream>
+ #include <utility>
+ #include <cassert>
+-#include <limits>
+
+ #include "mdds/node.hpp"
+ #include "mdds/flat_segment_tree_itr.hpp"
+diff --git a/include/mdds/flat_segment_tree_def.inl b/include/mdds/flat_segment_tree_def.inl
+index ebfee99..5fef1c3 100644
+--- a/include/mdds/flat_segment_tree_def.inl
++++ b/include/mdds/flat_segment_tree_def.inl
+@@ -46,7 +46,7 @@ flat_segment_tree<_Key, _Value>::flat_segment_tree(key_type min_val, key_type ma
+ // We don't ever use the value of the right leaf node, but we need the
+ // value to be always the same, to make it easier to check for
+ // equality.
+- m_right_leaf->value_leaf.value = ::std::numeric_limits<value_type>::max();
++ m_right_leaf->value_leaf.value = init_val;
+ }
+
+ template<typename _Key, typename _Value>
+diff --git a/src/flat_segment_tree_test.cpp b/src/flat_segment_tree_test.cpp
+index 81858f5..f7aead7 100644
+--- a/src/flat_segment_tree_test.cpp
++++ b/src/flat_segment_tree_test.cpp
+@@ -1943,6 +1943,10 @@ void fst_test_non_numeric_value()
+ db.search(1, result);
+
+ assert(result == "hello world");
++
++ db_type db2(db);
++
++ assert(db == db2);
+ }
+
+ int main (int argc, char **argv)
+--
+2.4.2
+
diff --git a/external/mdds/UnpackedTarball_mdds.mk b/external/mdds/UnpackedTarball_mdds.mk
index 974a8e1..504406b 100644
--- a/external/mdds/UnpackedTarball_mdds.mk
+++ b/external/mdds/UnpackedTarball_mdds.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,3))
$(eval $(call gb_UnpackedTarball_add_patches,mdds,\
external/mdds/mdds_0.6.0.patch \
external/mdds/mdds-c++98.patch.0 \
+ external/mdds/0001-another-step-to-allow-fst-to-use-any-value-type.patch.1 \
))
# vim: set noet sw=4 ts=4:
--
cgit v0.10.2