[packages/libreoffice] - up to 4.0.3.3 (doesn't build, need more fixes for orcus)
arekm
arekm at pld-linux.org
Wed May 15 08:37:39 CEST 2013
commit 86698b0e6e881e5a8b14c5aaa526ed932aeb19e4
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Wed May 15 08:37:35 2013 +0200
- up to 4.0.3.3 (doesn't build, need more fixes for orcus)
libreoffice-liborcus.patch | 12 ++++++++
libreoffice-mdds.patch | 72 ++++++++++++++++++++++++++++++++++++++++++++++
libreoffice.spec | 20 +++++++------
3 files changed, 96 insertions(+), 8 deletions(-)
---
diff --git a/libreoffice.spec b/libreoffice.spec
index 2a0ad5a..624ebcb 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -41,13 +41,13 @@
%undefine with_system_hsqldb
%endif
-%define major_ver 4.0.2
+%define major_ver 4.0.3
Summary: LibreOffice - powerful office suite
Summary(pl.UTF-8): LibreOffice - potężny pakiet biurowy
Name: libreoffice
-Version: %{major_ver}.2
-Release: 2
+Version: %{major_ver}.3
+Release: 0.1
License: GPL/LGPL
Group: X11/Applications
# we use git because released tarballs are buggy too often
@@ -55,13 +55,13 @@ Group: X11/Applications
# cd build
# git checkout -b libreoffice-3-3 origin/libreoffice-3-3
Source0: http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-%{version}.tar.xz
-# Source0-md5: 2c92879fa8c50d0071c4703afb7d10bf
+# Source0-md5: 7bcde561375f3bbce08f6d05451c8ad7
Source1: http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-dictionaries-%{version}.tar.xz
-# Source1-md5: 056674846d65d105dd8af642db0b57b7
+# Source1-md5: c2f0ce1e9e08a068dc270989054920ae
Source2: http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-help-%{version}.tar.xz
-# Source2-md5: 22e99e58aa32417dd7c132f40ae7654b
+# Source2-md5: 994b1f3015668335c30b53ddd3d60dc8
Source3: http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-translations-%{version}.tar.xz
-# Source3-md5: 8b61fbfa6bcd18213b5744f2b8a289b0
+# Source3-md5: 05b9ba0e86181bda3afeadcaba9202a3
Source20: http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
# Source20-md5: 0168229624cfac409e766913506961a8
@@ -77,6 +77,8 @@ Source25: http://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xs
# Source25-md5: a7983f859eafb2677d7ff386a023bc40
Patch0: %{name}-hamcrest.patch
+Patch1: %{name}-liborcus.patch
+Patch2: %{name}-mdds.patch
URL: http://www.documentfoundation.org/
BuildRequires: /usr/bin/getopt
BuildRequires: GConf2-devel
@@ -127,7 +129,7 @@ BuildRequires: java-servletapi
BuildRequires: libcmis-devel >= 0.3
BuildRequires: liblangtag-devel
BuildRequires: libmspub-devel
-BuildRequires: liborcus-devel
+BuildRequires: liborcus-devel >= 0.4
BuildRequires: libvisio-devel
BuildRequires: libwpd-devel >= 0.9.0
BuildRequires: libwpg-devel >= 0.2.0
@@ -2526,6 +2528,8 @@ bashowe uzupełnianie nazw dla LibreOffice.
%setup -q -n %{name}-%{version} -a1 -a2 -a3
%patch0 -p0
+%patch1 -p1
+%patch2 -p1
for dir in *-%{version}; do
[ -f $dir/ChangeLog ] && mv $dir/ChangeLog ChangeLog-$dir
diff --git a/libreoffice-liborcus.patch b/libreoffice-liborcus.patch
new file mode 100644
index 0000000..6685b86
--- /dev/null
+++ b/libreoffice-liborcus.patch
@@ -0,0 +1,12 @@
+--- libreoffice-4.0.3.3/configure.ac~ 2013-05-13 08:15:42.000000000 +0200
++++ libreoffice-4.0.3.3/configure.ac 2013-05-13 08:26:51.147726419 +0200
+@@ -8583,7 +8583,7 @@
+ if test "$with_system_orcus" = "yes"; then
+ AC_MSG_RESULT([external])
+ SYSTEM_LIBORCUS=YES
+- PKG_CHECK_MODULES(ORCUS, liborcus-0.4 >= 0.3.0)
++ PKG_CHECK_MODULES(ORCUS, liborcus-0.6 >= 0.5.0)
+ else
+ AC_MSG_RESULT([internal])
+ BUILD_TYPE="$BUILD_TYPE ORCUS"
+
diff --git a/libreoffice-mdds.patch b/libreoffice-mdds.patch
new file mode 100644
index 0000000..54c6cf0
--- /dev/null
+++ b/libreoffice-mdds.patch
@@ -0,0 +1,72 @@
+From 6cbca6fc0ceee4370a962d67db362f3e22270e18 Mon Sep 17 00:00:00 2001
+From: Kohei Yoshida <kohei.yoshida at gmail.com>
+Date: Mon, 06 May 2013 14:27:55 +0000
+Subject: Adjust for API change in mdds 0.8.0.
+
+The return value of search_tree() in flat_segment_tree has changed.
+
+Change-Id: I51d8676bd0621bd43b3f8a8f6be4bf4056d45904
+---
+diff --git a/sc/source/core/data/dpfilteredcache.cxx b/sc/source/core/data/dpfilteredcache.cxx
+index 47adbbe..51bf571 100644
+--- a/sc/source/core/data/dpfilteredcache.cxx
++++ b/sc/source/core/data/dpfilteredcache.cxx
+@@ -172,7 +172,7 @@ void ScDPFilteredCache::fillTable(
+ {
+ if (nRow > nEndSegment)
+ {
+- if (!maShowByFilter.search_tree(nRow, bShow, NULL, &nEndSegment))
++ if (!maShowByFilter.search_tree(nRow, bShow, NULL, &nEndSegment).second)
+ {
+ OSL_FAIL("Tree search failed!");
+ continue;
+diff --git a/sc/source/core/data/segmenttree.cxx b/sc/source/core/data/segmenttree.cxx
+index e74b0fd..b02f164 100644
+--- a/sc/source/core/data/segmenttree.cxx
++++ b/sc/source/core/data/segmenttree.cxx
+@@ -159,7 +159,7 @@ bool ScFlatSegmentsImpl<_ValueType, _ExtValueType>::getRangeData(SCCOLROW nPos,
+ if (!maSegments.is_tree_valid())
+ maSegments.build_tree();
+
+- if (!maSegments.search_tree(nPos, nValue, &nPos1, &nPos2))
++ if (!maSegments.search_tree(nPos, nValue, &nPos1, &nPos2).second)
+ return false;
+
+ rData.mnPos1 = nPos1;
+diff --git a/sc/source/filter/excel/colrowst.cxx b/sc/source/filter/excel/colrowst.cxx
+index 53aa04b..bc43a1e 100644
+--- a/sc/source/filter/excel/colrowst.cxx
++++ b/sc/source/filter/excel/colrowst.cxx
+@@ -208,7 +208,7 @@ void XclImpColRowSettings::Convert( SCTAB nScTab )
+ if (GetColFlag(nCol, EXC_COLROW_USED))
+ {
+ sal_uInt16 nTmp;
+- if (maColWidths.search_tree(nCol, nTmp))
++ if (maColWidths.search_tree(nCol, nTmp).second)
+ nWidth = nTmp;
+ }
+
+@@ -258,7 +258,7 @@ void XclImpColRowSettings::Convert( SCTAB nScTab )
+ for (SCROW i = nPrevRow; i <= nRow - 1; ++i)
+ {
+ SCROW nLast;
+- if (!maRowHeights.search_tree(i, nHeight, NULL, &nLast))
++ if (!maRowHeights.search_tree(i, nHeight, NULL, &nLast).second)
+ {
+ // search failed for some reason
+ return;
+diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx
+index b791e81..9020d38 100644
+--- a/sc/source/filter/xml/XMLStylesExportHelper.cxx
++++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx
+@@ -1280,7 +1280,7 @@ sal_Int32 ScRowStyles::GetStyleNameIndex(const sal_Int32 nTable, const sal_Int32
+ r.build_tree();
+ sal_Int32 nStyle;
+ sal_Int32 nStart, nEnd;
+- if (r.search_tree(nField, nStyle, &nStart, &nEnd))
++ if (r.search_tree(nField, nStyle, &nStart, &nEnd).second)
+ {
+ // Cache this value for better performance.
+ maCache.mnTable = nTable;
+--
+cgit v0.9.0.2-2-gbebe
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libreoffice.git/commitdiff/86698b0e6e881e5a8b14c5aaa526ed932aeb19e4
More information about the pld-cvs-commit
mailing list