[packages/libreoffice] - up to 5.3.0.3; builds and works here

arekm arekm at pld-linux.org
Thu Feb 2 17:42:30 CET 2017


commit 2ceb9ed230804ad04df6cf2f051f7247a38a183d
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Thu Feb 2 17:42:14 2017 +0100

    - up to 5.3.0.3; builds and works here

 boost-1.59.patch           |   52 ---
 disable-failing-test.patch |   51 +--
 liborcus-0.11.patch        | 1026 --------------------------------------------
 libreoffice.spec           |  149 ++++---
 mdds-1.2.0.patch           |  124 ------
 5 files changed, 114 insertions(+), 1288 deletions(-)
---
diff --git a/libreoffice.spec b/libreoffice.spec
index f112c44..bc23ad2 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -11,7 +11,6 @@
 #
 # Conditional build:
 %bcond_without	java		# without Java support (disables help support)
-%bcond_with	kde		# KDE L&F packages
 %bcond_without	kde4		# KDE4 L&F packages
 %bcond_without	gtk		# GTK2 L&F
 %bcond_with	gtk3		# GTK3 L&F (experimental)
@@ -45,53 +44,57 @@
 %undefine	with_system_hsqldb
 %endif
 
-%define		major_ver		5.1.3
+%define		major_ver		5.3.0
 
 Summary:	LibreOffice - powerful office suite
 Summary(pl.UTF-8):	LibreOffice - potężny pakiet biurowy
 Name:		libreoffice
-Version:	%{major_ver}.2
-Release:	4
+Version:	%{major_ver}.3
+Release:	1
 License:	GPL/LGPL
 Group:		X11/Applications
 Source0:	http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-%{version}.tar.xz
-# Source0-md5:	cbe602264e58f7c93e72068c408e3551
+# Source0-md5:	204c492a0b5e58dd0be9788c74a364ab
 Source1:	http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-dictionaries-%{version}.tar.xz
-# Source1-md5:	063b3218651a93198c8a558c6ab365cc
+# Source1-md5:	f9e3e741b929c5af19b1321569537b68
 Source2:	http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-help-%{version}.tar.xz
-# Source2-md5:	f485479a135582f37335a92d773416fe
+# Source2-md5:	1b76f6bf2e5b3bb9a70831fa3a4e3471
 Source3:	http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-translations-%{version}.tar.xz
-# Source3-md5:	a93714b74f1c04c534729a9511311886
+# Source3-md5:	6ad27f9d0348010afca53167c9e350cb
 
 
 # make fetch DO_FETCH_TARBALLS=1 WGET=wget
 # but not sure if all are needed?
-Source20:	http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
+Source20: http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
 # Source20-md5:	0168229624cfac409e766913506961a8
-Source21:	http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
+Source21: http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 # Source21-md5:	17410483b5b5f267aa18b7e00b65e6e0
-Source22:	http://dev-www.libreoffice.org/src/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
+Source22: http://dev-www.libreoffice.org/src/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
 # Source22-md5:	1f24ab1d39f4a51faf22244c94a6203f
-Source23:	http://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
-# Source23-md5:	798b2ffdc8bcfe7bca2cf92b62caf685
-Source24:	http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-# Source24-md5:	35c94d2df8893241173de1d16b6034c0
-Source25:	http://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-# Source25-md5:	a7983f859eafb2677d7ff386a023bc40
-Source26:	http://dev-www.libreoffice.org/src/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
-# Source26-md5:	4b87018f7fff1d054939d19920b751a0
-Source27:	http://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz
-# Source27-md5:	1cce53bf4b40ae29790d2c5c9f8b1129
-Source28:	http://dev-www.libreoffice.org/src/OpenCOLLADA-master-6509aa13af.tar.bz2
-# Source28-md5:	4ca8a6ef0afeefc864e9ef21b9f14bd6
+Source23: http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
+# Source23-md5:	35c94d2df8893241173de1d16b6034c0
+Source24: http://dev-www.libreoffice.org/src/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
+# Source24-md5:	4b87018f7fff1d054939d19920b751a0
+Source25: http://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
+# Source25-md5:	798b2ffdc8bcfe7bca2cf92b62caf685
+Source26: http://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
+# Source26-md5:	8249374c274932a21846fa7629c2aa9b
+Source27: http://dev-www.libreoffice.org/src/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz
+# Source27-md5:	86b1daaa438f5a7bea9a52d7b9799ac0
+Source28: http://dev-www.libreoffice.org/extern/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar
+# Source28-md5:	a084cd548b586552cb7d3ee51f1af969
+Source29: http://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
+# Source29-md5:	a7983f859eafb2677d7ff386a023bc40
+Source30: http://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz
+# Source30-md5:	1cce53bf4b40ae29790d2c5c9f8b1129
+Source31: http://dev-www.libreoffice.org/src/OpenCOLLADA-master-6509aa13af.tar.bz2
+# Source31-md5:	4ca8a6ef0afeefc864e9ef21b9f14bd6
 
 Patch0:		disable-failing-test.patch
-Patch1:		mdds-1.2.0.patch
-Patch2:		boost-1.59.patch
-Patch3:		liborcus-0.11.patch
+
 URL:		http://www.documentfoundation.org/
 BuildRequires:	/usr/bin/getopt
-BuildRequires:	Firebird-devel
+BuildRequires:	Firebird-devel >= 3.0.0.0
 BuildRequires:	GConf2-devel
 BuildRequires:	GLM
 BuildRequires:	ImageMagick
@@ -152,17 +155,16 @@ BuildRequires:	liblangtag-devel
 BuildRequires:	libmspub-devel
 BuildRequires:	libmwaw-devel >= 0.3.0
 BuildRequires:	libodfgen-devel >= 0.1.1
-BuildRequires:	liborcus-devel >= 0.9.0
+BuildRequires:	liborcus-devel >= 0.12.0
 BuildRequires:	libpagemaker-devel >= 0.0.2
+BuildRequires:	libstaroffice-devel
 BuildRequires:	libvisio-devel
 BuildRequires:	libwpd-devel >= 0.10.0
 BuildRequires:	libwpg-devel >= 0.3.0
 BuildRequires:	libwps-devel >= 0.3.0
+BuildRequires:	libzmf-devel
 BuildRequires:	lp_solve-devel
 BuildRequires:	silgraphite-devel
-%if %{with kde}
-BuildRequires:	kde4-kde3support-devel
-%endif
 %if %{with kde4}
 BuildRequires:	kde4-kdelibs-devel
 BuildRequires:	qt4-build
@@ -2811,6 +2813,23 @@ Chinese language for Taiwan.
 Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
 chińskim dla Tajwanu.
 
+%package i18n-vec
+Summary:	LibreOffice - interface in Venetian language
+Summary(pl.UTF-8):	LibreOffice - interfejs w języku Venetian
+Group:		I18n
+Requires:	%{name}-core = %{version}-%{release}
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
+
+%description i18n-vec
+This package provides resources containing menus and dialogs in
+Venetian language.
+
+%description i18n-vec -l pl.UTF-8
+Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
+Venetian.
+
 %package i18n-zu
 Summary:	LibreOffice - interface in Zulu language
 Summary(pl.UTF-8):	LibreOffice - interfejs w języku zuluskim
@@ -2864,9 +2883,6 @@ dialogs.
 %prep
 %setup -q -n %{name}-%{version} -a1 -a2 -a3
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 for dir in *-%{version}; do
 	[ -f $dir/ChangeLog ] && mv $dir/ChangeLog ChangeLog-$dir
@@ -2884,6 +2900,9 @@ ln %{SOURCE25} ext_sources
 ln %{SOURCE26} ext_sources
 ln %{SOURCE27} ext_sources
 ln %{SOURCE28} ext_sources
+ln %{SOURCE29} ext_sources
+ln %{SOURCE30} ext_sources
+ln %{SOURCE31} ext_sources
 :> src.downloaded
 
 %build
@@ -2969,11 +2988,16 @@ export PATH=$PATH:%{_libdir}/interbase/bin
 	--with-system-graphite \
 	--with-system-icu \
 	--with-system-jpeg \
+	--with-system-libcdr \
 	--with-system-libgltf \
+	--with-system-libmspub \
+	--with-system-libmwaw \
+	--with-system-libvisio \
 	--with-system-libwpd \
 	--with-system-libwpg \
 	--with-system-libwps \
 	--with-system-libxml \
+	--with-system-libzmf \
 	--with-system-clucene \
 	--with-system-neon \
 	--with-system-openssl \
@@ -2981,7 +3005,6 @@ export PATH=$PATH:%{_libdir}/interbase/bin
 	--enable-python=system \
 	--with-system-redland \
 	--with-system-sane \
-	--with-system-vigra \
 	--with-system-zlib \
 	--with-system-libexttextcat \
 	--with-system-jfreereport \
@@ -2996,9 +3019,7 @@ export PATH=$PATH:%{_libdir}/interbase/bin
 	--enable-report-builder \
 	--enable-scripting-beanshell \
 	--enable-scripting-javascript \
-	--with%{!?mozilla:out}-system-npapi-headers \
-	%{?with_kde:--enable-kde --disable-kde4} \
-	%{?with_kde4:--enable-kde4 --disable-kde} \
+	--%{?with_kde4:en}%{!?with_kde4:dis}able-kde4 \
 	--with-lang=%{?with_i18n:ALL} \
 %if %{with java}
 	--with-java \
@@ -3007,7 +3028,6 @@ export PATH=$PATH:%{_libdir}/interbase/bin
 %else
 	--without-java \
 %endif
-	--disable-gnome-vfs \
 	--enable-gio \
 	--with-x \
 	--without-fonts \
@@ -3018,17 +3038,16 @@ export PATH=$PATH:%{_libdir}/interbase/bin
 	--with-system-openldap \
 %if 0%{?debug:1}
 	--enable-debug \
-	--enable-crashdump=yes \
+	--enable-breakpad=yes \
 	--enable-symbols=FULL \
 %else
-	--enable-crashdump=no \
+	--enable-breakpad=no \
 	--disable-symbols \
 %endif
 	--with-build-version=%{version}-%{release} \
 	--enable-split-app-modules \
 	--enable-split-opt-features \
 	--enable-cups \
-	--enable-lockdown \
 	--disable-fetch-external
 
 # this limits processing some files but doesn't limit parallel build
