rpms
/
libreoffice
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 4.4.0 rc2

Browse Source
f41
David Tardon 10 years ago
parent 14c608a492
commit 6923d676a5
4 changed files with 25 additions and 53 deletions
Show Stats Download Patch File Download Diff File

17
.gitignore vendored
Unescape View File

@ -25,7 +25,7 @@
/harfbuzz-0.9.23.tar.bz2
/language-subtag-registry-2014-12-03.tar.bz2
/lcms2-2.6.tar.gz
/libabw-0.1.0.tar.bz2
/libabw-0.1.1.tar.bz2
/libatomic_ops-7_2d.zip
/libcdr-0.1.1.tar.bz2
/libe-book-0.1.1.tar.bz2
@ -33,18 +33,21 @@
/libetonyek-0.1.1.tar.bz2
/libfreehand-0.1.0.tar.bz2
/libgltf-0.0.2.tar.bz2
/libmspub-0.1.1.tar.bz2
/libmwaw-0.3.3.tar.bz2
/libodfgen-0.1.2.tar.bz2
/libmspub-0.1.2.tar.bz2
/libmwaw-0.3.4.tar.bz2
/libodfgen-0.1.3.tar.bz2
/libpagemaker-0.0.2.tar.bz2
/libvisio-0.1.0.tar.bz2
/librevenge-0.0.1.tar.bz2
/libvisio-0.1.1.tar.bz2
/librevenge-0.0.2.tar.bz2
/libwpd-0.10.0.tar.bz2
/libwpg-0.3.0.tar.bz2
/libwps-0.3.0.tar.bz2
/libwps-0.3.1.tar.bz2
/libreoffice-4.4.0.0.beta2.tar.xz
/libreoffice-help-4.4.0.0.beta2.tar.xz
/libreoffice-translations-4.4.0.0.beta2.tar.xz
/libreoffice-4.4.0.1.tar.xz
/libreoffice-help-4.4.0.1.tar.xz
/libreoffice-translations-4.4.0.1.tar.xz
/libreoffice-4.4.0.2.tar.xz
/libreoffice-help-4.4.0.2.tar.xz
/libreoffice-translations-4.4.0.2.tar.xz

33
0001-don-t-copy-stylesheet-s-HelpID-if-this-s-a-rename.patch
Unescape View File

@ -1,33 +0,0 @@
From e4cf5d1a98469c17133f33fc8220e6b41f65e9a0 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Mon, 8 Dec 2014 18:06:01 +0100
Subject: [PATCH] don't copy stylesheet's HelpID if this's a rename
This causes problems for renamed copies of std. styles, as they have
special handling in SdStyleSheet::SetHelpId, which would set the API
name to std. value too. That means that there would be two (or more)
stylesheets with the same API name. On export, only one of them would be
exported.
Change-Id: I19d243bd3f73995e8de2d251e3d8b7f93219c3a9
---
sd/source/core/stlpool.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 095054e..94f8f96 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -699,7 +699,8 @@ void SdStyleSheetPool::CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily
if( !aParent.isEmpty() )
aNewStyles.push_back( std::pair< rtl::Reference< SfxStyleSheetBase >, OUString >( xNewSheet, aParent ) );
- xNewSheet->SetHelpId( aHelpFile, xSheet->GetHelpId( aHelpFile ) );
+ if( !bAddToList )
+ xNewSheet->SetHelpId( aHelpFile, xSheet->GetHelpId( aHelpFile ) );
xNewSheet->GetItemSet().Put( xSheet->GetItemSet() );
rCreatedSheets.push_back( SdStyleSheetRef( static_cast< SdStyleSheet* >( xNewSheet.get() ) ) );
--
2.1.0

22
libreoffice.spec
Unescape View File

@ -45,8 +45,8 @@
Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.1
Release: 2%{?libo_prerelease}%{?dist}
Version: %{libo_version}.2
Release: 1%{?libo_prerelease}%{?dist}
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0 and CC0
Group: Applications/Productivity
URL: http://www.libreoffice.org/
@ -98,15 +98,15 @@ Source26: %{external_url}/language-subtag-registry-2014-12-03.tar.bz2
Source27: %{external_url}/libcdr-0.1.1.tar.bz2
Source28: %{external_url}/libwpg-0.3.0.tar.bz2
Source29: %{external_url}/libwpd-0.10.0.tar.bz2
Source30: %{external_url}/libwps-0.3.0.tar.bz2
Source31: %{external_url}/libvisio-0.1.0.tar.bz2
Source32: %{external_url}/libmspub-0.1.1.tar.bz2
Source33: %{external_url}/libodfgen-0.1.2.tar.bz2
Source34: %{external_url}/libmwaw-0.3.3.tar.bz2
Source30: %{external_url}/libwps-0.3.1.tar.bz2
Source31: %{external_url}/libvisio-0.1.1.tar.bz2
Source32: %{external_url}/libmspub-0.1.2.tar.bz2
Source33: %{external_url}/libodfgen-0.1.3.tar.bz2
Source34: %{external_url}/libmwaw-0.3.4.tar.bz2
Source35: %{external_url}/libetonyek-0.1.1.tar.bz2
Source36: %{external_url}/libfreehand-0.1.0.tar.bz2
Source37: %{external_url}/libabw-0.1.0.tar.bz2
Source38: %{external_url}/librevenge-0.0.1.tar.bz2
Source37: %{external_url}/libabw-0.1.1.tar.bz2
Source38: %{external_url}/librevenge-0.0.2.tar.bz2
Source39: %{external_url}/libgltf-0.0.2.tar.bz2
Source40: %{external_url}/OpenCOLLADA-master-6509aa13af.tar.bz2
Source41: %{external_url}/libpagemaker-0.0.2.tar.bz2
@ -322,7 +322,6 @@ Patch15: 0001-add-X-TryExec-entries-to-desktop-files.patch
# not upstreamed
Patch16: 0001-disable-PSD-import-test-which-deadlocks-on-ARM.patch
Patch17: 0001-Resolves-fdo-37559-revert-adding-extra-dummy-polygon.patch
Patch18: 0001-don-t-copy-stylesheet-s-HelpID-if-this-s-a-rename.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/libreoffice
@ -2334,6 +2333,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%endif
%changelog
* Fri Jan 09 2015 David Tardon <dtardon@redhat.com> - 1:4.4.0.2-1
- update to 4.4.0 rc2
* Wed Jan 07 2015 Caolán McNamara <caolanm@redhat.com> - 1:4.4.0.1-2
- Resolves: rhbz#1177547 system autocorr files not detected

6
sources
Unescape View File

@ -7,6 +7,6 @@ a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.
0168229624cfac409e766913506961a8 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
12fb8b5b0d5132726e57b9b9fc7e22c4 libreoffice-multiliblauncher.sh
4b87018f7fff1d054939d19920b751a0 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
434fe0aa24687cf7b900760a0f89ac50 libreoffice-4.4.0.1.tar.xz
3d09356514096b303c772dc69b7c63e4 libreoffice-help-4.4.0.1.tar.xz
7fe691134ab4ca595ceb4489cd08b600 libreoffice-translations-4.4.0.1.tar.xz
40636cbdd9537638a0935e1874dcea1a libreoffice-4.4.0.2.tar.xz
6084240fdd3fecd82b0851276622b973 libreoffice-help-4.4.0.2.tar.xz
af49f57a06b0c52b172ea1a0bac0391a libreoffice-translations-4.4.0.2.tar.xz

Write Preview
Loading…
Cancel
Save