@@ -3358,7 +3377,6 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/program/libavmedialo.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libavmediaogl.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libbasctllo.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libbasebmplo.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libbasegfxlo.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libbasprovlo.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libbiblo.so
@@ -3451,7 +3469,6 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/program/libpasswordcontainerlo.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libpcrlo.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libpdffilterlo.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libpllo.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libpricinglo.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libprotocolhandlerlo.so
 %attr(755,root,root) %{_libdir}/%{name}/program/librecentfile.so
@@ -3527,9 +3544,7 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/program/libxsltfilterlo.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libxstor.so
 %attr(755,root,root) %{_libdir}/%{name}/program/oosplash
-%attr(755,root,root) %{_libdir}/%{name}/program/open-url
 %attr(755,root,root) %{_libdir}/%{name}/program/pagein*
-%attr(755,root,root) %{_libdir}/%{name}/program/pluginapp.bin
 %attr(755,root,root) %{_libdir}/%{name}/program/senddoc
 %attr(755,root,root) %{_libdir}/%{name}/program/uri-encode
 %attr(755,root,root) %{_libdir}/%{name}/program/xid-fullscreen-on-all-monitors
@@ -3596,6 +3611,10 @@ fi
 %{_libdir}/%{name}/program/opengl/basicVertexShader.glsl
 %{_libdir}/%{name}/program/opengl/blendedTextureFragmentShader.glsl
 %{_libdir}/%{name}/program/opengl/blendedTextureVertexShader.glsl
+%{_libdir}/%{name}/program/opengl/combinedFragmentShader.glsl
+%{_libdir}/%{name}/program/opengl/combinedTextureFragmentShader.glsl
+%{_libdir}/%{name}/program/opengl/combinedTextureVertexShader.glsl
+%{_libdir}/%{name}/program/opengl/combinedVertexShader.glsl
 %{_libdir}/%{name}/program/opengl/commonFragmentShader.glsl
 %{_libdir}/%{name}/program/opengl/commonVertexShader.glsl
 %{_libdir}/%{name}/program/opengl/convolutionFragmentShader.glsl
@@ -3721,8 +3740,10 @@ fi
 %dir %{_datadir}/%{name}/share/autotext
 %{_datadir}/%{name}/share/autotext/en-US
 %{_datadir}/%{name}/share/basic
+%{_datadir}/%{name}/share/classification
 %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_galaxy.zip
 %{_datadir}/%{name}/share/config/images_hicontrast.zip
 %{_datadir}/%{name}/share/config/images_oxygen.zip
@@ -3767,6 +3788,7 @@ fi
 %dir %{_datadir}/%{name}/share/config/soffice.cfg/modules/sdraw
 %dir %{_datadir}/%{name}/share/config/soffice.cfg/modules/sglobal
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/sglobal/menubar
+%{_datadir}/%{name}/share/config/soffice.cfg/modules/sglobal/popupmenu
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/sglobal/statusbar
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/sglobal/toolbar
 %dir %{_datadir}/%{name}/share/config/soffice.cfg/modules/smath
@@ -3776,15 +3798,18 @@ fi
 %exclude %{_datadir}/%{name}/share/config/soffice.cfg/modules/spropctrlr/ui/res/*
 %dir %{_datadir}/%{name}/share/config/soffice.cfg/modules/swform
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/swform/menubar
+%{_datadir}/%{name}/share/config/soffice.cfg/modules/swform/popupmenu
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/swform/statusbar
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/swform/toolbar
 %dir %{_datadir}/%{name}/share/config/soffice.cfg/modules/swreport
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/swreport/menubar
+%{_datadir}/%{name}/share/config/soffice.cfg/modules/swreport/popupmenu
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/swreport/statusbar
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/swreport/toolbar
 %dir %{_datadir}/%{name}/share/config/soffice.cfg/modules/swriter
 %dir %{_datadir}/%{name}/share/config/soffice.cfg/modules/swxform
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/swxform/menubar
+%{_datadir}/%{name}/share/config/soffice.cfg/modules/swxform/popupmenu
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/swxform/statusbar
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/swxform/toolbar
 %dir %{_datadir}/%{name}/share/config/soffice.cfg/sfx
@@ -3809,6 +3834,7 @@ fi
 %{_datadir}/%{name}/share/config/wizard
 %dir %{_datadir}/%{name}/share/dtd
 %{_datadir}/%{name}/share/dtd/officedocument
+%{_datadir}/%{name}/share/emojiconfig
 %dir %{_datadir}/%{name}/share/extensions
 %{_datadir}/%{name}/share/extensions/package.txt
 %{_datadir}/%{name}/share/filter
@@ -3830,7 +3856,6 @@ fi
 %dir %{_datadir}/%{name}/share/template
 %dir %{_datadir}/%{name}/share/template/common
 %{_datadir}/%{name}/share/template/common/internal
-%{_datadir}/%{name}/share/template/common/layout
 %{_datadir}/%{name}/share/template/common/officorr
 %{_datadir}/%{name}/share/template/common/offimisc
 %{_datadir}/%{name}/share/template/common/personal
@@ -3898,22 +3923,9 @@ fi
 %{_mandir}/man1/libreoffice.1*
 %{_mandir}/man1/unopkg.1*
 
-%if %{with kde}
-%files libs-kde
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/program/kde4-open-url
-%attr(755,root,root) %{_libdir}/%{name}/program/kdebe1.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/program/kdefilepicker
-%attr(755,root,root) %{_libdir}/%{name}/program/fps_kde.uno.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libkabdrv1.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libkab1.so
-%attr(755,root,root) %{_libdir}/%{name}/program/libvclplug_kde*.so
-%endif
-
 %if %{with kde4}
 %files libs-kde
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/program/kde4-open-url
 %attr(755,root,root) %{_libdir}/%{name}/program/libvclplug_kde4*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libkde4be1lo.so
 %endif
@@ -3921,7 +3933,6 @@ fi
 %if %{with gtk} || %{with gtk3}
 %files libs-gtk
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/program/gnome-open-url
 %attr(755,root,root) %{_libdir}/%{name}/program/libqstart_gtklo.so
 %attr(755,root,root) %{_libdir}/%{name}/program/libvclplug_gtk*.so
 %{_datadir}/%{name}/share/registry/gnome.xcd
@@ -3950,9 +3961,11 @@ fi
 %{_datadir}/%{name}/program/resource/sdbclen-US.res
 %{_datadir}/%{name}/program/resource/sdberren-US.res
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/dbapp/menubar
+%{_datadir}/%{name}/share/config/soffice.cfg/modules/dbapp/popupmenu
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/dbapp/statusbar
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/dbapp/toolbar
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/dbbrowser/menubar
+%{_datadir}/%{name}/share/config/soffice.cfg/modules/dbbrowser/popupmenu
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/dbbrowser/toolbar
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/dbquery/menubar
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/dbquery/toolbar
@@ -3964,6 +3977,7 @@ fi
 %exclude %{_datadir}/%{name}/share/config/soffice.cfg/modules/dbreport/ui/res/*
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/dbtable
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/dbtdata/menubar
+%{_datadir}/%{name}/share/config/soffice.cfg/modules/dbtdata/popupmenu
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/dbtdata/toolbar
 %{_datadir}/%{name}/share/registry/base.xcd
 /usr/share/appdata/libreoffice-base.appdata.xml
@@ -3994,7 +4008,9 @@ fi
 %{_datadir}/%{name}/program/resource/pricingen-US.res
 %{_datadir}/%{name}/program/resource/solveren-US.res
 %{_datadir}/%{name}/program/resource/scen-US.res
+%{_datadir}/%{name}/share/calc
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/scalc/menubar
+%{_datadir}/%{name}/share/config/soffice.cfg/modules/scalc/popupmenu
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/scalc/statusbar
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/scalc/toolbar
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/scalc/ui
@@ -4012,6 +4028,7 @@ fi
 %{_iconsdir}/hicolor/*/apps/libreoffice-draw.png
 %{_iconsdir}/hicolor/*/apps/libreoffice-draw.svg
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/sdraw/menubar
+%{_datadir}/%{name}/share/config/soffice.cfg/modules/sdraw/popupmenu
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/sdraw/statusbar
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/sdraw/toolbar
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/sdraw/ui
@@ -4043,9 +4060,11 @@ fi
 %{_iconsdir}/hicolor/*/apps/libreoffice-writer.png
 %{_iconsdir}/hicolor/*/apps/libreoffice-writer.svg
 %{_datadir}/%{name}/program/resource/t602filteren-US.res
+%{_datadir}/%{name}/program/resource/writerperfecten-US.res
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/sbibliography
 %exclude %{_datadir}/%{name}/share/config/soffice.cfg/modules/sbibliography/ui/res/*
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/swriter/menubar
+%{_datadir}/%{name}/share/config/soffice.cfg/modules/swriter/popupmenu
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/swriter/statusbar
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/swriter/toolbar
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/swriter/ui
@@ -4071,6 +4090,7 @@ fi
 %{_iconsdir}/hicolor/*/apps/libreoffice-impress.svg
 %{_datadir}/%{name}/share/config/soffice.cfg/simpress
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/simpress/menubar
+%{_datadir}/%{name}/share/config/soffice.cfg/modules/simpress/popupmenu
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/simpress/statusbar
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/simpress/toolbar
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/simpress/ui
@@ -4092,6 +4112,7 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/program/smath
 %{_datadir}/%{name}/program/resource/smen-US.res
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/smath/menubar
+%{_datadir}/%{name}/share/config/soffice.cfg/modules/smath/popupmenu
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/smath/statusbar
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/smath/toolbar
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/smath/ui
@@ -4104,6 +4125,7 @@ fi
 %attr(755,root,root) %{_bindir}/ooweb
 %{_mandir}/man1/loweb.1
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/sweb/menubar
+%{_datadir}/%{name}/share/config/soffice.cfg/modules/sweb/popupmenu
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/sweb/statusbar
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/sweb/toolbar
 
@@ -4594,6 +4616,9 @@ fi
 %files i18n-ve -f ve.lang
 %defattr(644,root,root,755)
 
+%files i18n-vec -f vec.lang
+%defattr(644,root,root,755)
+
 %files i18n-vi -f vi.lang
 %defattr(644,root,root,755)
 
@@ -4612,7 +4637,7 @@ fi
 
 %files -n bash-completion-%{name}
 %defattr(644,root,root,755)
-/etc/bash_completion.d/*
+%{_datadir}/bash-completion/completions/%{name}.sh
 
 %files glade
 %attr(755,root,root) %{_libdir}/%{name}/program/ui-previewer
diff --git a/boost-1.59.patch b/boost-1.59.patch
deleted file mode 100644
index b5e1b32..0000000
--- a/boost-1.59.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -ur libreoffice-5.0.2.1/filter/Library_svgfilter.mk libreoffice-5.0.2.1-boost/filter/Library_svgfilter.mk
---- libreoffice-5.0.2.1/filter/Library_svgfilter.mk	2015-09-05 09:59:15.000000000 +0200
-+++ libreoffice-5.0.2.1-boost/filter/Library_svgfilter.mk	2015-11-20 23:46:59.702815320 +0100
-@@ -76,4 +76,6 @@
- 		filter/source/svg/svgwriter) \
- ))
- 
-+$(eval $(call gb_Library_add_libs,svgfilter,-lboost_system))
-+
- # vim: set noet sw=4 ts=4:
-diff -ur libreoffice-5.0.2.1/sdext/CppunitTest_sdext_pdfimport.mk libreoffice-5.0.2.1-boost/sdext/CppunitTest_sdext_pdfimport.mk
---- libreoffice-5.0.2.1/sdext/CppunitTest_sdext_pdfimport.mk	2015-09-05 09:59:15.000000000 +0200
-+++ libreoffice-5.0.2.1-boost/sdext/CppunitTest_sdext_pdfimport.mk	2015-11-20 23:43:57.694492773 +0100
-@@ -36,6 +36,8 @@
- 	$(gb_UWINAPI) \
- ))
- 
-+$(eval $(call gb_CppunitTest_add_libs,sdext_pdfimport,-lboost_system))
-+
- $(eval $(call gb_CppunitTest_use_static_libraries,sdext_pdfimport,\
-     pdfimport_s \
- ))
-diff -ur libreoffice-5.0.2.1/sdext/Executable_pdf2xml.mk libreoffice-5.0.2.1-boost/sdext/Executable_pdf2xml.mk
---- libreoffice-5.0.2.1/sdext/Executable_pdf2xml.mk	2015-09-05 09:59:15.000000000 +0200
-+++ libreoffice-5.0.2.1-boost/sdext/Executable_pdf2xml.mk	2015-11-20 23:44:04.531218795 +0100
-@@ -41,4 +41,6 @@
-     sdext/source/pdfimport/test/pdf2xml \
- ))
- 
-+$(eval $(call gb_Executable_add_libs,pdf2xml,-lboost_system))
-+
- # vim:set noet sw=4 ts=4:
-diff -ur libreoffice-5.0.2.1/sdext/Executable_pdfunzip.mk libreoffice-5.0.2.1-boost/sdext/Executable_pdfunzip.mk
---- libreoffice-5.0.2.1/sdext/Executable_pdfunzip.mk	2015-09-05 09:59:15.000000000 +0200
-+++ libreoffice-5.0.2.1-boost/sdext/Executable_pdfunzip.mk	2015-11-20 23:44:09.571262711 +0100
-@@ -33,4 +33,6 @@
-     sdext/source/pdfimport/test/pdfunzip \
- ))
- 
-+$(eval $(call gb_Executable_add_libs,pdfunzip,-lboost_system))
-+
- # vim:set noet sw=4 ts=4:
-diff -ur libreoffice-5.0.2.1/sdext/Library_pdfimport.mk libreoffice-5.0.2.1-boost/sdext/Library_pdfimport.mk
---- libreoffice-5.0.2.1/sdext/Library_pdfimport.mk	2015-09-05 09:59:15.000000000 +0200
-+++ libreoffice-5.0.2.1-boost/sdext/Library_pdfimport.mk	2015-11-20 23:44:24.911397184 +0100
-@@ -40,4 +40,6 @@
-     sdext/source/pdfimport/services \
- ))
- 
-+$(eval $(call gb_Library_add_libs,pdfimport,-lboost_system))
-+
- # vim:set noet sw=4 ts=4:
diff --git a/disable-failing-test.patch b/disable-failing-test.patch
index 76f7870..8953f63 100644
--- a/disable-failing-test.patch
+++ b/disable-failing-test.patch
@@ -27,30 +27,33 @@
  # This runs a suite of peformance tests on embedded firebird and HSQLDB.
  # Instructions on running the test can be found in qa/unit/embeddedb_performancetest
  ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)
---- libreoffice-5.0.2.1/sw/qa/extras/ooxmlimport/ooxmlimport.cxx~	2015-09-05 09:59:15.000000000 +0200
-+++ libreoffice-5.0.2.1/sw/qa/extras/ooxmlimport/ooxmlimport.cxx	2015-09-17 14:57:25.802634256 +0200
-@@ -2759,14 +2759,6 @@
-     CPPUNIT_ASSERT_EQUAL(text::SizeType::MIN, getProperty<sal_Int16>(xTableRows->getByIndex(0), "SizeType"));
- }
+
+--- libreoffice-5.3.0.3/dbaccess/Module_dbaccess.mk~	2017-02-02 13:13:39.000000000 +0100
++++ libreoffice-5.3.0.3/dbaccess/Module_dbaccess.mk	2017-02-02 14:38:31.994811891 +0100
+@@ -34,12 +34,6 @@ $(eval $(call gb_Module_add_l10n_targets
+ 	UIConfig_dbtdata \
+ ))
  
--DECLARE_OOXMLIMPORT_TEST(testTdf87924, "tdf87924.docx")
--{
--    uno::Reference<beans::XPropertySet> xPropertySet(getShape(1), uno::UNO_QUERY);
--    comphelper::SequenceAsHashMap aGeometry(xPropertySet->getPropertyValue("CustomShapeGeometry"));
--    // This was -270, the text rotation angle was set when it should not be rotated.
--    CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), aGeometry["TextPreRotateAngle"].get<sal_Int32>());
--}
+-ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)
+-$(eval $(call gb_Module_add_check_targets,dbaccess,\
+-    CppunitTest_dbaccess_firebird_test \
+-))
+-endif
 -
- #endif
+ $(eval $(call gb_Module_add_check_targets,dbaccess,\
+ 	CppunitTest_dbaccess_dialog_save \
+ 	CppunitTest_dbaccess_empty_stdlib_save \
+@@ -49,13 +43,6 @@ $(eval $(call gb_Module_add_check_target
+ 
+ # This runs a suite of peformance tests on embedded firebird and HSQLDB.
+ # Instructions on running the test can be found in qa/unit/embeddedb_performancetest
+-ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)
+-ifeq ($(ENABLE_JAVA),TRUE)
+-$(eval $(call gb_Module_add_check_targets,dbaccess,\
+-    CppunitTest_dbaccess_embeddeddb_performancetest \
+-))
+-endif
+-endif
  
- CPPUNIT_PLUGIN_IMPLEMENT();
---- libreoffice-5.1.2.1/sw/Module_sw.mk~	2016-03-16 09:44:00.000000000 +0900
-+++ libreoffice-5.1.2.1/sw/Module_sw.mk	2016-03-30 17:57:21.514589545 +0900
-@@ -58,7 +58,6 @@
-     CppunitTest_sw_ooxmlexport4 \
-     CppunitTest_sw_ooxmlexport5 \
-     CppunitTest_sw_ooxmlexport6 \
--    CppunitTest_sw_ooxmlexport7 \
-     CppunitTest_sw_ooxmlfieldexport \
-     CppunitTest_sw_ooxmlw14export \
-     CppunitTest_sw_ooxmlimport \
+ $(eval $(call gb_Module_add_subsequentcheck_targets,dbaccess,\
+ 	JunitTest_dbaccess_complex \
diff --git a/liborcus-0.11.patch b/liborcus-0.11.patch
deleted file mode 100644
index 1394830..0000000
--- a/liborcus-0.11.patch
+++ /dev/null
@@ -1,1026 +0,0 @@
-From b325b4c286b56a63316063a3ac4648bf7b7efcbe Mon Sep 17 00:00:00 2001
-From: Kohei Yoshida <kohei.yoshida at gmail.com>
-Date: Sat, 5 Mar 2016 20:09:34 -0500
-Subject: [PATCH] Update liborcus to 0.11.0.
-
-Markus did half of this, and I simply carried the torch.
-
-Change-Id: Icd3ee1e4b5bd562faee06dfd9dce52a4bed49a71
-Reviewed-on: https://gerrit.libreoffice.org/22943
-Tested-by: Jenkins <ci at libreoffice.org>
-Reviewed-by: Kohei Yoshida <libreoffice at kohei.us>
----
- RepositoryExternal.mk                              |   19 +-
- configure.ac                                       |    2 +-
- download.lst                                       |    4 +-
- external/boost/Module_boost.mk                     |    1 +
- external/boost/StaticLibrary_boost_filesystem.mk   |   36 +
- ...0001-Fix-for-OSX-build-inside-LibreOffice.patch | 1175 ++++++++++++++++++++
- .../liborcus/0001-Get-it-to-build-on-Windows.patch |  212 ++++
- external/liborcus/ExternalPackage_liborcus.mk      |    8 +-
- external/liborcus/ExternalProject_liborcus.mk      |   22 +-
- external/liborcus/Library_orcus-parser.mk          |    3 +
- external/liborcus/Library_orcus.mk                 |   18 +-
- external/liborcus/UnpackedTarball_liborcus.mk      |   11 +-
- external/liborcus/fix-crash-ooo55043-1.patch.0     |   17 -
- external/liborcus/unusedheader.patch.0             |   11 -
- external/liborcus/windows-constants-hack.patch     |   15 +
- sc/Library_scfilt.mk                               |    1 +
- sc/source/filter/inc/orcusinterface.hxx            |    2 +
- sc/source/filter/orcus/filterdetect.cxx            |    2 +-
- sc/source/filter/orcus/interface.cxx               |   63 +-
- 19 files changed, 1544 insertions(+), 78 deletions(-)
- create mode 100644 external/boost/StaticLibrary_boost_filesystem.mk
- create mode 100644 external/liborcus/0001-Fix-for-OSX-build-inside-LibreOffice.patch
- create mode 100755 external/liborcus/0001-Get-it-to-build-on-Windows.patch
- delete mode 100644 external/liborcus/fix-crash-ooo55043-1.patch.0
- delete mode 100644 external/liborcus/unusedheader.patch.0
- create mode 100755 external/liborcus/windows-constants-hack.patch
-
-diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
-index 5b497ee..c6fe371 100644
---- a/RepositoryExternal.mk
-+++ b/RepositoryExternal.mk
-@@ -743,6 +743,21 @@ $(call gb_LinkTarget_set_include,$(1),\
- 
- endef
- 
-+define gb_LinkTarget__use_boost_filesystem
-+$(call gb_LinkTarget_add_defs,$(1),\
-+	-DBOOST_ALL_NO_LIB \
-+)
-+
-+$(call gb_LinkTarget_use_static_libraries,$(1),\
-+	boost_filesystem \
-+)
-+
-+endef
-+
-+define gb_ExternalProject__use_boost_filesystem
-+$(call gb_ExternalProject_use_static_libraries,$(1),boost_filesystem)
-+endef
-+
- define gb_ExternalProject__use_boost_headers
- $(call gb_ExternalProject_use_unpacked,$(1),boost)
- 
-@@ -3129,7 +3144,7 @@ $(call gb_LinkTarget_set_include,$(1),\
- )
- 
- $(call gb_LinkTarget_add_libs,$(1),\
--	-L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs -lorcus-0.10 \
-+       -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs -lorcus-0.11 \
- )
- 
- $(if $(SYSTEM_BOOST), \
-@@ -3148,7 +3163,7 @@ $(call gb_LinkTarget_set_include,$(1),\
- )
- 
- $(call gb_LinkTarget_add_libs,$(1),\
--	-L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs -lorcus-parser-0.10 \
-+	-L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs -lorcus-parser-0.11 \
- )
- 
- endef
-diff --git a/configure.ac b/configure.ac
-index 934d43a..dab1919 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -9196,7 +9196,7 @@ if test -z "$enable_orcus" -o "$enable_orcus" != no; then
-     ENABLE_ORCUS="TRUE"
-     AC_DEFINE(ENABLE_ORCUS)
- 
--    libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.10 >= 0.9.0])
-+    libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.11 >= 0.11.0])
-     if test "$with_system_orcus" != "yes"; then
-         if test "$SYSTEM_BOOST" = "TRUE"; then
-             # ===========================================================
-diff --git a/download.lst b/download.lst
-index 906a579..475112b 100644
---- a/download.lst
-+++ b/download.lst
-@@ -112,8 +112,8 @@
- export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
- export OPENSSL_MD5SUM := 9392e65072ce4b614c1392eefc1f23d0
- export OPENSSL_TARBALL := openssl-1.0.2h.tar.gz
--export ORCUS_MD5SUM := e6efcbe50a5fd4d50d513c9a7a4139b0
--export ORCUS_TARBALL := liborcus-0.9.2.tar.gz
-+export ORCUS_MD5SUM := ca1e5d486b29cd519bb1d9845a6a768e
-+export ORCUS_TARBALL := liborcus-0.11.0.tar.gz
- export OWNCLOUD_ANDROID_LIB_MD5SUM := 593f0aa47bf2efc0efda2d28fae063b2
- export OWNCLOUD_ANDROID_LIB_TARBALL := owncloud-android-library-0.9.4-no-binary-deps.tar.gz
- export PAGEMAKER_MD5SUM := 795cc7a59ace4db2b12586971d668671
-diff --git a/external/boost/Module_boost.mk b/external/boost/Module_boost.mk
-index 5bac25e..ae407f5 100644
---- a/external/boost/Module_boost.mk
-+++ b/external/boost/Module_boost.mk
-@@ -11,6 +11,7 @@ $(eval $(call gb_Module_Module,boost))
- 
- $(eval $(call gb_Module_add_targets,boost,\
- 	StaticLibrary_boostdatetime \
-+	StaticLibrary_boost_filesystem \
- 	StaticLibrary_boost_system \
- 	StaticLibrary_boost_iostreams \
- 	UnpackedTarball_boost \
-diff --git a/external/boost/StaticLibrary_boost_filesystem.mk b/external/boost/StaticLibrary_boost_filesystem.mk
-new file mode 100644
-index 0000000..024308a
---- /dev/null
-+++ b/external/boost/StaticLibrary_boost_filesystem.mk
-@@ -0,0 +1,36 @@
-+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-+#
-+# This file is part of the LibreOffice project.
-+#
-+# This Source Code Form is subject to the terms of the Mozilla Public
-+# License, v. 2.0. If a copy of the MPL was not distributed with this
-+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-+#
-+
-+$(eval $(call gb_StaticLibrary_StaticLibrary,boost_filesystem))
-+
-+$(eval $(call gb_StaticLibrary_use_unpacked,boost_filesystem,boost))
-+
-+$(eval $(call gb_StaticLibrary_set_warnings_not_errors,boost_filesystem))
-+
-+# disable "auto link" "feature" on MSVC
-+$(eval $(call gb_StaticLibrary_add_defs,boost_filesystem,\
-+	-DBOOST_ALL_NO_LIB \
-+))
-+
-+$(eval $(call gb_StaticLibrary_use_external,boost_filesystem,boost_headers))
-+
-+$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boost_filesystem,cpp))
-+
-+$(eval $(call gb_StaticLibrary_add_generated_exception_objects,boost_filesystem,\
-+	UnpackedTarball/boost/libs/filesystem/src/codecvt_error_category \
-+	UnpackedTarball/boost/libs/filesystem/src/operations \
-+	UnpackedTarball/boost/libs/filesystem/src/path \
-+	UnpackedTarball/boost/libs/filesystem/src/path_traits \
-+	UnpackedTarball/boost/libs/filesystem/src/portability \
-+	UnpackedTarball/boost/libs/filesystem/src/unique_path \
-+	UnpackedTarball/boost/libs/filesystem/src/utf8_codecvt_facet \
-+	UnpackedTarball/boost/libs/filesystem/src/windows_file_codecvt \
-+))
-+
-+# vim: set noet sw=4 ts=4:
-diff --git a/external/liborcus/ExternalPackage_liborcus.mk b/external/liborcus/ExternalPackage_liborcus.mk
-index 4411592..56debe9 100644
---- a/external/liborcus/ExternalPackage_liborcus.mk
-+++ b/external/liborcus/ExternalPackage_liborcus.mk
-@@ -12,11 +12,11 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,liborcus,liborcus))
- $(eval $(call gb_ExternalPackage_use_external_project,liborcus,liborcus))
- 
- ifeq ($(OS),MACOSX)
--$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.10.0.dylib,src/liborcus/.libs/liborcus-0.10.0.dylib))
--$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.10.0.dylib,src/parser/.libs/liborcus-parser-0.10.0.dylib))
-+$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.11.0.dylib,src/liborcus/.libs/liborcus-0.11.0.dylib))
-+$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.11.0.dylib,src/parser/.libs/liborcus-parser-0.11.0.dylib))
- else ifeq ($(DISABLE_DYNLOADING),)
--$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.10.so.0,src/liborcus/.libs/liborcus-0.10.so.0.0.0))
--$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.10.so.0,src/parser/.libs/liborcus-parser-0.10.so.0.0.0))
-+$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.11.so.0,src/liborcus/.libs/liborcus-0.11.so.0.0.0))
-+$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.11.so.0,src/parser/.libs/liborcus-parser-0.11.so.0.0.0))
- endif
- 
- # vim: set noet sw=4 ts=4:
-diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk
-index 7eb8fdb..580ef847 100644
---- a/external/liborcus/ExternalProject_liborcus.mk
-+++ b/external/liborcus/ExternalProject_liborcus.mk
-@@ -13,6 +13,7 @@ $(eval $(call gb_ExternalProject_use_autoconf,liborcus,build))
- 
- $(eval $(call gb_ExternalProject_use_externals,liborcus, \
-     boost_headers \
-+    boost_filesystem \
-     boost_iostreams \
-     boost_system \
- 	mdds_headers \
-@@ -38,9 +39,9 @@ ifneq ($(SYSTEM_ZLIB),)
- liborcus_LIBS+=-lz
- endif
- ifneq ($(SYSTEM_BOOST),)
--liborcus_LIBS+=$(BOOST_SYSTEM_LIB) $(BOOST_IOSTREAMS_LIB)
-+liborcus_LIBS+=$(BOOST_SYSTEM_LIB) $(BOOST_IOSTREAMS_LIB) $(BOOST_FILESYSTEM_LIB)
- else
--liborcus_LIBS+=-L$(gb_StaticLibrary_WORKDIR) -lboost_system -lboost_iostreams
-+liborcus_LIBS+=-L$(gb_StaticLibrary_WORKDIR) -lboost_system -lboost_iostreams -lboost_filesystem
- endif
- ifeq ($(OS),ANDROID)
- liborcus_LIBS+=-lgnustl_shared -lm
-@@ -96,12 +97,13 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
- 			, \
- 				--enable-shared --disable-static \
- 			) \
--			$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
--			--disable-spreadsheet-model \
--			--without-tools \
--			--disable-werror \
--			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
--			$(if $(SYSTEM_BOOST),,\
-+                       $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
-+                       --disable-spreadsheet-model \
-+                       --without-tools \
-+                       --disable-python \
-+                       --disable-werror \
-+                       $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
-+                       $(if $(SYSTEM_BOOST),,\
- 				--with-boost=$(WORKDIR)/UnpackedTarball/boost \
- 				boost_cv_lib_iostreams=yes \
- 				boost_cv_lib_system=yes \
-@@ -111,8 +113,8 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
- 		   $(MAKE) \
- 		$(if $(filter MACOSX,$(OS)),\
- 			&& $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
--				$(gb_Package_SOURCEDIR_liborcus)/src/liborcus/.libs/liborcus-0.10.0.dylib \
--				$(gb_Package_SOURCEDIR_liborcus)/src/parser/.libs/liborcus-parser-0.10.0.dylib \
-+				$(gb_Package_SOURCEDIR_liborcus)/src/liborcus/.libs/liborcus-0.11.0.dylib \
-+				$(gb_Package_SOURCEDIR_liborcus)/src/parser/.libs/liborcus-parser-0.11.0.dylib \
- 		) \
- 	)
- 
-diff --git a/external/liborcus/Library_orcus-parser.mk b/external/liborcus/Library_orcus-parser.mk
-index c3b4eec..28af14e 100644
---- a/external/liborcus/Library_orcus-parser.mk
-+++ b/external/liborcus/Library_orcus-parser.mk
-@@ -39,6 +39,8 @@ $(eval $(call gb_Library_add_generated_exception_objects,orcus-parser,\
- 	UnpackedTarball/liborcus/src/parser/css_types \
- 	UnpackedTarball/liborcus/src/parser/csv_parser_base \
- 	UnpackedTarball/liborcus/src/parser/exception \
-+	UnpackedTarball/liborcus/src/parser/json_parser_base \
-+	UnpackedTarball/liborcus/src/parser/parser_base \
- 	UnpackedTarball/liborcus/src/parser/parser_global \
- 	UnpackedTarball/liborcus/src/parser/pstring \
- 	UnpackedTarball/liborcus/src/parser/sax_parser_base \
-@@ -48,6 +50,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,orcus-parser,\
- 	UnpackedTarball/liborcus/src/parser/tokens \
- 	UnpackedTarball/liborcus/src/parser/types \
- 	UnpackedTarball/liborcus/src/parser/xml_namespace \
-+	UnpackedTarball/liborcus/src/parser/yaml_parser_base \
- 	UnpackedTarball/liborcus/src/parser/zip_archive \
- 	UnpackedTarball/liborcus/src/parser/zip_archive_stream \
- ))
-diff --git a/external/liborcus/Library_orcus.mk b/external/liborcus/Library_orcus.mk
-index ae98d5e..96169f1 100644
---- a/external/liborcus/Library_orcus.mk
-+++ b/external/liborcus/Library_orcus.mk
-@@ -13,6 +13,7 @@ $(eval $(call gb_Library_use_unpacked,orcus,liborcus))
- 
- $(eval $(call gb_Library_use_externals,orcus,\
- 	boost_headers \
-+	boost_filesystem \
- 	boost_iostreams \
- 	boost_system \
- 	mdds_headers \
-@@ -53,12 +54,16 @@ $(eval $(call gb_Library_add_generated_exception_objects,orcus,\
- 	UnpackedTarball/liborcus/src/liborcus/gnumeric_namespace_types \
- 	UnpackedTarball/liborcus/src/liborcus/gnumeric_sheet_context \
- 	UnpackedTarball/liborcus/src/liborcus/gnumeric_tokens \
-+	UnpackedTarball/liborcus/src/liborcus/info \
- 	UnpackedTarball/liborcus/src/liborcus/interface \
-+	UnpackedTarball/liborcus/src/liborcus/json_document_tree \
-+	UnpackedTarball/liborcus/src/liborcus/json_util \
- 	UnpackedTarball/liborcus/src/liborcus/measurement \
-+	UnpackedTarball/liborcus/src/liborcus/odf_helper \
- 	UnpackedTarball/liborcus/src/liborcus/odf_namespace_types \
- 	UnpackedTarball/liborcus/src/liborcus/odf_para_context \
--	UnpackedTarball/liborcus/src/liborcus/odf_styles \
- 	UnpackedTarball/liborcus/src/liborcus/odf_styles_context \
-+	UnpackedTarball/liborcus/src/liborcus/odf_styles \
- 	UnpackedTarball/liborcus/src/liborcus/odf_tokens \
- 	UnpackedTarball/liborcus/src/liborcus/ods_content_xml_context \
- 	UnpackedTarball/liborcus/src/liborcus/ods_content_xml_handler \
-@@ -73,18 +78,26 @@ $(eval $(call gb_Library_add_generated_exception_objects,orcus,\
- 	UnpackedTarball/liborcus/src/liborcus/opc_reader \
- 	UnpackedTarball/liborcus/src/liborcus/orcus_csv \
- 	UnpackedTarball/liborcus/src/liborcus/orcus_gnumeric \
-+	UnpackedTarball/liborcus/src/liborcus/orcus_import_ods \
-+	UnpackedTarball/liborcus/src/liborcus/orcus_import_xlsx \
- 	UnpackedTarball/liborcus/src/liborcus/orcus_ods \
- 	UnpackedTarball/liborcus/src/liborcus/orcus_xlsx \
-+	UnpackedTarball/liborcus/src/liborcus/orcus_xls_xml \
- 	UnpackedTarball/liborcus/src/liborcus/orcus_xml \
- 	UnpackedTarball/liborcus/src/liborcus/session_context \
- 	UnpackedTarball/liborcus/src/liborcus/spreadsheet_interface \
- 	UnpackedTarball/liborcus/src/liborcus/spreadsheet_types \
--	UnpackedTarball/liborcus/src/liborcus/xls_xml_namespace_types \
-+	UnpackedTarball/liborcus/src/liborcus/string_helper \
- 	UnpackedTarball/liborcus/src/liborcus/xlsx_autofilter_context \
- 	UnpackedTarball/liborcus/src/liborcus/xlsx_conditional_format_context \
- 	UnpackedTarball/liborcus/src/liborcus/xlsx_context \
- 	UnpackedTarball/liborcus/src/liborcus/xlsx_handler \
- 	UnpackedTarball/liborcus/src/liborcus/xlsx_helper \
-+	UnpackedTarball/liborcus/src/liborcus/xls_xml_context \
-+	UnpackedTarball/liborcus/src/liborcus/xls_xml_detection_handler \
-+	UnpackedTarball/liborcus/src/liborcus/xls_xml_handler \
-+	UnpackedTarball/liborcus/src/liborcus/xls_xml_namespace_types \
-+	UnpackedTarball/liborcus/src/liborcus/xls_xml_tokens \
- 	UnpackedTarball/liborcus/src/liborcus/xlsx_pivot_context \
- 	UnpackedTarball/liborcus/src/liborcus/xlsx_revision_context \
- 	UnpackedTarball/liborcus/src/liborcus/xlsx_session_data \
-@@ -99,6 +112,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,orcus,\
- 	UnpackedTarball/liborcus/src/liborcus/xml_stream_handler \
- 	UnpackedTarball/liborcus/src/liborcus/xml_stream_parser \
- 	UnpackedTarball/liborcus/src/liborcus/xml_structure_tree \
-+	UnpackedTarball/liborcus/src/liborcus/yaml_document_tree \
- ))
- 
- # vim: set noet sw=4 ts=4:
-diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk
-index 825fa49..0e337ef 100644
---- a/external/liborcus/UnpackedTarball_liborcus.mk
-+++ b/external/liborcus/UnpackedTarball_liborcus.mk
-@@ -16,8 +16,13 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,liborcus,1))
- $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
- 	external/liborcus/0001-workaround-a-linking-problem-on-windows.patch \
- 	external/liborcus/rpath.patch.0 \
--	external/liborcus/fix-crash-ooo55043-1.patch.0 \
--	external/liborcus/unusedheader.patch.0 \
- ))
- 
-+ifeq ($(OS),WNT)
-+$(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
-+	external/liborcus/windows-constants-hack.patch \
-+))
-+endif
-+
-+
- # vim: set noet sw=4 ts=4:
-diff --git a/external/liborcus/fix-crash-ooo55043-1.patch.0 b/external/liborcus/fix-crash-ooo55043-1.patch.0
-deleted file mode 100644
-index 58a97c0..0000000
---- a/external/liborcus/fix-crash-ooo55043-1.patch.0
-+++ /dev/null
-@@ -1,17 +0,0 @@
----- src/parser/zip_archive_stream.cpp
--+++ src/parser/zip_archive_stream.cpp
--@@ -91,8 +91,13 @@
-- 
-- void zip_archive_stream_blob::read(unsigned char* buffer, size_t length) const
-- {
--+    if (!length)
--+        return;
--     // First, make sure we have enough blob to satisfy the requested stream length.
---    size_t length_available = m_size - tell();
--+    const size_t pos = tell();
--+    if (pos > m_size)
--+        throw zip_error("Stream is seeked past end. No data available");
--+    const size_t length_available = m_size - pos;
--     if (length_available < length)
--         throw zip_error("There is not enough stream left to fill requested length.");
-- 
-diff --git a/external/liborcus/unusedheader.patch.0 b/external/liborcus/unusedheader.patch.0
-deleted file mode 100644
-index 4f7a77b..0000000
---- a/external/liborcus/unusedheader.patch.0
-+++ /dev/null
-@@ -1,11 +0,0 @@
----- ./src/parser/pstring.cpp.orig	2015-12-02 14:38:44.658744408 +0000
--+++ ./src/parser/pstring.cpp	2015-12-02 14:38:50.449658497 +0000
--@@ -13,8 +13,6 @@
-- #include <iostream>
-- #include <vector>
-- 
---#include <boost/thread/mutex.hpp>
---
-- using namespace std;
-- 
-- namespace orcus {
-diff --git a/external/liborcus/windows-constants-hack.patch b/external/liborcus/windows-constants-hack.patch
-new file mode 100755
-index 0000000..876bc16
---- /dev/null
-+++ b/external/liborcus/windows-constants-hack.patch
-@@ -0,0 +1,15 @@
-+diff --git a/src/liborcus/info.cpp b/src/liborcus/info.cpp
-+index ae571f5..539ce18 100644
-+--- a/src/liborcus/info.cpp
-++++ b/src/liborcus/info.cpp
-+@@ -7,7 +7,9 @@
-+ 
-+ #include "orcus/info.hpp"
-+ 
-+-#include "constants.inl"
-++#define ORCUS_MAJOR_VERSION 0
-++#define ORCUS_MINOR_VERSION 11
-++#define ORCUS_MICRO_VERSION 0
-+ 
-+ namespace orcus {
-+ 
-diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
-index 74f2ce5..b764290 100644
---- a/sc/Library_scfilt.mk
-+++ b/sc/Library_scfilt.mk
-@@ -227,6 +227,7 @@ ifeq ($(ENABLE_ORCUS),TRUE)
- $(eval $(call gb_Library_use_externals,scfilt,\
- 	orcus \
- 	orcus-parser \
-+	boost_filesystem \
- 	boost_system \
- 	boost_iostreams \
- 	zlib \
-diff --git a/sc/source/filter/inc/orcusinterface.hxx b/sc/source/filter/inc/orcusinterface.hxx
-index 63b36ef..05fe4cb 100644
---- a/sc/source/filter/inc/orcusinterface.hxx
-+++ b/sc/source/filter/inc/orcusinterface.hxx
-@@ -375,6 +375,7 @@ public:
- 
-     virtual void set_border_count(size_t n) override;
-     virtual void set_border_style(orcus::spreadsheet::border_direction_t dir, const char* s, size_t n) override;
-+    virtual void set_border_style(orcus::spreadsheet::border_direction_t dir, orcus::spreadsheet::border_style_t style) override;
-     virtual void set_border_color(orcus::spreadsheet::border_direction_t dir,
-             orcus::spreadsheet::color_elem_t alpha,
-             orcus::spreadsheet::color_elem_t red,
-@@ -425,6 +426,7 @@ public:
-     virtual void set_cell_style_name(const char* s, size_t n) override;
-     virtual void set_cell_style_xf(size_t index) override;
-     virtual void set_cell_style_builtin(size_t index) override;
-+    virtual void set_cell_style_parent_name(const char* s, size_t n) override;
-     virtual size_t commit_cell_style() override;
- };
- 
-diff --git a/sc/source/filter/orcus/filterdetect.cxx b/sc/source/filter/orcus/filterdetect.cxx
-index 7dfccb9..9ae30ad 100644
---- a/sc/source/filter/orcus/filterdetect.cxx
-+++ b/sc/source/filter/orcus/filterdetect.cxx
-@@ -93,7 +93,7 @@ OUString OrcusFormatDetect::detect(css::uno::Sequence<css::beans::PropertyValue>
-     }
- 
-     orcus::format_t eFormat = orcus::detect(reinterpret_cast<const unsigned char*>(aContent.getStr()), aContent.getLength());
--    if (eFormat == orcus::format_gnumeric)
-+    if (eFormat == orcus::format_t::gnumeric)
-         return OUString("Gnumeric XML");
- 
-     return OUString();
-diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx
-index e50b8bf..496faea 100644
---- a/sc/source/filter/orcus/interface.cxx
-+++ b/sc/source/filter/orcus/interface.cxx
-@@ -55,7 +55,7 @@ void ScOrcusGlobalSettings::set_default_formula_grammar(orcus::spreadsheet::form
- 
- orcus::spreadsheet::formula_grammar_t ScOrcusGlobalSettings::get_default_formula_grammar() const
- {
--    return orcus::spreadsheet::formula_grammar_unknown;
-+    return orcus::spreadsheet::formula_grammar_t::unknown;
- }
- 
- ScOrcusFactory::StringCellCache::StringCellCache(const ScAddress& rPos, size_t nIndex) :
-@@ -231,19 +231,19 @@ double translateToInternal(double nVal, orcus::length_unit_t unit)
- {
-     switch(unit)
-     {
--        case orcus::length_unit_inch:
-+        case orcus::length_unit_t::inch:
-             return nVal * 72.0 * 20.0;
-             break;
--        case orcus::length_unit_twip:
-+        case orcus::length_unit_t::twip:
-             return nVal;
-             break;
--        case orcus::length_unit_point:
-+        case orcus::length_unit_t::point:
-             return nVal * 20.0;
-             break;
--        case orcus::length_unit_centimeter:
-+        case orcus::length_unit_t::centimeter:
-             return nVal * 20.0 * 72.0 / 2.54;
-             break;
--        case orcus::length_unit_unknown:
-+        case orcus::length_unit_t::unknown:
-             SAL_WARN("sc.orcus", "unknown unit");
-             break;
-         default:
-@@ -393,18 +393,18 @@ void ScOrcusConditionalFormat::set_type(os::conditional_format_t type)
- {
-     switch (type)
-     {
--        case os::conditional_format_condition:
--        case os::conditional_format_formula:
-+        case os::conditional_format_t::condition:
-+        case os::conditional_format_t::formula:
-             meEntryType = condformat::CONDITION;
-             // mpCurrentEntry.reset(new ScCondFormatEntry());
-         break;
--        case os::conditional_format_date:
-+        case os::conditional_format_t::date:
-         break;
--        case os::conditional_format_colorscale:
-+        case os::conditional_format_t::colorscale:
-         break;
--        case os::conditional_format_databar:
-+        case os::conditional_format_t::databar:
-         break;
--        case os::conditional_format_iconset:
-+        case os::conditional_format_t::iconset:
-         break;
-         default:
-             SAL_INFO("sc.orcus.condformat", "unknown conditional_format_t value");
-@@ -549,17 +549,17 @@ formula::FormulaGrammar::Grammar getCalcGrammarFromOrcus( os::formula_grammar_t
-     formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_ODFF;
-     switch(grammar)
-     {
--        case orcus::spreadsheet::formula_grammar_ods:
-+        case orcus::spreadsheet::formula_grammar_t::ods:
-             eGrammar = formula::FormulaGrammar::GRAM_ODFF;
-             break;
--        case orcus::spreadsheet::formula_grammar_xlsx_2007:
--        case orcus::spreadsheet::formula_grammar_xlsx_2010:
-+        case orcus::spreadsheet::formula_grammar_t::xlsx_2007:
-+        case orcus::spreadsheet::formula_grammar_t::xlsx_2010:
-             eGrammar = formula::FormulaGrammar::GRAM_OOXML;
-             break;
--        case orcus::spreadsheet::formula_grammar_gnumeric:
-+        case orcus::spreadsheet::formula_grammar_t::gnumeric:
-             eGrammar = formula::FormulaGrammar::GRAM_ENGLISH_XL_A1;
-             break;
--        case orcus::spreadsheet::formula_grammar_unknown:
-+        case orcus::spreadsheet::formula_grammar_t::unknown:
-             break;
-     }
- 
-@@ -799,16 +799,16 @@ SvxBoxItemLine getDirection(os::border_direction_t dir)
- {
-     switch (dir)
-     {
--        case os::border_right:
-+        case os::border_direction_t::right:
-             return SvxBoxItemLine::RIGHT;
-         break;
--        case os::border_left:
-+        case os::border_direction_t::left:
-             return SvxBoxItemLine::RIGHT;
-         break;
--        case os::border_top:
-+        case os::border_direction_t::top:
-             return SvxBoxItemLine::RIGHT;
-         break;
--        case os::border_bottom:
-+        case os::border_direction_t::bottom:
-             return SvxBoxItemLine::RIGHT;
-         break;
-         default:
-@@ -947,15 +947,15 @@ void ScOrcusStyles::set_font_underline(orcus::spreadsheet::underline_t e)
- {
-     switch(e)
-     {
--        case orcus::spreadsheet::underline_single:
--        case orcus::spreadsheet::underline_single_accounting:
-+        case orcus::spreadsheet::underline_t::single_line:
-+        case orcus::spreadsheet::underline_t::single_accounting:
-             maCurrentFont.meUnderline = UNDERLINE_SINGLE;
-             break;
--        case orcus::spreadsheet::underline_double:
--        case orcus::spreadsheet::underline_double_accounting:
-+        case orcus::spreadsheet::underline_t::double_line:
-+        case orcus::spreadsheet::underline_t::double_accounting:
-             maCurrentFont.meUnderline = UNDERLINE_DOUBLE;
-             break;
--        case orcus::spreadsheet::underline_none:
-+        case orcus::spreadsheet::underline_t::none:
-             maCurrentFont.meUnderline = UNDERLINE_NONE;
-             break;
-     }
-@@ -1019,6 +1019,12 @@ void ScOrcusStyles::set_border_style(orcus::spreadsheet::border_direction_t /*di
-     // implement later
- }
- 
-+void ScOrcusStyles::set_border_style(
-+    orcus::spreadsheet::border_direction_t /*dir*/, orcus::spreadsheet::border_style_t /*style*/)
-+{
-+    // implement later
-+}
-+
- void ScOrcusStyles::set_border_color(orcus::spreadsheet::border_direction_t dir,
-             orcus::spreadsheet::color_elem_t alpha,
-             orcus::spreadsheet::color_elem_t red,
-@@ -1186,6 +1192,11 @@ void ScOrcusStyles::set_cell_style_builtin(size_t index)
-     maCurrentCellStyle.mnBuiltInId = index;
- }
- 
-+void ScOrcusStyles::set_cell_style_parent_name(const char* /*s*/, size_t /*n*/)
-+{
-+    // place holder
-+}
-+
- size_t ScOrcusStyles::commit_cell_style()
- {
-     SAL_INFO("sc.orcus.style", "commit cell style: " << maCurrentCellStyle.maName);
--- 
-2.5.0
-
-From d72a33c6aed0ca8f9fe0b90bc6d72e7313985524 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon at redhat.com>
-Date: Tue, 8 Mar 2016 05:57:40 +0100
-Subject: [PATCH 1/4] reorder
-
-Change-Id: I8ff9f61475fddb475fe08e867c5446c825abb7dc
----
- RepositoryExternal.mk | 31 ++++++++++++++++---------------
- 1 file changed, 16 insertions(+), 15 deletions(-)
-
-diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
-index c6fe371..c8aab64 100644
---- a/RepositoryExternal.mk
-+++ b/RepositoryExternal.mk
-@@ -704,6 +704,21 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
- 
- endef
- 
-+define gb_LinkTarget__use_boost_filesystem
-+$(call gb_LinkTarget_add_defs,$(1),\
-+	-DBOOST_ALL_NO_LIB \
-+)
-+
-+$(call gb_LinkTarget_use_static_libraries,$(1),\
-+	boost_filesystem \
-+)
-+
-+endef
-+
-+define gb_ExternalProject__use_boost_filesystem
-+$(call gb_ExternalProject_use_static_libraries,$(1),boost_filesystem)
-+endef
-+
- define gb_LinkTarget__use_boost_iostreams
- $(call gb_LinkTarget_add_defs,$(1),\
- 	-DBOOST_ALL_NO_LIB \
-@@ -743,25 +758,11 @@ $(call gb_LinkTarget_set_include,$(1),\
- 
- endef
- 
--define gb_LinkTarget__use_boost_filesystem
--$(call gb_LinkTarget_add_defs,$(1),\
--	-DBOOST_ALL_NO_LIB \
--)
--
--$(call gb_LinkTarget_use_static_libraries,$(1),\
--	boost_filesystem \
--)
--
--endef
--
--define gb_ExternalProject__use_boost_filesystem
--$(call gb_ExternalProject_use_static_libraries,$(1),boost_filesystem)
--endef
--
- define gb_ExternalProject__use_boost_headers
- $(call gb_ExternalProject_use_unpacked,$(1),boost)
- 
- endef
-+
- endif # SYSTEM_BOOST
- 
- 
--- 
-2.5.0
-
-From 57c439a15e151fa9f7c298ceb15165749958c53c Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon at redhat.com>
-Date: Tue, 8 Mar 2016 06:06:36 +0100
-Subject: [PATCH 2/4] reduce copypasta
-
-Change-Id: I5303caf69128a0a6d28fccfcf2ab63ed466e3853
----
- RepositoryExternal.mk | 81 +++++++++++++--------------------------------------
- 1 file changed, 21 insertions(+), 60 deletions(-)
-
-diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
-index c8aab64..58f924d 100644
---- a/RepositoryExternal.mk
-+++ b/RepositoryExternal.mk
-@@ -617,7 +617,7 @@ endif # SYSTEM_HUNSPELL
- 
- ifneq ($(SYSTEM_BOOST),)
- 
--define gb_LinkTarget__use_boostdatetime
-+define gb_LinkTarget__use_boost_lib
- $(call gb_LinkTarget_set_include,$(1),\
- 	$$(INCLUDE) \
- 	$(BOOST_CPPFLAGS) \
-@@ -627,43 +627,24 @@ $(call gb_LinkTarget_add_ldflags,$(1),\
- 	$(BOOST_LDFLAGS) \
- )
- 
--$(call gb_LinkTarget_add_libs,$(1),\
--	$(BOOST_DATE_TIME_LIB) \
--)
-+$(call gb_LinkTarget_add_libs,$(1),$(2))
- 
- endef
- 
--define gb_LinkTarget__use_boost_iostreams
--$(call gb_LinkTarget_set_include,$(1),\
--	$$(INCLUDE) \
--	$(BOOST_CPPFLAGS) \
--)
-+define gb_LinkTarget__use_boostdatetime
-+$(call gb_LinkTarget__use_boost_lib,$(1),$(BOOST_DATE_TIME_LIB))
- 
--$(call gb_LinkTarget_add_ldflags,$(1),\
--	$(BOOST_LDFLAGS) \
--)
-+endef
- 
--$(call gb_LinkTarget_add_libs,$(1),\
--	$(BOOST_IOSTREAMS_LIB) \
--)
-+define gb_LinkTarget__use_boost_iostreams
-+$(call gb_LinkTarget__use_boost_lib,$(1),$(BOOST_IOSTREAMS_LIB))
- 
- endef
- 
- gb_ExternalProject__use_boost_iostreams :=
- 
- define gb_LinkTarget__use_boost_system
--$(call gb_LinkTarget_set_include,$(1),\
--	$$(INCLUDE) \
--	$(BOOST_CPPFLAGS) \
--)
--
--$(call gb_LinkTarget_add_ldflags,$(1),\
--	$(BOOST_LDFLAGS) \
--)
--
--$(call gb_LinkTarget_add_libs,$(1),\
--	$(BOOST_SYSTEM_LIB) \
--)
-+$(call gb_LinkTarget__use_boost_lib,$(1),$(BOOST_SYSTEM_LIB))
- 
- endef
- 
-@@ -681,37 +662,29 @@ gb_ExternalProject__use_boost_headers:=
- 
- else # !SYSTEM_BOOST
- 
--ifeq ($(OS),WNT)
--define gb_LinkTarget__use_boostthread
-+define gb_LinkTarget__use_boost_lib
- $(call gb_LinkTarget_add_defs,$(1),\
- 	-DBOOST_ALL_NO_LIB \
- )
- 
--$(call gb_LinkTarget_use_static_libraries,$(1),\
--	boostthread \
--)
-+$(call gb_LinkTarget_use_static_libraries,$(1),$(2))
-+
-+endef
-+
-+ifeq ($(OS),WNT)
-+define gb_LinkTarget__use_boostthread
-+$(call gb_LinkTarget__use_boost_lib,$(1),boostthread)
-+
- endef
- endif
- 
- define gb_LinkTarget__use_boostdatetime
--$(call gb_LinkTarget_add_defs,$(1),\
--	-DBOOST_ALL_NO_LIB \
--)
--
--$(call gb_LinkTarget_use_static_libraries,$(1),\
--	boostdatetime \
--)
-+$(call gb_LinkTarget__use_boost_lib,$(1),boostdatetime)
- 
- endef
- 
- define gb_LinkTarget__use_boost_filesystem
--$(call gb_LinkTarget_add_defs,$(1),\
--	-DBOOST_ALL_NO_LIB \
--)
--
--$(call gb_LinkTarget_use_static_libraries,$(1),\
--	boost_filesystem \
--)
-+$(call gb_LinkTarget__use_boost_lib,$(1),boost_filesystem)
- 
- endef
- 
-@@ -720,13 +693,7 @@ $(call gb_ExternalProject_use_static_libraries,$(1),boost_filesystem)
- endef
- 
- define gb_LinkTarget__use_boost_iostreams
--$(call gb_LinkTarget_add_defs,$(1),\
--	-DBOOST_ALL_NO_LIB \
--)
--
--$(call gb_LinkTarget_use_static_libraries,$(1),\
--	boost_iostreams \
--)
-+$(call gb_LinkTarget__use_boost_lib,$(1),boost_iostreams)
- 
- endef
- 
-@@ -735,13 +702,7 @@ $(call gb_ExternalProject_use_static_libraries,$(1),boost_iostreams)
- endef
- 
- define gb_LinkTarget__use_boost_system
--$(call gb_LinkTarget_add_defs,$(1),\
--	-DBOOST_ALL_NO_LIB \
--)
--
--$(call gb_LinkTarget_use_static_libraries,$(1),\
--	boost_system \
--)
-+$(call gb_LinkTarget__use_boost_lib,$(1),boost_system)
- 
- endef
- 
--- 
-2.5.0
-
-From ed41a33ca22f46b123df4132d376247682af07af Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon at redhat.com>
-Date: Tue, 8 Mar 2016 06:23:24 +0100
-Subject: [PATCH 3/4] detect Boost.Filesystem
-
-Change-Id: I86c268f49f44bd1e208a9de781a16bf19450c64c
----
- config_host.mk.in         |   1 +
- configure.ac              |   1 +
- m4/ax_boost_filesystem.m4 | 118 ++++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 120 insertions(+)
- create mode 100644 m4/ax_boost_filesystem.m4
-
-diff --git a/config_host.mk.in b/config_host.mk.in
-index 89081ca..0a2ec0b 100644
---- a/config_host.mk.in
-+++ b/config_host.mk.in
-@@ -37,6 +37,7 @@ export BARCODE_EXTENSION_PACK=@BARCODE_EXTENSION_PACK@
- export BOOST_CPPFLAGS=@BOOST_CPPFLAGS@
- export BOOST_CXXFLAGS=@BOOST_CXXFLAGS@
- export BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@
-+export BOOST_FILESYSTEM_LIB=@BOOST_FILESYSTEM_LIB@
- export BOOST_IOSTREAMS_LIB=@BOOST_IOSTREAMS_LIB@
- export BOOST_LDFLAGS=@BOOST_LDFLAGS@
- export BOOST_SYSTEM_LIB=@BOOST_SYSTEM_LIB@
-diff --git a/configure.ac b/configure.ac
-index dab1919..7b5cedd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -8836,6 +8836,7 @@ if test "$with_system_boost" = "yes"; then
-     SYSTEM_BOOST=TRUE
-     AX_BOOST_BASE(1.47)
-     AX_BOOST_DATE_TIME
-+    AX_BOOST_FILESYSTEM
-     AX_BOOST_IOSTREAMS
-     mingw_boost_date_time_dll=`echo $BOOST_DATE_TIME_LIB | sed -e 's/^-l//' -e 's/\.dll$//'`
-     libo_MINGW_TRY_DLL([$mingw_boost_date_time_dll])
-diff --git a/m4/ax_boost_filesystem.m4 b/m4/ax_boost_filesystem.m4
-new file mode 100644
-index 0000000..f162163
---- /dev/null
-+++ b/m4/ax_boost_filesystem.m4
-@@ -0,0 +1,118 @@
-+# ===========================================================================
-+#    http://www.gnu.org/software/autoconf-archive/ax_boost_filesystem.html
-+# ===========================================================================
-+#
-+# SYNOPSIS
-+#
-+#   AX_BOOST_FILESYSTEM
-+#
-+# DESCRIPTION
-+#
-+#   Test for Filesystem library from the Boost C++ libraries. The macro
-+#   requires a preceding call to AX_BOOST_BASE. Further documentation is
-+#   available at <http://randspringer.de/boost/index.html>.
-+#
-+#   This macro calls:
-+#
-+#     AC_SUBST(BOOST_FILESYSTEM_LIB)
-+#
-+#   And sets:
-+#
-+#     HAVE_BOOST_FILESYSTEM
-+#
-+# LICENSE
-+#
-+#   Copyright (c) 2009 Thomas Porschberg <thomas at randspringer.de>
-+#   Copyright (c) 2009 Michael Tindal
-+#   Copyright (c) 2009 Roman Rybalko <libtorrent at romanr.info>
-+#
-+#   Copying and distribution of this file, with or without modification, are
-+#   permitted in any medium without royalty provided the copyright notice
-+#   and this notice are preserved. This file is offered as-is, without any
-+#   warranty.
-+
-+#serial 26
-+
-+AC_DEFUN([AX_BOOST_FILESYSTEM],
-+[
-+	AC_ARG_WITH([boost-filesystem],
-+	AS_HELP_STRING([--with-boost-filesystem@<:@=special-lib@:>@],
-+                   [use the Filesystem library from boost - it is possible to specify a certain library for the linker
-+                        e.g. --with-boost-filesystem=boost_filesystem-gcc-mt ]),
-+        [
-+        if test "$withval" = "no"; then
-+			want_boost="no"
-+        elif test "$withval" = "yes"; then
-+            want_boost="yes"
-+            ax_boost_user_filesystem_lib=""
-+        else
-+		    want_boost="yes"
-+		ax_boost_user_filesystem_lib="$withval"
-+		fi
-+        ],
-+        [want_boost="yes"]
-+	)
-+
-+	if test "x$want_boost" = "xyes"; then
-+        AC_REQUIRE([AC_PROG_CC])
-+		CPPFLAGS_SAVED="$CPPFLAGS"
-+		CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-+		export CPPFLAGS
-+
-+		LDFLAGS_SAVED="$LDFLAGS"
-+		LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-+		export LDFLAGS
-+
-+		LIBS_SAVED=$LIBS
-+		LIBS="$LIBS $BOOST_SYSTEM_LIB"
-+		export LIBS
-+
-+        AC_CACHE_CHECK(whether the Boost::Filesystem library is available,
-+					   ax_cv_boost_filesystem,
-+        [AC_LANG_PUSH([C++])
-+         AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/filesystem/path.hpp>]],
-+                                   [[using namespace boost::filesystem;
-+                                   path my_path( "foo/bar/data.txt" );
-+                                   return 0;]])],
-+					       ax_cv_boost_filesystem=yes, ax_cv_boost_filesystem=no)
-+         AC_LANG_POP([C++])
-+		])
-+		if test "x$ax_cv_boost_filesystem" = "xyes"; then
-+			AC_DEFINE(HAVE_BOOST_FILESYSTEM,,[define if the Boost::Filesystem library is available])
-+            BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
-+            if test "x$ax_boost_user_filesystem_lib" = "x"; then
-+                for libextension in `ls -r $BOOSTLIBDIR/libboost_filesystem* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'` ; do
-+                     ax_lib=${libextension}
-+				    AC_CHECK_LIB($ax_lib, exit,
-+                                 [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
-+                                 [link_filesystem="no"])
-+				done
-+                if test "x$link_filesystem" != "xyes"; then
-+                for libextension in `ls -r $BOOSTLIBDIR/boost_filesystem* 2>/dev/null | sed 's,.*/,,' | sed -e 's,\..*,,'` ; do
-+                     ax_lib=${libextension}
-+				    AC_CHECK_LIB($ax_lib, exit,
-+                                 [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
-+                                 [link_filesystem="no"])
-+				done
-+		    fi
-+            else
-+               for ax_lib in $ax_boost_user_filesystem_lib boost_filesystem-$ax_boost_user_filesystem_lib; do
-+				      AC_CHECK_LIB($ax_lib, exit,
-+                                   [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
-+                                   [link_filesystem="no"])
-+                  done
-+
-+            fi
-+            if test "x$ax_lib" = "x"; then
-+                AC_MSG_ERROR(Could not find a version of the library!)
-+            fi
-+			if test "x$link_filesystem" != "xyes"; then
-+				AC_MSG_ERROR(Could not link against $ax_lib !)
-+			fi
-+		fi
-+
-+		CPPFLAGS="$CPPFLAGS_SAVED"
-+		LDFLAGS="$LDFLAGS_SAVED"
-+		LIBS="$LIBS_SAVED"
-+	fi
-+])
--- 
-2.5.0
-
-From b4339fa7eee12f173b2273aed5dc6b8abae528f4 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon at redhat.com>
-Date: Tue, 8 Mar 2016 06:08:36 +0100
-Subject: [PATCH 4/4] define boost_filestystem external for system boost too
-
-Change-Id: Ie9bfc6a5f3e1862acbd1bb08c6f2bb0b63f2587e
----
- RepositoryExternal.mk | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
-index 58f924d..ca7cdf8 100644
---- a/RepositoryExternal.mk
-+++ b/RepositoryExternal.mk
-@@ -636,6 +636,13 @@ $(call gb_LinkTarget__use_boost_lib,$(1),$(BOOST_DATE_TIME_LIB))
- 
- endef
- 
-+define gb_LinkTarget__use_boost_filesystem
-+$(call gb_LinkTarget__use_boost_lib,$(1),$(BOOST_FILESYSTEM_LIB))
-+
-+endef
-+
-+gb_ExternalProject__use_boost_filesystem :=
-+
- define gb_LinkTarget__use_boost_iostreams
- $(call gb_LinkTarget__use_boost_lib,$(1),$(BOOST_IOSTREAMS_LIB))
- 
--- 
-2.5.0
-
diff --git a/mdds-1.2.0.patch b/mdds-1.2.0.patch
deleted file mode 100644
index 89d1314..0000000
--- a/mdds-1.2.0.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From db729f3b685fd832a3ec7387b339cf2bbeb4bd4d Mon Sep 17 00:00:00 2001
-From: Kohei Yoshida <kohei.yoshida at gmail.com>
-Date: Wed, 11 May 2016 21:45:56 -0400
-Subject: Update mdds to 1.2.0.  Note that the API version is also up.
-
-liborcus-0.11.2 is out only to make it buildable with mdds-1.2.
-
-Change-Id: I9648d827b008da252c57be0ebfd2efccb008ac70
-Reviewed-on: https://gerrit.libreoffice.org/24944
-Tested-by: Jenkins <ci at libreoffice.org>
-Reviewed-by: Kohei Yoshida <libreoffice at kohei.us>
-
-diff --git a/configure.ac b/configure.ac
-index 3f1b7f0..6dea282 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -8832,7 +8832,7 @@ AC_SUBST(SYSTEM_BOOST)
- dnl ===================================================================
- dnl Check for system mdds
- dnl ===================================================================
--libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds >= 0.12.0], ["-I${WORKDIR}/UnpackedTarball/mdds/include"])
-+libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.2 >= 1.2.0], ["-I${WORKDIR}/UnpackedTarball/mdds/include"])
- 
- dnl ===================================================================
- dnl Check for system glm
-diff --git a/download.lst b/download.lst
-index a2483c2..ddd6edc 100644
---- a/download.lst
-+++ b/download.lst
-@@ -94,8 +94,8 @@
- export LIBXSLT_TARBALL := 9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz
- export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
- export MARIADB_TARBALL := a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz
--export MDDS_MD5SUM := ef2560ed5416652a7fe195305b14cebe
--export MDDS_TARBALL := mdds_0.12.1.tar.bz2
-+export MDDS_MD5SUM := 9f3383fb7bae825eab69f3a6ec1d74b2
-+export MDDS_TARBALL := mdds-1.2.0.tar.bz2
- export MSPUB_MD5SUM := ff9d0f9dd8fbc523408ea1953d5bde41
- export MSPUB_TARBALL := libmspub-0.1.2.tar.bz2
- export MWAW_MD5SUM := 4a8a53a9d997cf0e2bd208178797dbfb
-diff --git a/sc/inc/mtvelements.hxx b/sc/inc/mtvelements.hxx
-index 0bc5162..18edafc 100644
---- a/sc/inc/mtvelements.hxx
-+++ b/sc/inc/mtvelements.hxx
-@@ -53,6 +53,7 @@ const mdds::mtv::element_t element_type_cellnote = mdds::mtv::element_type_user_
- /// Mapped standard element types (for convenience).
- const mdds::mtv::element_t element_type_numeric = mdds::mtv::element_type_numeric;
- const mdds::mtv::element_t element_type_empty = mdds::mtv::element_type_empty;
-+const mdds::mtv::element_t element_type_uint16 = mdds::mtv::element_type_ushort;
- 
- /// Custom element blocks.
- 
-@@ -65,6 +66,7 @@ typedef mdds::mtv::noncopyable_managed_element_block<element_type_formula, ScFor
- 
- /// Mapped standard element blocks (for convenience).
- typedef mdds::mtv::numeric_element_block numeric_block;
-+typedef mdds::mtv::ushort_element_block uint16_block;
- 
- /// This needs to be in the same namespace as CellTextAttr.
- MDDS_MTV_DEFINE_ELEMENT_CALLBACKS(CellTextAttr, element_type_celltextattr, CellTextAttr(), celltextattr_block)
-diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
-index f1ce9a5..1689809 100644
---- a/sc/source/core/tool/scmatrix.cxx
-+++ b/sc/source/core/tool/scmatrix.cxx
-@@ -57,17 +57,15 @@ using ::std::unary_function;
-  * Custom string trait struct to tell mdds::multi_type_matrix about the
-  * custom string type and how to handle blocks storing them.
-  */
--struct custom_string_trait
-+struct matrix_trait
- {
--    typedef svl::SharedString string_type;
-     typedef sc::string_block string_element_block;
--
--    static const mdds::mtv::element_t string_type_identifier = sc::element_type_string;
-+    typedef sc::uint16_block integer_element_block;
- 
-     typedef mdds::mtv::custom_block_func1<sc::string_block> element_block_func;
- };
- 
--typedef mdds::multi_type_matrix<custom_string_trait> MatrixImplType;
-+typedef mdds::multi_type_matrix<matrix_trait> MatrixImplType;
- 
- namespace {
- 
-@@ -2304,6 +2302,7 @@ public:
-                 }
-             }
-             break;
-+            case mdds::mtm::element_integer:
-             case mdds::mtm::element_string:
-             case mdds::mtm::element_empty:
-             default:
-diff --git a/svl/source/misc/gridprinter.cxx b/svl/source/misc/gridprinter.cxx
-index 4044b3e..70e7439 100644
---- a/svl/source/misc/gridprinter.cxx
-+++ b/svl/source/misc/gridprinter.cxx
-@@ -26,12 +26,10 @@ const mdds::mtv::element_t element_type_string = mdds::mtv::element_type_user_st
- // String block
- typedef mdds::mtv::default_element_block<element_type_string, OUString> string_block;
- 
--struct custom_string_trait
-+struct matrix_trait
- {
--    typedef OUString string_type;
-     typedef string_block string_element_block;
--
--    static const mdds::mtv::element_t string_type_identifier = element_type_string;
-+    typedef mdds::mtv::ushort_element_block integer_element_block;
- 
-     typedef mdds::mtv::custom_block_func1<string_block> element_block_func;
- };
-@@ -48,7 +46,7 @@ MDDS_MTV_DEFINE_ELEMENT_CALLBACKS(OUString, svl::element_type_string, OUString()
- 
- namespace svl {
- 
--typedef mdds::multi_type_matrix<custom_string_trait> MatrixImplType;
-+typedef mdds::multi_type_matrix<matrix_trait> MatrixImplType;
- 
- struct GridPrinter::Impl
- {
--- 
-cgit v0.10.2
-
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libreoffice.git/commitdiff/2ceb9ed230804ad04df6cf2f051f7247a38a183d



More information about the pld-cvs-commit mailing list