From 669da5359c2e86501a62bfe8ef95b7f49b7a5e8d6ea155523eb8f8165b0b2111 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 4 May 2016 12:08:09 +0000 Subject: [PATCH 01/10] - Split out gtk3 again but this time install it on openSUSE and avoid it on SLE12 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=402 --- libreoffice.changes | 6 ++++++ libreoffice.spec | 29 +++++++++++++++++++++++++---- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/libreoffice.changes b/libreoffice.changes index 397a638..aaf06ce 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 4 12:07:44 UTC 2016 - tchvatal@suse.com + +- Split out gtk3 again but this time install it on openSUSE and + avoid it on SLE12 + ------------------------------------------------------------------- Tue Apr 26 09:46:38 UTC 2016 - andras.timar@collabora.com diff --git a/libreoffice.spec b/libreoffice.spec index a13aa07..c616665 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -670,12 +670,21 @@ Summary: GNOME Extensions for LibreOffice License: LGPL-3.0 Group: Productivity/Office/Suite Requires: %{name} = %{version} -# Merged back to gnome, was split on 5.0 series only -Provides: %{name}-gtk3 = %{version} -Obsoletes: %{name}-gtk3 < %{version} %description gnome -This package contains some GNOME extensions for LibreOffice. +This package contains some GNOME extensions and GTK2 interface for LibreOffice. + +%package gtk3 +Summary: Gtk3 interface for LibreOffice +License: LGPL-3.0 +Group: Productivity/Office/Suite +Requires: %{name}-gnome = %{version} +%if 0%{?suse_version} > 1315 || 0%{?is_opensuse} +Supplements: packageand(libreoffice:gnome-session) +%endif + +%description gtk3 +This package contains Gtk3 interface rendering option for LibreOffice. %package kde4 Summary: KDE4 Extensions for LibreOffice @@ -1276,6 +1285,12 @@ set +x install -m755 instdir/program/libsaxlo.so %{buildroot}/%{_libdir}/%{name}/program/libsaxlo.so echo "%{_libdir}/%{name}/program/libsaxlo.so" >>file-lists/common_list.txt +# Split out gtk3 interface to -gtk3 subpackage +%if %{with newmedia} +grep -v "%{_libdir}/libreoffice/program/libvclplug_gtk3lo.so" file-lists/gnome_list.txt > tmplist +mv tmplist file-lists/gnome_list.txt +%endif + ################ # update desktop files builddir=`pwd` @@ -1700,6 +1715,12 @@ test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null | %files -f file-lists/gnome_list.txt gnome %defattr(-,root,root) +%if %{with newmedia} +%files gtk3 +%defattr(-,root,root) +%{_libdir}/libreoffice/program/libvclplug_gtk3lo.so +%endif + %if %{with kdeintegration} %files -f file-lists/kde4_list.txt kde4 %defattr(-,root,root) From 842508d4c3e5d3ea98f03e44e3bd8c333249cd969b7157d8f896e783ec8e75e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 6 May 2016 13:37:46 +0000 Subject: [PATCH 02/10] - Version update to 5.1.3.2: few small tweaks for the .3.1 release OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=403 --- libreoffice-5.1.3.1.tar.xz | 3 --- libreoffice-5.1.3.2.tar.xz | 3 +++ libreoffice-help-5.1.3.1.tar.xz | 3 --- libreoffice-help-5.1.3.2.tar.xz | 3 +++ libreoffice-translations-5.1.3.1.tar.xz | 3 --- libreoffice-translations-5.1.3.2.tar.xz | 3 +++ libreoffice.changes | 5 +++++ libreoffice.spec | 2 +- 8 files changed, 15 insertions(+), 10 deletions(-) delete mode 100644 libreoffice-5.1.3.1.tar.xz create mode 100644 libreoffice-5.1.3.2.tar.xz delete mode 100644 libreoffice-help-5.1.3.1.tar.xz create mode 100644 libreoffice-help-5.1.3.2.tar.xz delete mode 100644 libreoffice-translations-5.1.3.1.tar.xz create mode 100644 libreoffice-translations-5.1.3.2.tar.xz diff --git a/libreoffice-5.1.3.1.tar.xz b/libreoffice-5.1.3.1.tar.xz deleted file mode 100644 index 4a29a78..0000000 --- a/libreoffice-5.1.3.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:079898348a8a3402d973d2ac990086530b8bbf8b0c5fa0573c8f377563fd6e16 -size 176074904 diff --git a/libreoffice-5.1.3.2.tar.xz b/libreoffice-5.1.3.2.tar.xz new file mode 100644 index 0000000..e045f46 --- /dev/null +++ b/libreoffice-5.1.3.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd5a1ca7c9ea100f811f8f12dc9bae29e71a6a65b127be6de5e14f223e3c07c4 +size 176087264 diff --git a/libreoffice-help-5.1.3.1.tar.xz b/libreoffice-help-5.1.3.1.tar.xz deleted file mode 100644 index 60640b9..0000000 --- a/libreoffice-help-5.1.3.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:568cb8371bf0f76186c3f7910f431d84605306e074ad58cadff1200f8c0f4ac7 -size 1904828 diff --git a/libreoffice-help-5.1.3.2.tar.xz b/libreoffice-help-5.1.3.2.tar.xz new file mode 100644 index 0000000..04c14b8 --- /dev/null +++ b/libreoffice-help-5.1.3.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f58def670340d67027d8cd52ef07669fbe7db05d1c6e490700dde8b53fe6093b +size 1904908 diff --git a/libreoffice-translations-5.1.3.1.tar.xz b/libreoffice-translations-5.1.3.1.tar.xz deleted file mode 100644 index 00005ae..0000000 --- a/libreoffice-translations-5.1.3.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:669ac36799ffdc8332588bd44f00059d0f31de1ade4632ceb1209330f581ddf6 -size 131716304 diff --git a/libreoffice-translations-5.1.3.2.tar.xz b/libreoffice-translations-5.1.3.2.tar.xz new file mode 100644 index 0000000..920eeb8 --- /dev/null +++ b/libreoffice-translations-5.1.3.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f12305ca6f5f87b26b99fc481db475eb0d733513032e20e170a99724c8932f0d +size 131729640 diff --git a/libreoffice.changes b/libreoffice.changes index aaf06ce..9d6c9ff 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 6 13:36:10 UTC 2016 - tchvatal@suse.com + +- Version update to 5.1.3.2: few small tweaks for the .3.1 release + ------------------------------------------------------------------- Wed May 4 12:07:44 UTC 2016 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index c616665..88fe899 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -64,7 +64,7 @@ Requires: python-importlib %endif # This is used due to the need for beta releases Name: libreoffice -Version: 5.1.3.1 +Version: 5.1.3.2 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 From d352b6fafe4ec66f794c2d9250f9d50a5e11ac422ef4a93d785c00ae0a235e71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 9 May 2016 09:28:08 +0000 Subject: [PATCH 03/10] - Refresh patches: * 0001-liborcus-0.11.patch OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=404 --- 0001-liborcus-0.11.patch | 108 +++++++++++++++++++-------------------- libreoffice.changes | 2 + 2 files changed, 56 insertions(+), 54 deletions(-) diff --git a/0001-liborcus-0.11.patch b/0001-liborcus-0.11.patch index e12a9e2..6de0444 100644 --- a/0001-liborcus-0.11.patch +++ b/0001-liborcus-0.11.patch @@ -10,10 +10,10 @@ Reviewed-on: https://gerrit.libreoffice.org/22943 Tested-by: Jenkins Reviewed-by: Kohei Yoshida -Index: libreoffice-5.1.2.2/RepositoryExternal.mk +Index: libreoffice-5.1.3.2/RepositoryExternal.mk =================================================================== ---- libreoffice-5.1.2.2.orig/RepositoryExternal.mk -+++ libreoffice-5.1.2.2/RepositoryExternal.mk +--- libreoffice-5.1.3.2.orig/RepositoryExternal.mk ++++ libreoffice-5.1.3.2/RepositoryExternal.mk @@ -786,6 +786,21 @@ $(call gb_LinkTarget_set_include,$(1),\ endef @@ -54,10 +54,10 @@ Index: libreoffice-5.1.2.2/RepositoryExternal.mk ) endef -Index: libreoffice-5.1.2.2/configure.ac +Index: libreoffice-5.1.3.2/configure.ac =================================================================== ---- libreoffice-5.1.2.2.orig/configure.ac -+++ libreoffice-5.1.2.2/configure.ac +--- libreoffice-5.1.3.2.orig/configure.ac ++++ libreoffice-5.1.3.2/configure.ac @@ -9143,7 +9143,7 @@ if test -z "$enable_orcus" -o "$enable_o ENABLE_ORCUS="TRUE" AC_DEFINE(ENABLE_ORCUS) @@ -67,14 +67,14 @@ Index: libreoffice-5.1.2.2/configure.ac if test "$with_system_orcus" != "yes"; then if test "$SYSTEM_BOOST" = "TRUE"; then # =========================================================== -Index: libreoffice-5.1.2.2/download.lst +Index: libreoffice-5.1.3.2/download.lst =================================================================== ---- libreoffice-5.1.2.2.orig/download.lst -+++ libreoffice-5.1.2.2/download.lst -@@ -112,8 +112,8 @@ export OPENCOLLADA_TARBALL := OpenCOLLAD +--- libreoffice-5.1.3.2.orig/download.lst ++++ libreoffice-5.1.3.2/download.lst +@@ -113,8 +113,8 @@ export OPENCOLLADA_TARBALL := OpenCOLLAD export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz - export OPENSSL_MD5SUM := f3c710c045cdee5fd114feb69feba7aa - export OPENSSL_TARBALL := openssl-1.0.2g.tar.gz + 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 @@ -82,10 +82,10 @@ Index: libreoffice-5.1.2.2/download.lst 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 -Index: libreoffice-5.1.2.2/external/boost/Module_boost.mk +Index: libreoffice-5.1.3.2/external/boost/Module_boost.mk =================================================================== ---- libreoffice-5.1.2.2.orig/external/boost/Module_boost.mk -+++ libreoffice-5.1.2.2/external/boost/Module_boost.mk +--- libreoffice-5.1.3.2.orig/external/boost/Module_boost.mk ++++ libreoffice-5.1.3.2/external/boost/Module_boost.mk @@ -11,6 +11,7 @@ $(eval $(call gb_Module_Module,boost)) $(eval $(call gb_Module_add_targets,boost,\ @@ -94,10 +94,10 @@ Index: libreoffice-5.1.2.2/external/boost/Module_boost.mk StaticLibrary_boost_system \ StaticLibrary_boost_iostreams \ UnpackedTarball_boost \ -Index: libreoffice-5.1.2.2/external/boost/StaticLibrary_boost_filesystem.mk +Index: libreoffice-5.1.3.2/external/boost/StaticLibrary_boost_filesystem.mk =================================================================== --- /dev/null -+++ libreoffice-5.1.2.2/external/boost/StaticLibrary_boost_filesystem.mk ++++ libreoffice-5.1.3.2/external/boost/StaticLibrary_boost_filesystem.mk @@ -0,0 +1,36 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# @@ -135,10 +135,10 @@ Index: libreoffice-5.1.2.2/external/boost/StaticLibrary_boost_filesystem.mk +)) + +# vim: set noet sw=4 ts=4: -Index: libreoffice-5.1.2.2/external/liborcus/0001-Fix-for-OSX-build-inside-LibreOffice.patch +Index: libreoffice-5.1.3.2/external/liborcus/0001-Fix-for-OSX-build-inside-LibreOffice.patch =================================================================== --- /dev/null -+++ libreoffice-5.1.2.2/external/liborcus/0001-Fix-for-OSX-build-inside-LibreOffice.patch ++++ libreoffice-5.1.3.2/external/liborcus/0001-Fix-for-OSX-build-inside-LibreOffice.patch @@ -0,0 +1,1175 @@ +From a1df2d984d527931c6cbbe6547856283bdbf6a9b Mon Sep 17 00:00:00 2001 +From: Kohei Yoshida @@ -1315,10 +1315,10 @@ Index: libreoffice-5.1.2.2/external/liborcus/0001-Fix-for-OSX-build-inside-Libre +-- +2.4.5 + -Index: libreoffice-5.1.2.2/external/liborcus/0001-Get-it-to-build-on-Windows.patch +Index: libreoffice-5.1.3.2/external/liborcus/0001-Get-it-to-build-on-Windows.patch =================================================================== --- /dev/null -+++ libreoffice-5.1.2.2/external/liborcus/0001-Get-it-to-build-on-Windows.patch ++++ libreoffice-5.1.3.2/external/liborcus/0001-Get-it-to-build-on-Windows.patch @@ -0,0 +1,212 @@ +From c5d7282214727bcc28b6ec7e2b8016b40872cd3b Mon Sep 17 00:00:00 2001 +From: Kohei Yoshida @@ -1532,10 +1532,10 @@ Index: libreoffice-5.1.2.2/external/liborcus/0001-Get-it-to-build-on-Windows.pat +-- +1.8.1.msysgit.1 + -Index: libreoffice-5.1.2.2/external/liborcus/ExternalPackage_liborcus.mk +Index: libreoffice-5.1.3.2/external/liborcus/ExternalPackage_liborcus.mk =================================================================== ---- libreoffice-5.1.2.2.orig/external/liborcus/ExternalPackage_liborcus.mk -+++ libreoffice-5.1.2.2/external/liborcus/ExternalPackage_liborcus.mk +--- libreoffice-5.1.3.2.orig/external/liborcus/ExternalPackage_liborcus.mk ++++ libreoffice-5.1.3.2/external/liborcus/ExternalPackage_liborcus.mk @@ -12,11 +12,11 @@ $(eval $(call gb_ExternalPackage_Externa $(eval $(call gb_ExternalPackage_use_external_project,liborcus,liborcus)) @@ -1552,10 +1552,10 @@ Index: libreoffice-5.1.2.2/external/liborcus/ExternalPackage_liborcus.mk endif # vim: set noet sw=4 ts=4: -Index: libreoffice-5.1.2.2/external/liborcus/ExternalProject_liborcus.mk +Index: libreoffice-5.1.3.2/external/liborcus/ExternalProject_liborcus.mk =================================================================== ---- libreoffice-5.1.2.2.orig/external/liborcus/ExternalProject_liborcus.mk -+++ libreoffice-5.1.2.2/external/liborcus/ExternalProject_liborcus.mk +--- libreoffice-5.1.3.2.orig/external/liborcus/ExternalProject_liborcus.mk ++++ libreoffice-5.1.3.2/external/liborcus/ExternalProject_liborcus.mk @@ -13,6 +13,7 @@ $(eval $(call gb_ExternalProject_use_aut $(eval $(call gb_ExternalProject_use_externals,liborcus, \ @@ -1607,10 +1607,10 @@ Index: libreoffice-5.1.2.2/external/liborcus/ExternalProject_liborcus.mk ) \ ) -Index: libreoffice-5.1.2.2/external/liborcus/Library_orcus-parser.mk +Index: libreoffice-5.1.3.2/external/liborcus/Library_orcus-parser.mk =================================================================== ---- libreoffice-5.1.2.2.orig/external/liborcus/Library_orcus-parser.mk -+++ libreoffice-5.1.2.2/external/liborcus/Library_orcus-parser.mk +--- libreoffice-5.1.3.2.orig/external/liborcus/Library_orcus-parser.mk ++++ libreoffice-5.1.3.2/external/liborcus/Library_orcus-parser.mk @@ -39,6 +39,8 @@ $(eval $(call gb_Library_add_generated_e UnpackedTarball/liborcus/src/parser/css_types \ UnpackedTarball/liborcus/src/parser/csv_parser_base \ @@ -1628,10 +1628,10 @@ Index: libreoffice-5.1.2.2/external/liborcus/Library_orcus-parser.mk UnpackedTarball/liborcus/src/parser/zip_archive \ UnpackedTarball/liborcus/src/parser/zip_archive_stream \ )) -Index: libreoffice-5.1.2.2/external/liborcus/Library_orcus.mk +Index: libreoffice-5.1.3.2/external/liborcus/Library_orcus.mk =================================================================== ---- libreoffice-5.1.2.2.orig/external/liborcus/Library_orcus.mk -+++ libreoffice-5.1.2.2/external/liborcus/Library_orcus.mk +--- libreoffice-5.1.3.2.orig/external/liborcus/Library_orcus.mk ++++ libreoffice-5.1.3.2/external/liborcus/Library_orcus.mk @@ -13,6 +13,7 @@ $(eval $(call gb_Library_use_unpacked,or $(eval $(call gb_Library_use_externals,orcus,\ @@ -1694,10 +1694,10 @@ Index: libreoffice-5.1.2.2/external/liborcus/Library_orcus.mk )) # vim: set noet sw=4 ts=4: -Index: libreoffice-5.1.2.2/external/liborcus/UnpackedTarball_liborcus.mk +Index: libreoffice-5.1.3.2/external/liborcus/UnpackedTarball_liborcus.mk =================================================================== ---- libreoffice-5.1.2.2.orig/external/liborcus/UnpackedTarball_liborcus.mk -+++ libreoffice-5.1.2.2/external/liborcus/UnpackedTarball_liborcus.mk +--- libreoffice-5.1.3.2.orig/external/liborcus/UnpackedTarball_liborcus.mk ++++ libreoffice-5.1.3.2/external/liborcus/UnpackedTarball_liborcus.mk @@ -16,8 +16,15 @@ $(eval $(call gb_UnpackedTarball_set_pat $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\ external/liborcus/0001-workaround-a-linking-problem-on-windows.patch \ @@ -1716,9 +1716,9 @@ Index: libreoffice-5.1.2.2/external/liborcus/UnpackedTarball_liborcus.mk + + # vim: set noet sw=4 ts=4: -Index: libreoffice-5.1.2.2/external/liborcus/fix-crash-ooo55043-1.patch.0 +Index: libreoffice-5.1.3.2/external/liborcus/fix-crash-ooo55043-1.patch.0 =================================================================== ---- libreoffice-5.1.2.2.orig/external/liborcus/fix-crash-ooo55043-1.patch.0 +--- libreoffice-5.1.3.2.orig/external/liborcus/fix-crash-ooo55043-1.patch.0 +++ /dev/null @@ -1,17 +0,0 @@ ---- src/parser/zip_archive_stream.cpp @@ -1738,9 +1738,9 @@ Index: libreoffice-5.1.2.2/external/liborcus/fix-crash-ooo55043-1.patch.0 - if (length_available < length) - throw zip_error("There is not enough stream left to fill requested length."); - -Index: libreoffice-5.1.2.2/external/liborcus/unusedheader.patch.0 +Index: libreoffice-5.1.3.2/external/liborcus/unusedheader.patch.0 =================================================================== ---- libreoffice-5.1.2.2.orig/external/liborcus/unusedheader.patch.0 +--- libreoffice-5.1.3.2.orig/external/liborcus/unusedheader.patch.0 +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/parser/pstring.cpp.orig 2015-12-02 14:38:44.658744408 +0000 @@ -1754,10 +1754,10 @@ Index: libreoffice-5.1.2.2/external/liborcus/unusedheader.patch.0 - using namespace std; - - namespace orcus { -Index: libreoffice-5.1.2.2/external/liborcus/windows-constants-hack.patch +Index: libreoffice-5.1.3.2/external/liborcus/windows-constants-hack.patch =================================================================== --- /dev/null -+++ libreoffice-5.1.2.2/external/liborcus/windows-constants-hack.patch ++++ libreoffice-5.1.3.2/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 @@ -1774,10 +1774,10 @@ Index: libreoffice-5.1.2.2/external/liborcus/windows-constants-hack.patch + + namespace orcus { + -Index: libreoffice-5.1.2.2/sc/Library_scfilt.mk +Index: libreoffice-5.1.3.2/sc/Library_scfilt.mk =================================================================== ---- libreoffice-5.1.2.2.orig/sc/Library_scfilt.mk -+++ libreoffice-5.1.2.2/sc/Library_scfilt.mk +--- libreoffice-5.1.3.2.orig/sc/Library_scfilt.mk ++++ libreoffice-5.1.3.2/sc/Library_scfilt.mk @@ -227,6 +227,7 @@ ifeq ($(ENABLE_ORCUS),TRUE) $(eval $(call gb_Library_use_externals,scfilt,\ orcus \ @@ -1786,10 +1786,10 @@ Index: libreoffice-5.1.2.2/sc/Library_scfilt.mk boost_system \ boost_iostreams \ zlib \ -Index: libreoffice-5.1.2.2/sc/source/filter/inc/orcusinterface.hxx +Index: libreoffice-5.1.3.2/sc/source/filter/inc/orcusinterface.hxx =================================================================== ---- libreoffice-5.1.2.2.orig/sc/source/filter/inc/orcusinterface.hxx -+++ libreoffice-5.1.2.2/sc/source/filter/inc/orcusinterface.hxx +--- libreoffice-5.1.3.2.orig/sc/source/filter/inc/orcusinterface.hxx ++++ libreoffice-5.1.3.2/sc/source/filter/inc/orcusinterface.hxx @@ -381,6 +381,7 @@ public: virtual void set_border_count(size_t n) override; @@ -1806,10 +1806,10 @@ Index: libreoffice-5.1.2.2/sc/source/filter/inc/orcusinterface.hxx virtual size_t commit_cell_style() override; }; -Index: libreoffice-5.1.2.2/sc/source/filter/orcus/filterdetect.cxx +Index: libreoffice-5.1.3.2/sc/source/filter/orcus/filterdetect.cxx =================================================================== ---- libreoffice-5.1.2.2.orig/sc/source/filter/orcus/filterdetect.cxx -+++ libreoffice-5.1.2.2/sc/source/filter/orcus/filterdetect.cxx +--- libreoffice-5.1.3.2.orig/sc/source/filter/orcus/filterdetect.cxx ++++ libreoffice-5.1.3.2/sc/source/filter/orcus/filterdetect.cxx @@ -93,7 +93,7 @@ OUString OrcusFormatDetect::detect(css:: } @@ -1819,10 +1819,10 @@ Index: libreoffice-5.1.2.2/sc/source/filter/orcus/filterdetect.cxx return OUString("Gnumeric XML"); return OUString(); -Index: libreoffice-5.1.2.2/sc/source/filter/orcus/interface.cxx +Index: libreoffice-5.1.3.2/sc/source/filter/orcus/interface.cxx =================================================================== ---- libreoffice-5.1.2.2.orig/sc/source/filter/orcus/interface.cxx -+++ libreoffice-5.1.2.2/sc/source/filter/orcus/interface.cxx +--- libreoffice-5.1.3.2.orig/sc/source/filter/orcus/interface.cxx ++++ libreoffice-5.1.3.2/sc/source/filter/orcus/interface.cxx @@ -55,7 +55,7 @@ void ScOrcusGlobalSettings::set_default_ orcus::spreadsheet::formula_grammar_t ScOrcusGlobalSettings::get_default_formula_grammar() const diff --git a/libreoffice.changes b/libreoffice.changes index 9d6c9ff..ec60755 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -2,6 +2,8 @@ Fri May 6 13:36:10 UTC 2016 - tchvatal@suse.com - Version update to 5.1.3.2: few small tweaks for the .3.1 release +- Refresh patches: + * 0001-liborcus-0.11.patch ------------------------------------------------------------------- Wed May 4 12:07:44 UTC 2016 - tchvatal@suse.com From a720cfc297eba865f90557da7030dcefd76bc06db4548903256d2cbdd0fbbc56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 10 May 2016 15:10:50 +0000 Subject: [PATCH 04/10] Accepting request 394568 from LibreOffice:5.1 - fix bnc#939998 - LO-L3: PPT file shows wrong titles * bnc939998.patch - fix bnc#945443 - LO-L3: Undo ignores vertical alignment * bnc945443.patch - fix bnc#945445 - LO-L3: Undo does not revert changes of table separation lines * bnc945445.patch OBS-URL: https://build.opensuse.org/request/show/394568 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=405 --- bnc939998.patch | 96 +++++++++++++++ bnc945443.patch | 187 ++++++++++++++++++++++++++++++ bnc945445.patch | 276 ++++++++++++++++++++++++++++++++++++++++++++ libreoffice.changes | 10 ++ libreoffice.spec | 9 ++ 5 files changed, 578 insertions(+) create mode 100644 bnc939998.patch create mode 100644 bnc945443.patch create mode 100644 bnc945445.patch diff --git a/bnc939998.patch b/bnc939998.patch new file mode 100644 index 0000000..5acc029 --- /dev/null +++ b/bnc939998.patch @@ -0,0 +1,96 @@ +From 940b21a87cffffca0985c33e9ebb78ddf3aa0c3b Mon Sep 17 00:00:00 2001 +From: Mike Kaganski +Date: Wed, 13 Apr 2016 20:07:52 +1000 +Subject: [PATCH] tdf#93124: Fix incorrect text fit in imported PPT - take two + +This patch just fixes incorrect decision when the block alignment must +be applied. + +diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx +index 437207f..7ac251c 100644 +--- a/filter/source/msfilter/svdfppt.cxx ++++ b/filter/source/msfilter/svdfppt.cxx +@@ -893,7 +893,6 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi + eTHA = SDRTEXTHORZADJUST_LEFT; + break; + } +- // if there is a 100% use of following attributes, the textbox can been aligned also in vertical direction + switch ( eTextAnchor ) + { + case mso_anchorTopCentered : +@@ -903,20 +902,20 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi + case mso_anchorBottomCenteredBaseline: + { + // check if it is sensible to use the centered alignment +- sal_uInt32 nMask = PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_LEFT | PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_RIGHT; +- if ( ( nTextFlags & nMask ) != nMask ) // if the textobject has left and also right aligned pararagraphs +- eTVA = SDRTEXTVERTADJUST_CENTER; // the text has to be displayed using the full width; +- } +- break; +- +- default : +- { +- if ( nTextFlags == PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_LEFT ) +- eTVA = SDRTEXTVERTADJUST_TOP; +- else if ( nTextFlags == PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_RIGHT ) +- eTVA = SDRTEXTVERTADJUST_BOTTOM; ++ const sal_uInt32 nMask = PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_LEFT | PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_CENTER | PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_RIGHT | PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_BLOCK; ++ switch (nTextFlags & nMask) ++ { ++ case PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_LEFT: ++ case PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_CENTER: ++ case PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_RIGHT: ++ case PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_BLOCK: ++ eTVA = SDRTEXTVERTADJUST_CENTER; // If the textobject has only one type of alignment, then the text has not to be displayed using the full width; ++ break; ++ } ++ break; + } +- break; ++ default: ++ break; + } + nMinFrameWidth = rTextRect.GetWidth() - ( nTextLeft + nTextRight ); + } +@@ -949,7 +948,6 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi + eTVA = SDRTEXTVERTADJUST_BOTTOM; + break; + } +- // if there is a 100% usage of following attributes, the textbox can be aligned also in horizontal direction + switch ( eTextAnchor ) + { + case mso_anchorTopCentered : +@@ -959,20 +957,20 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi + case mso_anchorBottomCenteredBaseline: + { + // check if it is sensible to use the centered alignment +- sal_uInt32 nMask = PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_LEFT | PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_RIGHT; +- if ( ( nTextFlags & nMask ) != nMask ) // if the textobject has left and also right aligned pararagraphs +- eTHA = SDRTEXTHORZADJUST_CENTER; // the text has to be displayed using the full width; +- } +- break; +- +- default : +- { +- if ( nTextFlags == PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_LEFT ) +- eTHA = SDRTEXTHORZADJUST_LEFT; +- else if ( nTextFlags == PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_RIGHT ) +- eTHA = SDRTEXTHORZADJUST_RIGHT; ++ const sal_uInt32 nMask = PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_LEFT | PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_CENTER | PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_RIGHT | PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_BLOCK; ++ switch (nTextFlags & nMask) ++ { ++ case PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_LEFT: ++ case PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_CENTER: ++ case PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_RIGHT: ++ case PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_BLOCK: ++ eTHA = SDRTEXTHORZADJUST_CENTER; // If the textobject has only one type of alignment, then the text has not to be displayed using the full width; ++ break; ++ } ++ break; + } +- break; ++ default: ++ break; + } + nMinFrameHeight = rTextRect.GetHeight() - ( nTextTop + nTextBottom ); + } diff --git a/bnc945443.patch b/bnc945443.patch new file mode 100644 index 0000000..c2ad247 --- /dev/null +++ b/bnc945443.patch @@ -0,0 +1,187 @@ +From 64b2f209b72c5a5662afcb0ac1706b882e0e059b Mon Sep 17 00:00:00 2001 +From: Miklos Vajna +Date: Tue, 19 Apr 2016 17:38:14 +0200 +Subject: [PATCH] tdf#99396 SvxTableController::SetVertical: implement undo + support + +All the table and cell objects know how to undo this change, what was +missing is the begin/end undo calls and the broadcast of the cell +format change. + +(cherry picked from commits 3057b5cdb989d44613518900b25ebad8b7c600a2, +d60d70d92cec7bbc471f8f0c653d443282227d34, +6819992113947e7a6272bf750fee712c2df41905 and +100eb15b4d8529d7a11d98a28742f31f0f792fa1) + +Conflicts: + sd/qa/unit/misc-tests.cxx + +Change-Id: I3dfd203faf5c579da2937fedab5647129a8e903a +Reviewed-on: https://gerrit.libreoffice.org/24276 +Tested-by: Jenkins +Reviewed-by: Andras Timar +--- + include/svx/svdotable.hxx | 4 ++ + sd/inc/drawdoc.hxx | 2 +- + sd/qa/unit/data/tdf99396.odp | Bin 0 -> 10956 bytes + sd/qa/unit/misc-tests.cxx | 104 +++++++++++++++++++++++++++++++++ + sd/source/ui/table/TableDesignPane.cxx | 10 +++- + svx/source/table/cell.cxx | 5 ++ + svx/source/table/svdotable.cxx | 12 ++++ + svx/source/table/tablecontroller.cxx | 18 +++++- + 8 files changed, 152 insertions(+), 3 deletions(-) + create mode 100644 sd/qa/unit/data/tdf99396.odp + +diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx +index 78a7e53c..f70d768 100644 +--- a/include/svx/svdotable.hxx ++++ b/include/svx/svdotable.hxx +@@ -31,6 +31,7 @@ + + class SvStream; + class SfxStyleSheet; ++class SdrUndoAction; + + namespace sdr { namespace contact { + class ViewContactOfTableObj; +@@ -257,6 +258,9 @@ public: + + css::text::WritingMode GetWritingMode() const; + ++ /// Add an undo action that should be on the undo stack after ending text edit. ++ void AddUndo(SdrUndoAction* pUndo); ++ + virtual void onEditOutlinerStatusEvent( EditStatus* pEditStatus ) override; + + +diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx +index e2ff20c..ee8a876 100644 +--- a/sd/inc/drawdoc.hxx ++++ b/sd/inc/drawdoc.hxx +@@ -571,7 +571,7 @@ public: + languages set at this document */ + SAL_DLLPRIVATE void getDefaultFonts( vcl::Font& rLatinFont, vcl::Font& rCJKFont, vcl::Font& rCTLFont ); + +- SAL_DLLPRIVATE sd::UndoManager* GetUndoManager() const; ++ sd::UndoManager* GetUndoManager() const; + + /** converts the given western font height to a corresponding ctl font height, depending on the system language */ + SAL_DLLPRIVATE static sal_uInt32 convertFontHeightToCTL( sal_uInt32 nWesternFontHeight ); +diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx +index 2bd52b5..4ae2e1d 100644 +--- a/sd/source/ui/table/TableDesignPane.cxx ++++ b/sd/source/ui/table/TableDesignPane.cxx +@@ -806,7 +806,15 @@ short TableDesignDialog::Execute() + + VclPtr createTableDesignPanel( vcl::Window* pParent, ViewShellBase& rBase ) + { +- return VclPtr::Create( pParent, rBase ); ++ VclPtr pRet = nullptr; ++ try ++ { ++ pRet = VclPtr::Create( pParent, rBase ); ++ } ++ catch (const uno::Exception&) ++ { ++ } ++ return pRet; + } + + void showTableDesignDialog( vcl::Window* pParent, ViewShellBase& rBase ) +diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx +index b2d1604..c783cb1 100644 +--- a/svx/source/table/cell.cxx ++++ b/svx/source/table/cell.cxx +@@ -799,6 +799,11 @@ void Cell::AddUndo() + { + CellRef xCell( this ); + GetModel()->AddUndo( new CellUndo( &rObj, xCell ) ); ++ ++ // Undo action for the after-text-edit-ended stack. ++ SdrTableObj* pTableObj = dynamic_cast(&rObj); ++ if (pTableObj && pTableObj->IsTextEditActive()) ++ pTableObj->AddUndo(new CellUndo(pTableObj, xCell)); + } + } + +diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx +index 15bbb7f..5b979fe 100644 +--- a/svx/source/table/svdotable.cxx ++++ b/svx/source/table/svdotable.cxx +@@ -205,6 +205,7 @@ public: + CellPos maEditPos; + TableStyleSettings maTableStyle; + Reference< XIndexAccess > mxTableStyle; ++ std::vector> maUndos; + + void SetModel(SdrModel* pOldModel, SdrModel* pNewModel); + +@@ -1860,7 +1861,14 @@ void SdrTableObj::EndTextEdit(SdrOutliner& rOutl) + if(rOutl.IsModified()) + { + if( GetModel() && GetModel()->IsUndoEnabled() ) ++ { ++ // These actions should be on the undo stack after text edit. ++ for (std::unique_ptr& pAction : mpImpl->maUndos) ++ GetModel()->AddUndo(pAction.release()); ++ mpImpl->maUndos.clear(); ++ + GetModel()->AddUndo( GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*this) ); ++ } + + OutlinerParaObject* pNewText = nullptr; + Paragraph* p1stPara = rOutl.GetParagraph( 0 ); +@@ -2085,6 +2093,10 @@ WritingMode SdrTableObj::GetWritingMode() const + return eWritingMode; + } + ++void SdrTableObj::AddUndo(SdrUndoAction* pUndo) ++{ ++ mpImpl->maUndos.push_back(std::unique_ptr(pUndo)); ++} + + + // gets base transformation and rectangle of object. If it's an SdrPathObj it fills the PolyPolygon +diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx +index 0238e85..beb75e0 100644 +--- a/svx/source/table/tablecontroller.cxx ++++ b/svx/source/table/tablecontroller.cxx +@@ -1177,6 +1177,13 @@ void SvxTableController::SetVertical( sal_uInt16 nSId ) + { + TableModelNotifyGuard aGuard( mxTable.get() ); + ++ bool bUndo = mpModel && mpModel->IsUndoEnabled(); ++ if (bUndo) ++ { ++ mpModel->BegUndo(ImpGetResStr(STR_TABLE_NUMFORMAT)); ++ mpModel->AddUndo(mpModel->GetSdrUndoFactory().CreateUndoAttrObject(*pTableObj)); ++ } ++ + CellPos aStart, aEnd; + getSelectedCells( aStart, aEnd ); + +@@ -1203,11 +1210,20 @@ void SvxTableController::SetVertical( sal_uInt16 nSId ) + { + CellRef xCell( dynamic_cast< Cell* >( mxTable->getCellByPosition( nCol, nRow ).get() ) ); + if( xCell.is() ) +- xCell->SetMergedItem(aItem); ++ { ++ if (bUndo) ++ xCell->AddUndo(); ++ SfxItemSet aSet(xCell->GetItemSet()); ++ aSet.Put(aItem); ++ xCell->SetMergedItemSetAndBroadcast(aSet, /*bClearAllItems=*/false); ++ } + } + } + + UpdateTableShape(); ++ ++ if (bUndo) ++ mpModel->EndUndo(); + } + } + +-- +2.6.6 + diff --git a/bnc945445.patch b/bnc945445.patch new file mode 100644 index 0000000..197089a --- /dev/null +++ b/bnc945445.patch @@ -0,0 +1,276 @@ +From 5c32e526d7cc1f623ca1b60a16537efa5740dd6c Mon Sep 17 00:00:00 2001 +From: Miklos Vajna +Date: Mon, 25 Apr 2016 10:57:49 +0200 +Subject: [PATCH] tdf#99452 svx: fix undo of table row edge drag + +The problem as seen by the user: if you have a table of 2 rows and 1 column, +and the separator line is dragged upwards by the mouse, then undo doesn't +restore the original situation. + +Two items are created on the undo stack: sd::UndoGeoObject and +sdr::table::TableRowUndo. Let's say the table height is 8000 mm100 and the two +cell heights are 4000 and 4000. If the user resizes the first cell, so that its +height is 2000, then the new table height will be 6000. The problem is that +when undo is executed, first sd::UndoGeoObject resizes the table, distributing +the newly available 2000 between the existing rows, and then +sdr::table::TableRowUndo sets the row height of the first row: the height of +the second cell will be larger than expected. Fix the problem by not doing a +relayout during sd::UndoGeoObject, but doing a relayout after +sdr::table::TableRowUndo in this case. + +This is done by: + +1) Adding a new SdrDragStat::mbEndDragChangesLayout, so that +SdrTableObj::applySpecialDrag() can inform SdrDragObjOwn::EndSdrDrag() that +TableRowUndo will do the layout instead of UndoGeoObject. (This is done only in +case a row edge is dragged, as otherwise it's not guaranteed that a +TableRowUndo will follow the UndoGeoObject on the undo stack.) + +2) Adding a new SdrUndoGeoObj::mbSkipChangeLayout, so that +SdrTableObj::applySpecialDrag() can let SdrUndoGeoObj::Undo() not do the +layout. + +3) Adding a sdr::table::SdrTableObjImpl::mbSkipChangeLayout, so that +SdrUndoGeoObj::Undo() can let SdrTableObj::NbcSetLogicRect() not do the layout. + +4) Marking the table model as modified in TableRowUndo::setData(), so it does +the layout at the end of the undo group. + +(cherry picked from commits cafc53f8b4c08443524b1da6f4918d49afd45bb5, +8d1fa417bc49a9e9eee923e3ce6a37d7b0f056f1 and +758e6f39d96237881198818e3bac432012be61d8) + +Conflicts: + sd/qa/unit/tiledrendering/tiledrendering.cxx + svx/source/table/svdotable.cxx + +Change-Id: I8adde3cdad5741e6fcb420e333ce336e18c77cf1 +Reviewed-on: https://gerrit.libreoffice.org/24392 +Tested-by: Jenkins +Reviewed-by: Andras Timar +--- + include/svx/svddrag.hxx | 4 +++ + include/svx/svdotable.hxx | 3 ++ + include/svx/svdundo.hxx | 3 ++ + sd/qa/unit/tiledrendering/data/table.odp | Bin 0 -> 10559 bytes + sd/qa/unit/tiledrendering/tiledrendering.cxx | 52 +++++++++++++++++++++++++++ + svx/source/svdraw/svddrag.cxx | 1 + + svx/source/svdraw/svddrgmt.cxx | 6 ++++ + svx/source/svdraw/svdundo.cxx | 7 ++++ + svx/source/table/svdotable.cxx | 14 +++++++- + svx/source/table/tablerow.cxx | 4 +++ + svx/source/table/tablerow.hxx | 2 ++ + svx/source/table/tableundo.cxx | 3 ++ + 12 files changed, 98 insertions(+), 1 deletion(-) + create mode 100644 sd/qa/unit/tiledrendering/data/table.odp + +diff --git a/include/svx/svddrag.hxx b/include/svx/svddrag.hxx +index ac2a978..aa4a03e 100644 +--- a/include/svx/svddrag.hxx ++++ b/include/svx/svddrag.hxx +@@ -55,6 +55,8 @@ protected: + + bool bEndDragChangesAttributes; + bool bEndDragChangesGeoAndAttributes; ++ /// Table row drag: table will re-layout itself later. ++ bool mbEndDragChangesLayout; + bool bMouseIsUp; + + bool bShown; // Xor visible? +@@ -133,6 +135,8 @@ public: + void SetEndDragChangesAttributes(bool bOn) { bEndDragChangesAttributes=bOn; } + bool IsEndDragChangesGeoAndAttributes() const { return bEndDragChangesGeoAndAttributes; } + void SetEndDragChangesGeoAndAttributes(bool bOn) { bEndDragChangesGeoAndAttributes=bOn; } ++ bool IsEndDragChangesLayout() const { return mbEndDragChangesLayout; } ++ void SetEndDragChangesLayout(bool bOn) { mbEndDragChangesLayout=bOn; } + + // Is set by the view and can be evaluated by Obj + bool IsMouseDown() const { return !bMouseIsUp; } +diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx +index f70d768..408f0b8 100644 +--- a/include/svx/svdotable.hxx ++++ b/include/svx/svdotable.hxx +@@ -261,6 +261,9 @@ public: + /// Add an undo action that should be on the undo stack after ending text edit. + void AddUndo(SdrUndoAction* pUndo); + ++ /// Next time layouting would be done, skip it (to layout at the end of multiple actions). ++ void SetSkipChangeLayout(bool bSkipChangeLayout); ++ + virtual void onEditOutlinerStatusEvent( EditStatus* pEditStatus ) override; + + +diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx +index 966e408..7d4973f 100644 +--- a/include/svx/svdundo.hxx ++++ b/include/svx/svdundo.hxx +@@ -213,6 +213,8 @@ protected: + SdrObjGeoData* pRedoGeo; + // If we have a group object: + SdrUndoGroup* pUndoGroup; ++ /// If we have a table object, should its layout change? ++ bool mbSkipChangeLayout; + + public: + SdrUndoGeoObj(SdrObject& rNewObj); +@@ -222,6 +224,7 @@ public: + virtual void Redo() override; + + virtual OUString GetComment() const override; ++ void SetSkipChangeLayout(bool bOn) { mbSkipChangeLayout=bOn; } + }; + + /** +diff --git a/svx/source/svdraw/svddrag.cxx b/svx/source/svdraw/svddrag.cxx +index 91cd2d1..2f44f47 100644 +--- a/svx/source/svdraw/svddrag.cxx ++++ b/svx/source/svdraw/svddrag.cxx +@@ -50,6 +50,7 @@ void SdrDragStat::Reset() + pDragMethod=nullptr; + bEndDragChangesAttributes=false; + bEndDragChangesGeoAndAttributes=false; ++ mbEndDragChangesLayout=false; + bMouseIsUp=false; + Clear(true); + aActionRect=Rectangle(); +diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx +index bff9a6c..9d70c20 100644 +--- a/svx/source/svdraw/svddrgmt.cxx ++++ b/svx/source/svdraw/svddrgmt.cxx +@@ -1423,6 +1423,12 @@ bool SdrDragObjOwn::EndSdrDrag(bool /*bCopy*/) + } + + bRet = pObj->applySpecialDrag(DragStat()); ++ if (DragStat().IsEndDragChangesLayout()) ++ { ++ auto pGeoUndo = dynamic_cast(pUndo); ++ if (pGeoUndo) ++ pGeoUndo->SetSkipChangeLayout(true); ++ } + + if(bRet) + { +diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx +index b3cf6ae..9567d9e 100644 +--- a/svx/source/svdraw/svdundo.cxx ++++ b/svx/source/svdraw/svdundo.cxx +@@ -603,6 +603,7 @@ SdrUndoGeoObj::SdrUndoGeoObj(SdrObject& rNewObj) + , pUndoGeo(nullptr) + , pRedoGeo(nullptr) + , pUndoGroup(nullptr) ++ , mbSkipChangeLayout(false) + { + SdrObjList* pOL=rNewObj.GetSubList(); + if (pOL!=nullptr && pOL->GetObjCount() && dynamic_cast( &rNewObj) == nullptr) +@@ -645,7 +646,13 @@ void SdrUndoGeoObj::Undo() + { + delete pRedoGeo; + pRedoGeo=pObj->GetGeoData(); ++ ++ auto pTableObj = dynamic_cast(pObj); ++ if (pTableObj && mbSkipChangeLayout) ++ pTableObj->SetSkipChangeLayout(true); + pObj->SetGeoData(*pUndoGeo); ++ if (pTableObj && mbSkipChangeLayout && pTableObj) ++ pTableObj->SetSkipChangeLayout(false); + } + } + +diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx +index 5b979fe..4fbcb1f 100644 +--- a/svx/source/table/svdotable.cxx ++++ b/svx/source/table/svdotable.cxx +@@ -206,6 +206,7 @@ public: + TableStyleSettings maTableStyle; + Reference< XIndexAccess > mxTableStyle; + std::vector> maUndos; ++ bool mbSkipChangeLayout; + + void SetModel(SdrModel* pOldModel, SdrModel* pNewModel); + +@@ -262,6 +263,7 @@ sal_Int32 SdrTableObjImpl::lastColCount; + SdrTableObjImpl::SdrTableObjImpl() + : mpTableObj( nullptr ) + , mpLayouter( nullptr ) ++, mbSkipChangeLayout(false) + { + } + +@@ -1950,7 +1952,11 @@ void SdrTableObj::NbcSetLogicRect(const Rectangle& rRect) + const bool bWidth = maLogicRect.getWidth() != maRect.getWidth(); + const bool bHeight = maLogicRect.getHeight() != maRect.getHeight(); + maRect = maLogicRect; +- NbcAdjustTextFrameWidthAndHeight( !bHeight, !bWidth ); ++ if (mpImpl->mbSkipChangeLayout) ++ // Avoid distributing newly available space between existing cells. ++ NbcAdjustTextFrameWidthAndHeight(); ++ else ++ NbcAdjustTextFrameWidthAndHeight(!bHeight, !bWidth); + SetRectsDirty(); + } + +@@ -2098,6 +2104,11 @@ void SdrTableObj::AddUndo(SdrUndoAction* pUndo) + mpImpl->maUndos.push_back(std::unique_ptr(pUndo)); + } + ++void SdrTableObj::SetSkipChangeLayout(bool bSkipChangeLayout) ++{ ++ mpImpl->mbSkipChangeLayout = bSkipChangeLayout; ++} ++ + + // gets base transformation and rectangle of object. If it's an SdrPathObj it fills the PolyPolygon + // with the base geometry and returns TRUE. Otherwise it returns FALSE. +@@ -2341,6 +2352,7 @@ bool SdrTableObj::applySpecialDrag(SdrDragStat& rDrag) + if( GetModel() && IsInserted() ) + { + rDrag.SetEndDragChangesAttributes(true); ++ rDrag.SetEndDragChangesLayout(true); + } + + mpImpl->DragEdge( pEdgeHdl->IsHorizontalEdge(), pEdgeHdl->GetPointNum(), pEdgeHdl->GetValidDragOffset( rDrag ) ); +diff --git a/svx/source/table/tablerow.cxx b/svx/source/table/tablerow.cxx +index d86f7e9..37212b7 100644 +--- a/svx/source/table/tablerow.cxx ++++ b/svx/source/table/tablerow.cxx +@@ -157,6 +157,10 @@ void TableRow::removeColumns( sal_Int32 nIndex, sal_Int32 nCount ) + } + } + ++TableModelRef const & TableRow::getModel() const ++{ ++ return mxTableModel; ++} + + // XCellRange + +diff --git a/svx/source/table/tablerow.hxx b/svx/source/table/tablerow.hxx +index cc8c236..5fdd940 100644 +--- a/svx/source/table/tablerow.hxx ++++ b/svx/source/table/tablerow.hxx +@@ -48,6 +48,8 @@ public: + + void insertColumns( sal_Int32 nIndex, sal_Int32 nCount, CellVector::iterator* pIter = nullptr ); + void removeColumns( sal_Int32 nIndex, sal_Int32 nCount ); ++ /// Reference to the table model containing this row. ++ TableModelRef const & getModel() const; + + // XCellRange + virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; +diff --git a/svx/source/table/tableundo.cxx b/svx/source/table/tableundo.cxx +index 250675e..59d08a2 100644 +--- a/svx/source/table/tableundo.cxx ++++ b/svx/source/table/tableundo.cxx +@@ -492,6 +492,9 @@ void TableRowUndo::setData( const Data& rData ) + mxRow->mbIsVisible = rData.mbIsVisible; + mxRow->mbIsStartOfNewPage = rData.mbIsStartOfNewPage; + mxRow->maName = rData.maName; ++ ++ // Trigger re-layout of the table. ++ mxRow->getModel()->setModified(true); + } + + +-- +2.6.6 + diff --git a/libreoffice.changes b/libreoffice.changes index ec60755..b1913d6 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon May 9 20:39:22 UTC 2016 - andras.timar@collabora.com + +- fix bnc#939998 - LO-L3: PPT file shows wrong titles + * bnc939998.patch +- fix bnc#945443 - LO-L3: Undo ignores vertical alignment + * bnc945443.patch +- fix bnc#945445 - LO-L3: Undo does not revert changes of table separation lines + * bnc945445.patch + ------------------------------------------------------------------- Fri May 6 13:36:10 UTC 2016 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 88fe899..b6af916 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -180,6 +180,12 @@ Patch15: 0003-boost-filesystem2.patch Patch16: libreoffice-hotfix-disablebrokenshapetest.patch # bnc#856729 - LO-L3: fix double borders in Calc Patch17: bnc856729.patch +# bnc#939998 - LO-L3: PPT file shows wrong titles +Patch18: bnc939998.patch +# bnc#945443 - LO-L3: Undo ignores vertical alignment +Patch19: bnc945443.patch +# bnc#945445 - LO-L3: Undo does not revert changes of table separation lines +Patch20: bnc945445.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: %{name}-share-linker @@ -1085,6 +1091,9 @@ Provides additional %{langname} translations and resources for %{project}. \ %patch15 -p1 %patch16 -p1 %patch17 -p1 +%patch18 -p1 +%patch19 -p1 +%patch20 -p1 %patch990 -p1 # 256x256 icons tar -xjf %{SOURCE20} From 4f3ed50e90a11efb63f7f988905aab37c44bd76537770d2e3280841631a0a3fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 11 May 2016 10:23:23 +0000 Subject: [PATCH 05/10] * fate#320521 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=406 --- libreoffice.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/libreoffice.changes b/libreoffice.changes index b1913d6..ad48470 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -12,6 +12,7 @@ Mon May 9 20:39:22 UTC 2016 - andras.timar@collabora.com Fri May 6 13:36:10 UTC 2016 - tchvatal@suse.com - Version update to 5.1.3.2: few small tweaks for the .3.1 release + * fate#320521 - Refresh patches: * 0001-liborcus-0.11.patch From 8f368a0d1a7bb29e5460e108a5ee6f5209c49322a0b9d984caed5cdad0c8abe8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 2 Jun 2016 09:02:44 +0000 Subject: [PATCH 06/10] Accepting request 399630 from LibreOffice:Unstable - Version update to 5.2.0.0.beta1: * Disable support for sle11, not needed anymore * Cleanup the specfile from all the compat conditionals per above * Disable bundled help and point to upstream wiki always (speeds up build quite a bit) * Use pkgconfig style dependencies instead of the develpkgs * Remove all the bundled tarballs that were aedded for sle11 * Adjust the constraints a bit to reflect reality * Remove merged patches: * scp2-user-config-suse.diff * 0001-Make-HAVE_JAVA6-be-always-false.patch * 0001-mdds-1.0.patch * 0001-liborcus-0.11.patch * 0002-boost-filesystem1.patch * 0003-boost-filesystem2.patch * bnc856729.patch * bnc939998.patch * bnc945443.patch * bnc945445.patch * Refresh patches: * libreoffice-hotfix-disablebrokenshapetest.patch * system-pyuno.diff OBS-URL: https://build.opensuse.org/request/show/399630 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=407 --- 0001-Make-HAVE_JAVA6-be-always-false.patch | 41 - 0001-liborcus-0.11.patch | 1974 ----------------- 0001-mdds-1.0.patch | 25 - 0002-boost-filesystem1.patch | 158 -- 0003-boost-filesystem2.patch | 25 - ...24cfac409e766913506961a8-ucpp-1.3.2.tar.gz | 3 - ...3651b1bd7940fe-libexttextcat-3.4.4.tar.bz2 | 3 - ...f8a8f3aca6183b2-graphite-minimal-1.3.6.tgz | 3 - ...a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz | 3 - ...3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz | 3 - ...1776f39b-commons-httpclient-3.1-src.tar.gz | 3 - ...5ce7d69ddfff7-commons-codec-1.6-src.tar.gz | 3 - ...d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz | 3 - ...2ae5f16bbd603bd1e1d03-libformula-1.1.7.zip | 3 - ...cab2f4f9d8faee3e8d57ae7664-glew-1.12.0.zip | 3 - ...cea1514f1369fcfc87542390fd-sacjava-1.3.zip | 3 - ...199af31923e900d082ca2dd-libfonts-1.1.6.zip | 3 - ...a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz | 3 - ...b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz | 3 - ...e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz | 3 - ...9bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz | 3 - ...ca43c9469d6e6b-commons-lang-2.4-src.tar.gz | 3 - ...df67f08e5-mysql-connector-c++-1.1.4.tar.gz | 3 - ...6c41f7201d15373ed9-librepository-1.1.6.zip | 3 - ...62397f446b217e2b623e71-libloader-1.1.6.zip | 3 - Firebird-2.5.4.26856-0.tar.bz2 | 3 - _constraints | 6 +- ...722d881661-mariadb_client-2.0.0-src.tar.gz | 3 - ...afe721149fbdb511b-liblangtag-0.5.8.tar.bz2 | 3 - ...9184e329db254e454a010f56d-libxml-1.1.7.zip | 3 - ...6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz | 3 - ...019c2d93a8c88c651a0f-flow-engine-0.9.4.zip | 3 - ...daace6e199adc3-glm-0.9.4.6-libreoffice.zip | 3 - bnc856729.patch | 155 -- bnc939998.patch | 96 - bnc945443.patch | 187 -- bnc945445.patch | 276 --- boost_1_59_0.tar.bz2 | 3 - ...e3ead14f0a60e9418-postgresql-9.2.1.tar.bz2 | 3 - ...56aec5ebfab2a3f059be99d-icu4c-56_1-src.tgz | 3 - ...b90d9281956524250d6e-xmlsec1-1.2.20.tar.gz | 3 + commons-logging-1.2-src.tar.gz | 3 - ...f908e85643e557a236ea989c-vigra1.6.0.tar.gz | 3 - ...ed178db6e2b18eeed243f85aa8-flute-1.1.6.zip | 3 - ...d6d6807523deb71ee34dc-liblayout-0.2.10.zip | 3 - ...4d3ef513c4ce57a9092b74e1-bsh-2.0b5-src.zip | 3 - ...f0d302fba4bfc6e97eac9624-libbase-1.1.6.zip | 3 - ...e3b597f9265f4e9803-libserializer-1.1.6.zip | 3 - harfbuzz-0.9.40.tar.bz2 | 3 - language-subtag-registry-2016-02-10.tar.bz2 | 3 - lcms2-2.6.tar.gz | 3 - libabw-0.1.1.tar.bz2 | 3 - libcdr-0.1.2.tar.bz2 | 3 - libe-book-0.1.2.tar.bz2 | 3 - libetonyek-0.1.6.tar.bz2 | 3 - libfreehand-0.1.1.tar.bz2 | 3 - libmspub-0.1.2.tar.bz2 | 3 - libmwaw-0.3.7.tar.bz2 | 3 - libodfgen-0.1.6.tar.bz2 | 3 - liborcus-0.11.0.tar.gz | 3 - libpagemaker-0.0.2.tar.bz2 | 3 - libreoffice-5.1.3.2.tar.xz | 3 - libreoffice-5.2.0.0.beta1.tar.xz | 3 + libreoffice-desktop-icons-256x256.tar.bz2 | 3 - libreoffice-help-5.1.3.2.tar.xz | 3 - libreoffice-help-5.2.0.0.beta1.tar.xz | 3 + ...office-hotfix-disablebrokenshapetest.patch | 8 +- libreoffice-translations-5.1.3.2.tar.xz | 3 - libreoffice-translations-5.2.0.0.beta1.tar.xz | 3 + libreoffice.changes | 26 + libreoffice.spec | 712 ++---- librevenge-0.0.4.tar.bz2 | 3 - libvisio-0.1.5.tar.bz2 | 3 - libwpd-0.10.1.tar.bz2 | 3 - libwpg-0.3.1.tar.bz2 | 3 - libwps-0.4.2.tar.bz2 | 3 - make-4.1.tar.bz2 | 3 - mdds_0.12.1.tar.bz2 | 3 - scp2-user-config-suse.diff | 34 - sofficerc-upstream | 11 - system-pyuno.diff | 27 +- 81 files changed, 235 insertions(+), 3721 deletions(-) delete mode 100644 0001-Make-HAVE_JAVA6-be-always-false.patch delete mode 100644 0001-liborcus-0.11.patch delete mode 100644 0001-mdds-1.0.patch delete mode 100644 0002-boost-filesystem1.patch delete mode 100644 0003-boost-filesystem2.patch delete mode 100644 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz delete mode 100644 10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2 delete mode 100644 17df8301bcc459e83f8a8f3aca6183b2-graphite-minimal-1.3.6.tgz delete mode 100644 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz delete mode 100644 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz delete mode 100644 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz delete mode 100644 2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz delete mode 100644 32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz delete mode 100644 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip delete mode 100644 3941e9cab2f4f9d8faee3e8d57ae7664-glew-1.12.0.zip delete mode 100644 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip delete mode 100644 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip delete mode 100644 48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz delete mode 100644 4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz delete mode 100644 5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz delete mode 100644 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz delete mode 100644 625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz delete mode 100644 7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz delete mode 100644 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip delete mode 100644 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip delete mode 100644 Firebird-2.5.4.26856-0.tar.bz2 delete mode 100644 a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz delete mode 100644 aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.tar.bz2 delete mode 100644 ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip delete mode 100644 b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz delete mode 100644 ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip delete mode 100644 bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip delete mode 100644 bnc856729.patch delete mode 100644 bnc939998.patch delete mode 100644 bnc945443.patch delete mode 100644 bnc945445.patch delete mode 100644 boost_1_59_0.tar.bz2 delete mode 100644 c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2 delete mode 100644 c4a2d71ff56aec5ebfab2a3f059be99d-icu4c-56_1-src.tgz create mode 100644 ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz delete mode 100644 commons-logging-1.2-src.tar.gz delete mode 100644 d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz delete mode 100644 d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip delete mode 100644 db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip delete mode 100644 ec1941a74d3ef513c4ce57a9092b74e1-bsh-2.0b5-src.zip delete mode 100644 eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip delete mode 100644 f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip delete mode 100644 harfbuzz-0.9.40.tar.bz2 delete mode 100644 language-subtag-registry-2016-02-10.tar.bz2 delete mode 100644 lcms2-2.6.tar.gz delete mode 100644 libabw-0.1.1.tar.bz2 delete mode 100644 libcdr-0.1.2.tar.bz2 delete mode 100644 libe-book-0.1.2.tar.bz2 delete mode 100644 libetonyek-0.1.6.tar.bz2 delete mode 100644 libfreehand-0.1.1.tar.bz2 delete mode 100644 libmspub-0.1.2.tar.bz2 delete mode 100644 libmwaw-0.3.7.tar.bz2 delete mode 100644 libodfgen-0.1.6.tar.bz2 delete mode 100644 liborcus-0.11.0.tar.gz delete mode 100644 libpagemaker-0.0.2.tar.bz2 delete mode 100644 libreoffice-5.1.3.2.tar.xz create mode 100644 libreoffice-5.2.0.0.beta1.tar.xz delete mode 100644 libreoffice-desktop-icons-256x256.tar.bz2 delete mode 100644 libreoffice-help-5.1.3.2.tar.xz create mode 100644 libreoffice-help-5.2.0.0.beta1.tar.xz delete mode 100644 libreoffice-translations-5.1.3.2.tar.xz create mode 100644 libreoffice-translations-5.2.0.0.beta1.tar.xz delete mode 100644 librevenge-0.0.4.tar.bz2 delete mode 100644 libvisio-0.1.5.tar.bz2 delete mode 100644 libwpd-0.10.1.tar.bz2 delete mode 100644 libwpg-0.3.1.tar.bz2 delete mode 100644 libwps-0.4.2.tar.bz2 delete mode 100644 make-4.1.tar.bz2 delete mode 100644 mdds_0.12.1.tar.bz2 delete mode 100644 scp2-user-config-suse.diff delete mode 100644 sofficerc-upstream diff --git a/0001-Make-HAVE_JAVA6-be-always-false.patch b/0001-Make-HAVE_JAVA6-be-always-false.patch deleted file mode 100644 index 8bce2a3..0000000 --- a/0001-Make-HAVE_JAVA6-be-always-false.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 901eeaacd7219f61816b28873e45264c7d7de1ac Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= -Date: Thu, 23 Apr 2015 17:41:10 +0200 -Subject: [PATCH] Make HAVE_JAVA6 be always false - -Even if we have newer java for bundling we still test for 1.5 java -to be able to execute our bitecode. - -Change-Id: I7bf5d86c4558b8ed583e3741c10e10daaaa825a7 -NOTE: Do NOT upstream this. ---- - configure.ac | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0d492ad..ba02fd6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -6725,9 +6725,6 @@ if test "$ENABLE_JAVA" != ""; then - if test "$_jdk_ver" -lt 10500; then - AC_MSG_ERROR([IBM JDK is too old, you need at least 1.5]) - fi -- if test "$_jdk_ver" -ge 10600; then -- HAVE_JAVA6=TRUE -- fi - - AC_MSG_RESULT([checked (IBM JDK $_jdk)]) - -@@ -6750,9 +6747,6 @@ you must use the "--with-jdk-home" configure option explicitly]) - if test "$_jdk_ver" -gt 10600; then - JAVA_CLASSPATH_NOT_SET="1" - fi -- if test "$_jdk_ver" -ge 10600; then -- HAVE_JAVA6=TRUE -- fi - if test "$_jdk_ver" -ge 10900; then - HAVE_JAVA9=TRUE - fi --- -2.3.5 - diff --git a/0001-liborcus-0.11.patch b/0001-liborcus-0.11.patch deleted file mode 100644 index 6de0444..0000000 --- a/0001-liborcus-0.11.patch +++ /dev/null @@ -1,1974 +0,0 @@ -From b325b4c286b56a63316063a3ac4648bf7b7efcbe Mon Sep 17 00:00:00 2001 -From: Kohei Yoshida -Date: Sat, 5 Mar 2016 20:09:34 -0500 -Subject: 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 -Reviewed-by: Kohei Yoshida - -Index: libreoffice-5.1.3.2/RepositoryExternal.mk -=================================================================== ---- libreoffice-5.1.3.2.orig/RepositoryExternal.mk -+++ libreoffice-5.1.3.2/RepositoryExternal.mk -@@ -786,6 +786,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) - -@@ -3180,7 +3195,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), \ -@@ -3199,7 +3214,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 -Index: libreoffice-5.1.3.2/configure.ac -=================================================================== ---- libreoffice-5.1.3.2.orig/configure.ac -+++ libreoffice-5.1.3.2/configure.ac -@@ -9143,7 +9143,7 @@ if test -z "$enable_orcus" -o "$enable_o - 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 - # =========================================================== -Index: libreoffice-5.1.3.2/download.lst -=================================================================== ---- libreoffice-5.1.3.2.orig/download.lst -+++ libreoffice-5.1.3.2/download.lst -@@ -113,8 +113,8 @@ export OPENCOLLADA_TARBALL := OpenCOLLAD - 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 -Index: libreoffice-5.1.3.2/external/boost/Module_boost.mk -=================================================================== ---- libreoffice-5.1.3.2.orig/external/boost/Module_boost.mk -+++ libreoffice-5.1.3.2/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 \ -Index: libreoffice-5.1.3.2/external/boost/StaticLibrary_boost_filesystem.mk -=================================================================== ---- /dev/null -+++ libreoffice-5.1.3.2/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: -Index: libreoffice-5.1.3.2/external/liborcus/0001-Fix-for-OSX-build-inside-LibreOffice.patch -=================================================================== ---- /dev/null -+++ libreoffice-5.1.3.2/external/liborcus/0001-Fix-for-OSX-build-inside-LibreOffice.patch -@@ -0,0 +1,1175 @@ -+From a1df2d984d527931c6cbbe6547856283bdbf6a9b Mon Sep 17 00:00:00 2001 -+From: Kohei Yoshida -+Date: Sun, 6 Mar 2016 21:21:31 -0500 -+Subject: [PATCH] Fix for OSX build inside LibreOffice. -+ -+--- -+ include/orcus/sax_ns_parser.hpp | 2 +- -+ slickedit/orcus.vpj | 178 ++++--------------------------- -+ src/liborcus/dom_tree.cpp | 12 +-- -+ src/liborcus/json_document_tree.cpp | 29 +++-- -+ src/liborcus/json_document_tree_test.cpp | 2 +- -+ src/liborcus/ods_content_xml_context.cpp | 2 +- -+ src/liborcus/opc_reader.cpp | 2 +- -+ src/liborcus/orcus_gnumeric.cpp | 2 +- -+ src/liborcus/orcus_import_ods.cpp | 2 +- -+ src/liborcus/orcus_import_xlsx.cpp | 2 +- -+ src/liborcus/orcus_xls_xml.cpp | 2 +- -+ src/liborcus/orcus_xlsx.cpp | 20 ++-- -+ src/liborcus/orcus_xml.cpp | 4 +- -+ src/liborcus/xlsx_sheet_context.cpp | 8 +- -+ src/liborcus/xml_map_tree.cpp | 6 +- -+ src/liborcus/xml_structure_tree.cpp | 4 +- -+ src/liborcus/yaml_document_tree.cpp | 34 +++--- -+ src/mso/encryption_info.cpp | 3 +- -+ src/orcus_filter_global.cpp | 2 +- -+ src/orcus_json_main.cpp | 2 +- -+ src/orcus_yaml_main.cpp | 2 +- -+ src/parser/json_parser_base.cpp | 2 +- -+ src/parser/sax_parser_base.cpp | 2 +- -+ src/parser/string_pool.cpp | 4 +- -+ src/parser/yaml_parser_base.cpp | 2 +- -+ src/spreadsheet/document.cpp | 2 +- -+ 26 files changed, 95 insertions(+), 237 deletions(-) -+ -+diff --git a/include/orcus/sax_ns_parser.hpp b/include/orcus/sax_ns_parser.hpp -+index 680f39d..49a2b48 100644 -+--- a/include/orcus/sax_ns_parser.hpp -++++ b/include/orcus/sax_ns_parser.hpp -+@@ -142,7 +142,7 @@ private: -+ -+ void start_element(const sax::parser_element& elem) -+ { -+- m_scopes.push_back(make_unique<__sax::elem_scope>()); -++ m_scopes.push_back(orcus::make_unique<__sax::elem_scope>()); -+ __sax::elem_scope& scope = *m_scopes.back(); -+ scope.ns = m_ns_cxt.get(elem.ns); -+ scope.name = elem.name; -+diff --git a/slickedit/orcus.vpj b/slickedit/orcus.vpj -+index 23c6d42..bbc89ec 100644 -+--- a/slickedit/orcus.vpj -++++ b/slickedit/orcus.vpj -+@@ -145,6 +145,10 @@ -+ Filters=""> -+ -+ -++ -++ -++ -++ -+ -+ -+ -+@@ -186,6 +190,7 @@ -+ -+ -+ -++ -+ -+ -+ -+@@ -193,43 +198,34 @@ -+ -+ -+ -+- -+- -+ -+ -+- -+- -+ -+ -+- -+- -+ -+ -+- -+ -+- -+- -+ -+ -+- -+- -+ -+ -+- -+ -+ -+ -+ -+- -+- -+ -+ -+ -++ -++ -++ -+ -+ -+ -+ -+ -++ -++ -+ -+ -+ -+@@ -240,308 +236,172 @@ -+ -+ -+ -+- -+- -+ -++ -+ -+- -+- -+ -+ -+- -+- -+ -+ -+- -+ -+- -+- -+ -+ -+- -+- -+ -+ -+- -+ -+- -+- -+ -+ -+- -+- -+ -+ -+- -+ -+- -+- -+ -+ -+- -+- -+ -+ -+- -+ -+ -+- -+- -+ -+ -+- -+- -+ -+ -+- -+ -+- -+- -+ -+ -+- -+- -+ -+ -+- -+ -+ -+- -+ -+ -+ -+ -+ -+- -+ -+- -+- -+ -+- -++ -++ -++ -+ -+ -+- -+- -+ -+ -+- -+- -+ -+ -+- -+ -+- -+- -+ -+ -+- -+- -+ -+- -++ -+ -+ -+- -+- -+ -+ -+- -+- -+ -+ -+- -+ -+- -+- -+ -+ -+- -+- -+ -+ -+- -+ -+- -+- -+ -+ -+- -+- -+ -+ -+- -+ -+- -+- -+ -+ -+- -+- -+ -+ -+- -+ -+- -+- -+ -+ -+- -+- -+ -+ -+- -+ -+- -+- -+ -+ -+- -+- -+ -+ -+- -+ -+- -+- -+ -+ -+- -+- -+ -+- -++ -+ -+ -+- -+- -+ -+ -+- -+- -+ -+ -+- -+ -+- -+- -+ -+ -+- -+- -++ -++ -+ -+ -+- -+ -+- -+- -+ -+ -+- -+- -+ -+ -+- -+ -+- -+- -+ -+ -+- -+- -+ -+ -+- -+ -+- -+- -+ -+ -+- -+ -+ -+ -+- -+- -+ -+ -+- -+- -+ -+ -+ -+ -+- -+- -+ -+ -+- -+ -+- -+- -+ -+ -+- -+- -+ -+ -+- -+ -+- -+- -+ -+ -+- -+- -+ -+ -+- -+ -+- -+- -+ -+ -+- -+- -+ -+ -+- -+ -+- -+- -+ -+ -+- -+- -+ -+ -+- -+ -+- -+- -+ -+ -+- -+- -+ -+ -+- -+ -+- -+- -+ -+ -+ -+ -+ -+ -+- -+ -+ -+ -+- -+- -+ -+ -+- -+- -+ -+ -+ -+@@ -565,6 +425,7 @@ -+ -+ -+ -++ -+ -+ -+ -+@@ -597,7 +458,6 @@ -+ -+ -+ -+- -+ -+ -+ -+diff --git a/src/liborcus/dom_tree.cpp b/src/liborcus/dom_tree.cpp -+index 255a7d7..1b4588b 100644 -+--- a/src/liborcus/dom_tree.cpp -++++ b/src/liborcus/dom_tree.cpp -+@@ -177,7 +177,7 @@ void dom_tree::content::print(ostream& os, const xmlns_context& /*cxt*/) const -+ dom_tree::content::~content() {} -+ -+ dom_tree::dom_tree(xmlns_context& cxt) : -+- mp_impl(make_unique(cxt)) {} -++ mp_impl(orcus::make_unique(cxt)) {} -+ -+ dom_tree::~dom_tree() {} -+ -+@@ -242,7 +242,7 @@ void dom_tree::start_element(xmlns_id_t ns, const pstring& name) -+ -+ // Append new element as a child element of the current element. -+ p = mp_impl->m_elem_stack.back(); -+- p->child_nodes.push_back(make_unique(ns, name_safe)); -++ p->child_nodes.push_back(orcus::make_unique(ns, name_safe)); -+ p = static_cast(p->child_nodes.back().get()); -+ p->attrs.swap(mp_impl->m_cur_attrs); -+ mp_impl->m_elem_stack.push_back(p); -+@@ -269,7 +269,7 @@ void dom_tree::set_characters(const pstring& val) -+ -+ element* p = mp_impl->m_elem_stack.back(); -+ val2 = mp_impl->m_pool.intern(val2).first; // Make sure the string is persistent. -+- p->child_nodes.push_back(make_unique(val2)); -++ p->child_nodes.push_back(orcus::make_unique(val2)); -+ } -+ -+ void dom_tree::set_attribute(xmlns_id_t ns, const pstring& name, const pstring& val) -+@@ -283,7 +283,7 @@ void dom_tree::set_attribute(xmlns_id_t ns, const pstring& name, const pstring& -+ -+ void dom_tree::set_doctype(const sax::doctype_declaration& dtd) -+ { -+- mp_impl->m_doctype = make_unique(dtd); // make a copy. -++ mp_impl->m_doctype = orcus::make_unique(dtd); // make a copy. -+ -+ sax::doctype_declaration& this_dtd = *mp_impl->m_doctype; -+ string_pool& pool = mp_impl->m_pool; -+@@ -360,7 +360,7 @@ void dom_tree::dump_compact(ostream& os) const -+ -+ scopes_type scopes; -+ -+- scopes.push_back(make_unique(string(), mp_impl->m_root)); -++ scopes.push_back(orcus::make_unique(string(), mp_impl->m_root)); -+ while (!scopes.empty()) -+ { -+ bool new_scope = false; -+@@ -418,7 +418,7 @@ void dom_tree::dump_compact(ostream& os) const -+ ++cur_scope.current_pos; -+ ostringstream elem_name; -+ elem->print(elem_name, mp_impl->m_ns_cxt); -+- scopes.push_back(make_unique(elem_name.str())); -++ scopes.push_back(orcus::make_unique(elem_name.str())); -+ scope& child_scope = *scopes.back(); -+ child_scope.nodes.swap(nodes); -+ child_scope.current_pos = child_scope.nodes.begin(); -+diff --git a/src/liborcus/json_document_tree.cpp b/src/liborcus/json_document_tree.cpp -+index adafcbf..81289e1 100644 -+--- a/src/liborcus/json_document_tree.cpp -++++ b/src/liborcus/json_document_tree.cpp -+@@ -55,7 +55,6 @@ using node_t = json::detail::node_t; -+ -+ const char* tab = " "; -+ constexpr char quote = '"'; -+-constexpr char backslash = '\\'; -+ -+ const xmlns_id_t NS_orcus_json_xml = "http://schemas.kohei.us/orcus/2015/json"; -+ -+@@ -455,13 +454,13 @@ public: -+ { -+ if (m_root) -+ { -+- json_value* jv = push_value(make_unique()); -++ json_value* jv = push_value(orcus::make_unique()); -+ assert(jv && jv->type == node_t::array); -+ m_stack.push_back(parser_stack(jv)); -+ } -+ else -+ { -+- m_root = make_unique(); -++ m_root = orcus::make_unique(); -+ m_stack.push_back(parser_stack(m_root.get())); -+ } -+ } -+@@ -476,13 +475,13 @@ public: -+ { -+ if (m_root) -+ { -+- json_value* jv = push_value(make_unique()); -++ json_value* jv = push_value(orcus::make_unique()); -+ assert(jv && jv->type == node_t::object); -+ m_stack.push_back(parser_stack(jv)); -+ } -+ else -+ { -+- m_root = make_unique(); -++ m_root = orcus::make_unique(); -+ m_stack.push_back(parser_stack(m_root.get())); -+ } -+ } -+@@ -504,17 +503,17 @@ public: -+ -+ void boolean_true() -+ { -+- push_value(make_unique(node_t::boolean_true)); -++ push_value(orcus::make_unique(node_t::boolean_true)); -+ } -+ -+ void boolean_false() -+ { -+- push_value(make_unique(node_t::boolean_false)); -++ push_value(orcus::make_unique(node_t::boolean_false)); -+ } -+ -+ void null() -+ { -+- push_value(make_unique(node_t::null)); -++ push_value(orcus::make_unique(node_t::null)); -+ } -+ -+ void string(const char* p, size_t len, bool transient) -+@@ -524,12 +523,12 @@ public: -+ // The tree manages the life cycle of this string value. -+ s = m_pool.intern(s).first; -+ -+- push_value(make_unique(s)); -++ push_value(orcus::make_unique(s)); -+ } -+ -+ void number(double val) -+ { -+- push_value(make_unique(val)); -++ push_value(orcus::make_unique(val)); -+ } -+ -+ void swap(std::unique_ptr& other_root) -+@@ -554,8 +553,8 @@ struct node::impl -+ impl(const json_value* jv) : m_node(jv) {} -+ }; -+ -+-node::node(const json_value* jv) : mp_impl(make_unique(jv)) {} -+-node::node(const node& other) : mp_impl(make_unique(other.mp_impl->m_node)) {} -++node::node(const json_value* jv) : mp_impl(orcus::make_unique(jv)) {} -++node::node(const node& other) : mp_impl(orcus::make_unique(other.mp_impl->m_node)) {} -+ node::node(node&& rhs) : mp_impl(std::move(rhs.mp_impl)) {} -+ node::~node() {} -+ -+@@ -720,12 +719,12 @@ struct json_document_tree::impl -+ std::unique_ptr m_own_pool; -+ string_pool& m_pool; -+ -+- impl() : m_own_pool(make_unique()), m_pool(*m_own_pool) {} -++ impl() : m_own_pool(orcus::make_unique()), m_pool(*m_own_pool) {} -+ impl(string_pool& pool) : m_pool(pool) {} -+ }; -+ -+-json_document_tree::json_document_tree() : mp_impl(make_unique()) {} -+-json_document_tree::json_document_tree(string_pool& pool) : mp_impl(make_unique(pool)) {} -++json_document_tree::json_document_tree() : mp_impl(orcus::make_unique()) {} -++json_document_tree::json_document_tree(string_pool& pool) : mp_impl(orcus::make_unique(pool)) {} -+ json_document_tree::~json_document_tree() {} -+ -+ void json_document_tree::load(const std::string& strm, const json_config& config) -+diff --git a/src/liborcus/json_document_tree_test.cpp b/src/liborcus/json_document_tree_test.cpp -+index da16150..4b4fcbd 100644 -+--- a/src/liborcus/json_document_tree_test.cpp -++++ b/src/liborcus/json_document_tree_test.cpp -+@@ -193,7 +193,7 @@ std::unique_ptr get_doc_tree(const char* filepath) -+ cout << "--- original" << endl; -+ cout << strm << endl; -+ -+- auto doc = make_unique(); -++ auto doc = orcus::make_unique(); -+ doc->load(strm, test_config); -+ -+ return doc; -+diff --git a/src/liborcus/ods_content_xml_context.cpp b/src/liborcus/ods_content_xml_context.cpp -+index f496353..c4e706d 100644 -+--- a/src/liborcus/ods_content_xml_context.cpp -++++ b/src/liborcus/ods_content_xml_context.cpp -+@@ -588,7 +588,7 @@ void ods_content_xml_context::push_cell_value() -+ ods_session_data& ods_data = -+ static_cast(*get_session_context().mp_data); -+ ods_data.m_formulas.push_back( -+- make_unique( -++ orcus::make_unique( -+ m_tables.size()-1, m_row, m_col, m_cell_attr.formula_grammar, m_cell_attr.formula)); -+ -+ ods_session_data::formula& formula_data = *ods_data.m_formulas.back(); -+diff --git a/src/liborcus/opc_reader.cpp b/src/liborcus/opc_reader.cpp -+index 814b2cf..666530e 100644 -+--- a/src/liborcus/opc_reader.cpp -++++ b/src/liborcus/opc_reader.cpp -+@@ -244,7 +244,7 @@ void opc_reader::read_content_types() -+ m_config, m_ns_repo, opc_tokens, -+ reinterpret_cast(&buffer[0]), buffer.size()); -+ -+- auto handler = make_unique( -++ auto handler = orcus::make_unique( -+ new opc_content_types_context(m_session_cxt, opc_tokens)); -+ -+ parser.set_handler(handler.get()); -+diff --git a/src/liborcus/orcus_gnumeric.cpp b/src/liborcus/orcus_gnumeric.cpp -+index 1873c0e..c29bef9 100644 -+--- a/src/liborcus/orcus_gnumeric.cpp -++++ b/src/liborcus/orcus_gnumeric.cpp -+@@ -82,7 +82,7 @@ void orcus_gnumeric::read_content_xml(const char* p, size_t size) -+ { -+ xml_stream_parser parser(get_config(), mp_impl->m_ns_repo, gnumeric_tokens, p, size); -+ -+- auto handler = make_unique( -++ auto handler = orcus::make_unique( -+ mp_impl->m_cxt, gnumeric_tokens, mp_impl->mp_factory); -+ -+ parser.set_handler(handler.get()); -+diff --git a/src/liborcus/orcus_import_ods.cpp b/src/liborcus/orcus_import_ods.cpp -+index af1135e..2d76dbb 100644 -+--- a/src/liborcus/orcus_import_ods.cpp -++++ b/src/liborcus/orcus_import_ods.cpp -+@@ -32,7 +32,7 @@ void import_ods::read_styles(const char* p, size_t n, spreadsheet::iface::import -+ -+ session_context cxt; -+ odf_styles_map_type styles_map; -+- auto context = make_unique(cxt, odf_tokens, styles_map, styles); -++ auto context = orcus::make_unique(cxt, odf_tokens, styles_map, styles); -+ -+ xml_simple_stream_handler stream_handler(context.release()); -+ -+diff --git a/src/liborcus/orcus_import_xlsx.cpp b/src/liborcus/orcus_import_xlsx.cpp -+index 2f9f172..0d4a933 100644 -+--- a/src/liborcus/orcus_import_xlsx.cpp -++++ b/src/liborcus/orcus_import_xlsx.cpp -+@@ -33,7 +33,7 @@ void import_xlsx::read_table(const char* p, size_t n, spreadsheet::iface::import -+ return; -+ -+ session_context cxt; -+- auto handler = make_unique(cxt, ooxml_tokens, *table); -++ auto handler = orcus::make_unique(cxt, ooxml_tokens, *table); -+ -+ xmlns_repository ns_repo; -+ ns_repo.add_predefined_values(NS_ooxml_all); -+diff --git a/src/liborcus/orcus_xls_xml.cpp b/src/liborcus/orcus_xls_xml.cpp -+index 2849219..22ffeab 100644 -+--- a/src/liborcus/orcus_xls_xml.cpp -++++ b/src/liborcus/orcus_xls_xml.cpp -+@@ -92,7 +92,7 @@ void orcus_xls_xml::read_stream(const char* content, size_t len) -+ xml_stream_parser parser( -+ get_config(), mp_impl->m_ns_repo, xls_xml_tokens, content, len); -+ -+- auto handler = make_unique( -++ auto handler = orcus::make_unique( -+ mp_impl->m_cxt, xls_xml_tokens, mp_impl->mp_factory); -+ -+ parser.set_handler(handler.get()); -+diff --git a/src/liborcus/orcus_xlsx.cpp b/src/liborcus/orcus_xlsx.cpp -+index 8c578e6..7c1e46c 100644 -+--- a/src/liborcus/orcus_xlsx.cpp -++++ b/src/liborcus/orcus_xlsx.cpp -+@@ -286,7 +286,7 @@ void orcus_xlsx::read_workbook(const string& dir_path, const string& file_name) -+ if (buffer.empty()) -+ return; -+ -+- auto handler = make_unique( -++ auto handler = orcus::make_unique( -+ new xlsx_workbook_context(mp_impl->m_cxt, ooxml_tokens)); -+ -+ xml_stream_parser parser( -+@@ -341,7 +341,7 @@ void orcus_xlsx::read_sheet(const string& dir_path, const string& file_name, xls -+ get_config(), mp_impl->m_ns_repo, ooxml_tokens, -+ reinterpret_cast(&buffer[0]), buffer.size()); -+ -+- auto handler = make_unique( -++ auto handler = orcus::make_unique( -+ mp_impl->m_cxt, ooxml_tokens, data->id-1, sheet); -+ -+ parser.set_handler(handler.get()); -+@@ -373,7 +373,7 @@ void orcus_xlsx::read_shared_strings(const string& dir_path, const string& file_ -+ get_config(), mp_impl->m_ns_repo, ooxml_tokens, -+ reinterpret_cast(&buffer[0]), buffer.size()); -+ -+- auto handler = make_unique( -++ auto handler = orcus::make_unique( -+ new xlsx_shared_strings_context( -+ mp_impl->m_cxt, ooxml_tokens, mp_impl->mp_factory->get_shared_strings())); -+ -+@@ -406,7 +406,7 @@ void orcus_xlsx::read_styles(const string& dir_path, const string& file_name) -+ get_config(), mp_impl->m_ns_repo, ooxml_tokens, -+ reinterpret_cast(&buffer[0]), buffer.size()); -+ -+- auto handler = make_unique( -++ auto handler = orcus::make_unique( -+ new xlsx_styles_context( -+ mp_impl->m_cxt, ooxml_tokens, mp_impl->mp_factory->get_styles())); -+ -+@@ -441,7 +441,7 @@ void orcus_xlsx::read_table(const std::string& dir_path, const std::string& file -+ if (buffer.empty()) -+ return; -+ -+- auto handler = make_unique(mp_impl->m_cxt, ooxml_tokens, *table); -++ auto handler = orcus::make_unique(mp_impl->m_cxt, ooxml_tokens, *table); -+ -+ xml_stream_parser parser( -+ get_config(), mp_impl->m_ns_repo, ooxml_tokens, -+@@ -471,7 +471,7 @@ void orcus_xlsx::read_pivot_cache_def(const std::string& dir_path, const std::st -+ if (buffer.empty()) -+ return; -+ -+- auto handler = make_unique(mp_impl->m_cxt, ooxml_tokens); -++ auto handler = orcus::make_unique(mp_impl->m_cxt, ooxml_tokens); -+ -+ xml_stream_parser parser( -+ get_config(), mp_impl->m_ns_repo, ooxml_tokens, -+@@ -502,7 +502,7 @@ void orcus_xlsx::read_pivot_cache_rec(const std::string& dir_path, const std::st -+ if (buffer.empty()) -+ return; -+ -+- auto handler = make_unique(mp_impl->m_cxt, ooxml_tokens); -++ auto handler = orcus::make_unique(mp_impl->m_cxt, ooxml_tokens); -+ -+ xml_stream_parser parser( -+ get_config(), mp_impl->m_ns_repo, ooxml_tokens, -+@@ -532,7 +532,7 @@ void orcus_xlsx::read_pivot_table(const std::string& dir_path, const std::string -+ if (buffer.empty()) -+ return; -+ -+- auto handler = make_unique(mp_impl->m_cxt, ooxml_tokens); -++ auto handler = orcus::make_unique(mp_impl->m_cxt, ooxml_tokens); -+ -+ xml_stream_parser parser( -+ get_config(), mp_impl->m_ns_repo, ooxml_tokens, -+@@ -567,7 +567,7 @@ void orcus_xlsx::read_rev_headers(const std::string& dir_path, const std::string -+ get_config(), mp_impl->m_ns_repo, ooxml_tokens, -+ reinterpret_cast(&buffer[0]), buffer.size()); -+ -+- auto handler = make_unique( -++ auto handler = orcus::make_unique( -+ new xlsx_revheaders_context(mp_impl->m_cxt, ooxml_tokens)); -+ -+ parser.set_handler(handler.get()); -+@@ -600,7 +600,7 @@ void orcus_xlsx::read_rev_log(const std::string& dir_path, const std::string& fi -+ get_config(), mp_impl->m_ns_repo, ooxml_tokens, -+ reinterpret_cast(&buffer[0]), buffer.size()); -+ -+- auto handler = make_unique( -++ auto handler = orcus::make_unique( -+ new xlsx_revlog_context(mp_impl->m_cxt, ooxml_tokens)); -+ -+ parser.set_handler(handler.get()); -+diff --git a/src/liborcus/orcus_xml.cpp b/src/liborcus/orcus_xml.cpp -+index 2cb7fa3..f97c4f9 100644 -+--- a/src/liborcus/orcus_xml.cpp -++++ b/src/liborcus/orcus_xml.cpp -+@@ -343,7 +343,7 @@ void write_range_reference_group( -+ scopes_type scopes; -+ for (spreadsheet::row_t current_row = 0; current_row < ref.row_size; ++current_row) -+ { -+- scopes.push_back(make_unique(root)); // root element -++ scopes.push_back(orcus::make_unique(root)); // root element -+ -+ while (!scopes.empty()) -+ { -+@@ -378,7 +378,7 @@ void write_range_reference_group( -+ // This is a non-leaf element. Push a new scope with this -+ // element and re-start the loop. -+ ++cur_scope.current_child_pos; -+- scopes.push_back(make_unique(child_elem)); -++ scopes.push_back(orcus::make_unique(child_elem)); -+ new_scope = true; -+ break; -+ } -+diff --git a/src/liborcus/xlsx_sheet_context.cpp b/src/liborcus/xlsx_sheet_context.cpp -+index f350049..720319a 100644 -+--- a/src/liborcus/xlsx_sheet_context.cpp -++++ b/src/liborcus/xlsx_sheet_context.cpp -+@@ -547,7 +547,7 @@ void xlsx_sheet_context::end_element_cell() -+ { -+ // shared formula expression -+ session_data.m_shared_formulas.push_back( -+- make_unique( -++ orcus::make_unique( -+ m_sheet_id, m_cur_row, m_cur_col, m_cur_formula.shared_id, -+ m_cur_formula.str.str(), m_cur_formula.ref.str())); -+ } -+@@ -555,14 +555,14 @@ void xlsx_sheet_context::end_element_cell() -+ { -+ // array formula expression -+ session_data.m_formulas.push_back( -+- make_unique( -++ orcus::make_unique( -+ m_sheet_id, m_cur_row, m_cur_col, m_cur_formula.str.str(), m_cur_formula.ref.str())); -+ } -+ else -+ { -+ // normal (non-shared) formula expression -+ session_data.m_formulas.push_back( -+- make_unique( -++ orcus::make_unique( -+ m_sheet_id, m_cur_row, m_cur_col, m_cur_formula.str.str())); -+ } -+ } -+@@ -570,7 +570,7 @@ void xlsx_sheet_context::end_element_cell() -+ { -+ // shared formula without formula expression -+ session_data.m_shared_formulas.push_back( -+- make_unique( -++ orcus::make_unique( -+ m_sheet_id, m_cur_row, m_cur_col, m_cur_formula.shared_id)); -+ } -+ else if (m_cur_formula.type == spreadsheet::formula_t::data_table) -+diff --git a/src/liborcus/xml_map_tree.cpp b/src/liborcus/xml_map_tree.cpp -+index 132ccb9..69fbc75 100644 -+--- a/src/liborcus/xml_map_tree.cpp -++++ b/src/liborcus/xml_map_tree.cpp -+@@ -666,7 +666,7 @@ xml_map_tree::linkable* xml_map_tree::get_element_stack( -+ { -+ // Insert a new element of this name. -+ children.push_back( -+- make_unique( -++ orcus::make_unique( -+ token.ns, m_names.intern(token.name.get(), token.name.size()).first, -+ element_unlinked, reference_unknown)); -+ cur_element = children.back().get(); -+@@ -695,7 +695,7 @@ xml_map_tree::linkable* xml_map_tree::get_element_stack( -+ throw xpath_error("This attribute is already linked. You can't link the same attribute twice."); -+ -+ attrs.push_back( -+- make_unique( -++ orcus::make_unique( -+ token.ns, m_names.intern(token.name.get(), token.name.size()).first, ref_type)); -+ -+ ret = attrs.back().get(); -+@@ -710,7 +710,7 @@ xml_map_tree::linkable* xml_map_tree::get_element_stack( -+ { -+ // No element of that name exists. -+ children.push_back( -+- make_unique( -++ orcus::make_unique( -+ token.ns, m_names.intern(token.name.get(), token.name.size()).first, -+ element_linked, ref_type)); -+ -+diff --git a/src/liborcus/xml_structure_tree.cpp b/src/liborcus/xml_structure_tree.cpp -+index f2d62bd..3a08c64 100644 -+--- a/src/liborcus/xml_structure_tree.cpp -++++ b/src/liborcus/xml_structure_tree.cpp -+@@ -451,7 +451,7 @@ void xml_structure_tree::dump_compact(ostream& os) const -+ cxt.dump(os); -+ -+ element_ref ref(mp_impl->mp_root->name, &mp_impl->mp_root->prop); -+- scopes.push_back(make_unique(entity_name(), false, ref)); -++ scopes.push_back(orcus::make_unique(entity_name(), false, ref)); -+ while (!scopes.empty()) -+ { -+ bool new_scope = false; -+@@ -505,7 +505,7 @@ void xml_structure_tree::dump_compact(ostream& os) const -+ -+ // Push a new scope, and restart the loop with the new scope. -+ ++cur_scope.current_pos; -+- scopes.push_back(make_unique(this_elem.name, this_elem.prop->repeat)); -++ scopes.push_back(orcus::make_unique(this_elem.name, this_elem.prop->repeat)); -+ scope& child_scope = *scopes.back(); -+ child_scope.elements.swap(elems); -+ child_scope.current_pos = child_scope.elements.begin(); -+diff --git a/src/liborcus/yaml_document_tree.cpp b/src/liborcus/yaml_document_tree.cpp -+index b7cc4bc..5aad4f2 100644 -+--- a/src/liborcus/yaml_document_tree.cpp -++++ b/src/liborcus/yaml_document_tree.cpp -+@@ -254,13 +254,13 @@ public: -+ -+ if (m_root) -+ { -+- yaml_value* yv = push_value(make_unique()); -++ yaml_value* yv = push_value(orcus::make_unique()); -+ assert(yv && yv->type == node_t::sequence); -+ m_stack.push_back(parser_stack(yv)); -+ } -+ else -+ { -+- m_root = make_unique(); -++ m_root = orcus::make_unique(); -+ m_stack.push_back(parser_stack(m_root.get())); -+ } -+ } -+@@ -276,13 +276,13 @@ public: -+ assert(m_in_document); -+ if (m_root) -+ { -+- yaml_value* yv = push_value(make_unique()); -++ yaml_value* yv = push_value(orcus::make_unique()); -+ assert(yv && yv->type == node_t::map); -+ m_stack.push_back(parser_stack(yv)); -+ } -+ else -+ { -+- m_root = make_unique(); -++ m_root = orcus::make_unique(); -+ m_stack.push_back(parser_stack(m_root.get())); -+ } -+ } -+@@ -319,11 +319,11 @@ public: -+ -+ if (m_root) -+ { -+- yaml_value* yv = push_value(make_unique(p, n)); -++ yaml_value* yv = push_value(orcus::make_unique(p, n)); -+ assert(yv && yv->type == node_t::string); -+ } -+ else -+- m_root = make_unique(p, n); -++ m_root = orcus::make_unique(p, n); -+ } -+ -+ void number(double val) -+@@ -331,11 +331,11 @@ public: -+ assert(m_in_document); -+ if (m_root) -+ { -+- yaml_value* yv = push_value(make_unique(val)); -++ yaml_value* yv = push_value(orcus::make_unique(val)); -+ assert(yv && yv->type == node_t::number); -+ } -+ else -+- m_root = make_unique(val); -++ m_root = orcus::make_unique(val); -+ } -+ -+ void boolean_true() -+@@ -343,11 +343,11 @@ public: -+ assert(m_in_document); -+ if (m_root) -+ { -+- yaml_value* yv = push_value(make_unique(node_t::boolean_true)); -++ yaml_value* yv = push_value(orcus::make_unique(node_t::boolean_true)); -+ assert(yv && yv->type == node_t::boolean_true); -+ } -+ else -+- m_root = make_unique(node_t::boolean_true); -++ m_root = orcus::make_unique(node_t::boolean_true); -+ } -+ -+ void boolean_false() -+@@ -355,11 +355,11 @@ public: -+ assert(m_in_document); -+ if (m_root) -+ { -+- yaml_value* yv = push_value(make_unique(node_t::boolean_false)); -++ yaml_value* yv = push_value(orcus::make_unique(node_t::boolean_false)); -+ assert(yv && yv->type == node_t::boolean_false); -+ } -+ else -+- m_root = make_unique(node_t::boolean_false); -++ m_root = orcus::make_unique(node_t::boolean_false); -+ } -+ -+ void null() -+@@ -367,11 +367,11 @@ public: -+ assert(m_in_document); -+ if (m_root) -+ { -+- yaml_value* yv = push_value(make_unique(node_t::null)); -++ yaml_value* yv = push_value(orcus::make_unique(node_t::null)); -+ assert(yv && yv->type == node_t::null); -+ } -+ else -+- m_root = make_unique(node_t::null); -++ m_root = orcus::make_unique(node_t::null); -+ } -+ -+ void swap(std::vector& docs) -+@@ -396,8 +396,8 @@ struct node::impl -+ impl(const yaml_value* yv) : m_node(yv) {} -+ }; -+ -+-node::node(const yaml_value* yv) : mp_impl(make_unique(yv)) {} -+-node::node(const node& other) : mp_impl(make_unique(other.mp_impl->m_node)) {} -++node::node(const yaml_value* yv) : mp_impl(orcus::make_unique(yv)) {} -++node::node(const node& other) : mp_impl(orcus::make_unique(other.mp_impl->m_node)) {} -+ node::node(node&& rhs) : mp_impl(std::move(rhs.mp_impl)) {} -+ node::~node() {} -+ -+@@ -548,7 +548,7 @@ double node::numeric_value() const -+ -+ }} -+ -+-yaml_document_tree::yaml_document_tree() : mp_impl(make_unique()) {} -++yaml_document_tree::yaml_document_tree() : mp_impl(orcus::make_unique()) {} -+ yaml_document_tree::~yaml_document_tree() {} -+ -+ void yaml_document_tree::load(const std::string& strm) -+diff --git a/src/mso/encryption_info.cpp b/src/mso/encryption_info.cpp -+index 1d428fc..e9bc3ad 100644 -+--- a/src/mso/encryption_info.cpp -++++ b/src/mso/encryption_info.cpp -+@@ -143,11 +143,10 @@ public: -+ -+ class sax_handler -+ { -+- xmlns_context& m_ns_cxt; -+ vector m_attrs; -+ -+ public: -+- sax_handler(xmlns_context& ns_cxt) : m_ns_cxt(ns_cxt) {} -++ sax_handler(xmlns_context& /*ns_cxt*/) {} -+ void doctype(const sax::doctype_declaration&) {} -+ void start_declaration(const pstring&) {} -+ void end_declaration(const pstring&) {} -+diff --git a/src/orcus_filter_global.cpp b/src/orcus_filter_global.cpp -+index 09c2ab6..df50496 100644 -+--- a/src/orcus_filter_global.cpp -++++ b/src/orcus_filter_global.cpp -+@@ -239,7 +239,7 @@ std::unique_ptr parse_json_args(int argc, char** argv) -+ return nullptr; -+ } -+ -+- std::unique_ptr config = make_unique(); -++ std::unique_ptr config = orcus::make_unique(); -+ -+ if (vm.count("input")) -+ config->input_path = vm["input"].as(); -+diff --git a/src/orcus_json_main.cpp b/src/orcus_json_main.cpp -+index edca63a..6a739b2 100644 -+--- a/src/orcus_json_main.cpp -++++ b/src/orcus_json_main.cpp -+@@ -25,7 +25,7 @@ using namespace orcus; -+ -+ std::unique_ptr load_doc(const std::string& strm, const json_config& config) -+ { -+- std::unique_ptr doc(make_unique()); -++ std::unique_ptr doc(orcus::make_unique()); -+ try -+ { -+ doc->load(strm, config); -+diff --git a/src/orcus_yaml_main.cpp b/src/orcus_yaml_main.cpp -+index 3d15742..c028f64 100644 -+--- a/src/orcus_yaml_main.cpp -++++ b/src/orcus_yaml_main.cpp -+@@ -76,7 +76,7 @@ std::unique_ptr parse_yaml_args(int argc, char** argv) -+ return nullptr; -+ } -+ -+- std::unique_ptr config = make_unique(); -++ std::unique_ptr config = orcus::make_unique(); -+ -+ if (vm.count("input")) -+ config->input_path = vm["input"].as(); -+diff --git a/src/parser/json_parser_base.cpp b/src/parser/json_parser_base.cpp -+index 50e3f36..eff27b7 100644 -+--- a/src/parser/json_parser_base.cpp -++++ b/src/parser/json_parser_base.cpp -+@@ -35,7 +35,7 @@ struct parser_base::impl -+ }; -+ -+ parser_base::parser_base(const char* p, size_t n) : -+- ::orcus::parser_base(p, n), mp_impl(make_unique()) {} -++ ::orcus::parser_base(p, n), mp_impl(orcus::make_unique()) {} -+ -+ parser_base::~parser_base() {} -+ -+diff --git a/src/parser/sax_parser_base.cpp b/src/parser/sax_parser_base.cpp -+index 51d56a4..3cd4f25 100644 -+--- a/src/parser/sax_parser_base.cpp -++++ b/src/parser/sax_parser_base.cpp -+@@ -57,7 +57,7 @@ struct parser_base::impl -+ -+ parser_base::parser_base(const char* content, size_t size) : -+ ::orcus::parser_base(content, size), -+- mp_impl(make_unique()), -++ mp_impl(orcus::make_unique()), -+ m_nest_level(0), -+ m_buffer_pos(0), -+ m_root_elem_open(true) -+diff --git a/src/parser/string_pool.cpp b/src/parser/string_pool.cpp -+index 83c0501..baba88a 100644 -+--- a/src/parser/string_pool.cpp -++++ b/src/parser/string_pool.cpp -+@@ -61,7 +61,7 @@ struct string_pool::impl -+ string_store_type m_store; -+ }; -+ -+-string_pool::string_pool() : mp_impl(make_unique()) {} -++string_pool::string_pool() : mp_impl(orcus::make_unique()) {} -+ -+ string_pool::~string_pool() -+ { -+@@ -82,7 +82,7 @@ pair string_pool::intern(const char* str, size_t n) -+ if (itr == mp_impl->m_set.end()) -+ { -+ // This string has not been interned. Intern it. -+- mp_impl->m_store.push_back(make_unique(str, n)); -++ mp_impl->m_store.push_back(orcus::make_unique(str, n)); -+ pair r = mp_impl->m_set.insert(pstring(mp_impl->m_store.back()->data(), n)); -+ if (!r.second) -+ throw general_error("failed to intern a new string instance."); -+diff --git a/src/parser/yaml_parser_base.cpp b/src/parser/yaml_parser_base.cpp -+index 656dfdc..3c93266 100644 -+--- a/src/parser/yaml_parser_base.cpp -++++ b/src/parser/yaml_parser_base.cpp -+@@ -59,7 +59,7 @@ const size_t parser_base::parse_indent_end_of_stream = std::numeric_limits::max() - 2; -+ -+ parser_base::parser_base(const char* p, size_t n) : -+- ::orcus::parser_base(p, n), mp_impl(make_unique()) {} -++ ::orcus::parser_base(p, n), mp_impl(orcus::make_unique()) {} -+ -+ parser_base::~parser_base() {} -+ -+diff --git a/src/spreadsheet/document.cpp b/src/spreadsheet/document.cpp -+index a80646c..17cc113 100644 -+--- a/src/spreadsheet/document.cpp -++++ b/src/spreadsheet/document.cpp -+@@ -448,7 +448,7 @@ sheet* document::append_sheet(const pstring& sheet_name, row_t row_size, col_t c -+ sheet_t sheet_index = static_cast(mp_impl->m_sheets.size()); -+ -+ mp_impl->m_sheets.push_back( -+- make_unique( -++ orcus::make_unique( -+ *this, sheet_name_safe, sheet_index, row_size, col_size)); -+ -+ mp_impl->m_context.append_sheet( -+-- -+2.4.5 -+ -Index: libreoffice-5.1.3.2/external/liborcus/0001-Get-it-to-build-on-Windows.patch -=================================================================== ---- /dev/null -+++ libreoffice-5.1.3.2/external/liborcus/0001-Get-it-to-build-on-Windows.patch -@@ -0,0 +1,212 @@ -+From c5d7282214727bcc28b6ec7e2b8016b40872cd3b Mon Sep 17 00:00:00 2001 -+From: Kohei Yoshida -+Date: Mon, 7 Mar 2016 18:35:23 -0500 -+Subject: [PATCH] Get it to build on Windows. -+ -+--- -+ include/orcus/json_parser.hpp | 32 +++++++++++++------------------- -+ include/orcus/parser_global.hpp | 4 ++-- -+ src/liborcus/json_document_tree.cpp | 2 +- -+ src/liborcus/json_util.cpp | 4 ++-- -+ src/liborcus/yaml_document_tree.cpp | 4 +++- -+ src/parser/parser_global.cpp | 3 +++ -+ src/parser/pstring.cpp | 1 + -+ src/parser/stream.cpp | 4 ++-- -+ src/parser/yaml_parser_base.cpp | 17 ++++++----------- -+ 9 files changed, 33 insertions(+), 38 deletions(-) -+ -+diff --git a/include/orcus/json_parser.hpp b/include/orcus/json_parser.hpp -+index 5d733fb..183b831 100644 -+--- a/include/orcus/json_parser.hpp -++++ b/include/orcus/json_parser.hpp -+@@ -204,16 +204,13 @@ void json_parser<_Handler>::object() -+ if (!res.str) -+ { -+ // Parsing was unsuccessful. -+- switch (res.length) -+- { -+- case parse_quoted_string_state::error_no_closing_quote: -+- throw json::parse_error("object: stream ended prematurely before reaching the closing quote of a key.", offset()); -+- case parse_quoted_string_state::error_illegal_escape_char: -+- json::parse_error::throw_with( -+- "object: illegal escape character '", cur_char(), "' in key value.", offset()); -+- default: -+- throw json::parse_error("object: unknown error while parsing a key value.", offset()); -+- } -++ if (res.length == parse_quoted_string_state::error_no_closing_quote) -++ throw json::parse_error("object: stream ended prematurely before reaching the closing quote of a key.", offset()); -++ else if (res.length == parse_quoted_string_state::error_illegal_escape_char) -++ json::parse_error::throw_with( -++ "object: illegal escape character '", cur_char(), "' in key value.", offset()); -++ else -++ throw json::parse_error("object: unknown error while parsing a key value.", offset()); -+ } -+ -+ m_handler.object_key(res.str, res.length, res.transient); -+@@ -297,15 +294,12 @@ void json_parser<_Handler>::string() -+ } -+ -+ // Parsing was unsuccessful. -+- switch (res.length) -+- { -+- case parse_quoted_string_state::error_no_closing_quote: -+- throw json::parse_error("string: stream ended prematurely before reaching the closing quote.", offset()); -+- case parse_quoted_string_state::error_illegal_escape_char: -+- json::parse_error::throw_with("string: illegal escape character '", cur_char(), "'.", offset()); -+- default: -+- throw json::parse_error("string: unknown error.", offset()); -+- } -++ if (res.length == parse_quoted_string_state::error_no_closing_quote) -++ throw json::parse_error("string: stream ended prematurely before reaching the closing quote.", offset()); -++ else if (res.length == parse_quoted_string_state::error_illegal_escape_char) -++ json::parse_error::throw_with("string: illegal escape character '", cur_char(), "'.", offset()); -++ else -++ throw json::parse_error("string: unknown error.", offset()); -+ } -+ -+ } -+diff --git a/include/orcus/parser_global.hpp b/include/orcus/parser_global.hpp -+index 6fab254..b76aec4 100644 -+--- a/include/orcus/parser_global.hpp -++++ b/include/orcus/parser_global.hpp -+@@ -31,8 +31,8 @@ enum class string_escape_char_t -+ */ -+ struct parse_quoted_string_state -+ { -+- static constexpr size_t error_no_closing_quote = 1; -+- static constexpr size_t error_illegal_escape_char = 2; -++ ORCUS_PSR_DLLPUBLIC static const size_t error_no_closing_quote; -++ ORCUS_PSR_DLLPUBLIC static const size_t error_illegal_escape_char; -+ -+ const char* str; -+ size_t length; -+diff --git a/src/liborcus/json_document_tree.cpp b/src/liborcus/json_document_tree.cpp -+index 81289e1..2fb8a41 100644 -+--- a/src/liborcus/json_document_tree.cpp -++++ b/src/liborcus/json_document_tree.cpp -+@@ -54,7 +54,7 @@ using json_value = json::detail::json_value; -+ using node_t = json::detail::node_t; -+ -+ const char* tab = " "; -+-constexpr char quote = '"'; -++const char quote = '"'; -+ -+ const xmlns_id_t NS_orcus_json_xml = "http://schemas.kohei.us/orcus/2015/json"; -+ -+diff --git a/src/liborcus/json_util.cpp b/src/liborcus/json_util.cpp -+index 37bd2b0..8f593cd 100644 -+--- a/src/liborcus/json_util.cpp -++++ b/src/liborcus/json_util.cpp -+@@ -11,8 +11,8 @@ namespace orcus { namespace json { -+ -+ namespace { -+ -+-constexpr char quote = '"'; -+-constexpr char backslash = '\\'; -++const char quote = '"'; -++const char backslash = '\\'; -+ -+ } -+ -+diff --git a/src/liborcus/yaml_document_tree.cpp b/src/liborcus/yaml_document_tree.cpp -+index 5aad4f2..27bb7e8 100644 -+--- a/src/liborcus/yaml_document_tree.cpp -++++ b/src/liborcus/yaml_document_tree.cpp -+@@ -155,6 +155,8 @@ struct parser_stack -+ yaml_value* node; -+ -+ parser_stack(yaml_value* _node) : node(_node) {} -++ parser_stack(const parser_stack&) = delete; -++ parser_stack(parser_stack&& r) : key(std::move(r.key)), node(r.node) {} -+ }; -+ -+ typedef std::unique_ptr document_root_type; -+@@ -577,7 +579,7 @@ const char* kw_false = "false"; -+ const char* kw_tilde = "~"; -+ const char* kw_null = "null"; -+ -+-constexpr char quote = '"'; -++const char quote = '"'; -+ -+ void dump_indent(std::ostringstream& os, size_t scope) -+ { -+diff --git a/src/parser/parser_global.cpp b/src/parser/parser_global.cpp -+index 6e6b656..4023689 100644 -+--- a/src/parser/parser_global.cpp -++++ b/src/parser/parser_global.cpp -+@@ -12,6 +12,9 @@ -+ -+ namespace orcus { -+ -++const size_t parse_quoted_string_state::error_no_closing_quote = 1; -++const size_t parse_quoted_string_state::error_illegal_escape_char = 2; -++ -+ bool is_blank(char c) -+ { -+ return is_in(c, " \t\n\r"); -+diff --git a/src/parser/pstring.cpp b/src/parser/pstring.cpp -+index 303e88e..50ab2ca 100644 -+--- a/src/parser/pstring.cpp -++++ b/src/parser/pstring.cpp -+@@ -12,6 +12,7 @@ -+ #include -+ #include -+ #include -++#include -+ -+ using namespace std; -+ -+diff --git a/src/parser/stream.cpp b/src/parser/stream.cpp -+index 00a24a0..eb73dcc 100644 -+--- a/src/parser/stream.cpp -++++ b/src/parser/stream.cpp -+@@ -85,7 +85,7 @@ std::string create_parse_error_output(const std::string& strm, std::ptrdiff_t of -+ if (offset < 0) -+ return std::string(); -+ -+- constexpr size_t max_line_length = 60; -++ const size_t max_line_length = 60; -+ -+ auto line_info = find_line_with_offset(strm, offset); -+ pstring line = std::get<0>(line_info); -+@@ -113,7 +113,7 @@ std::string create_parse_error_output(const std::string& strm, std::ptrdiff_t of -+ // The error line is too long. Only show a segment of the line where the -+ // error occurred. -+ -+- constexpr size_t fixed_offset = 20; -++ const size_t fixed_offset = 20; -+ -+ size_t line_start = offset_on_line - fixed_offset; -+ size_t line_end = line_start + max_line_length; -+diff --git a/src/parser/yaml_parser_base.cpp b/src/parser/yaml_parser_base.cpp -+index 3c93266..c6e7939 100644 -+--- a/src/parser/yaml_parser_base.cpp -++++ b/src/parser/yaml_parser_base.cpp -+@@ -289,18 +289,13 @@ void throw_quoted_string_parse_error(const char* func_name, const parse_quoted_s -+ { -+ std::ostringstream os; -+ os << func_name << ": failed to parse "; -+- switch (ret.length) -+- { -+- case parse_quoted_string_state::error_illegal_escape_char: -+- os << "due to the presence of illegal escape character."; -+- break; -+- case parse_quoted_string_state::error_no_closing_quote: -+- os << "because the closing quote was not found."; -+- break; -+- default: -+- os << "due to unknown reason."; -++ if (ret.length == parse_quoted_string_state::error_illegal_escape_char) -++ os << "due to the presence of illegal escape character."; -++ else if (ret.length == parse_quoted_string_state::error_no_closing_quote) -++ os << "because the closing quote was not found."; -++ else -++ os << "due to unknown reason."; -+ -+- } -+ throw parse_error(os.str()); -+ } -+ -+-- -+1.8.1.msysgit.1 -+ -Index: libreoffice-5.1.3.2/external/liborcus/ExternalPackage_liborcus.mk -=================================================================== ---- libreoffice-5.1.3.2.orig/external/liborcus/ExternalPackage_liborcus.mk -+++ libreoffice-5.1.3.2/external/liborcus/ExternalPackage_liborcus.mk -@@ -12,11 +12,11 @@ $(eval $(call gb_ExternalPackage_Externa - $(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: -Index: libreoffice-5.1.3.2/external/liborcus/ExternalProject_liborcus.mk -=================================================================== ---- libreoffice-5.1.3.2.orig/external/liborcus/ExternalProject_liborcus.mk -+++ libreoffice-5.1.3.2/external/liborcus/ExternalProject_liborcus.mk -@@ -13,6 +13,7 @@ $(eval $(call gb_ExternalProject_use_aut - - $(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_targ - , \ - --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_targ - $(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 \ - ) \ - ) - -Index: libreoffice-5.1.3.2/external/liborcus/Library_orcus-parser.mk -=================================================================== ---- libreoffice-5.1.3.2.orig/external/liborcus/Library_orcus-parser.mk -+++ libreoffice-5.1.3.2/external/liborcus/Library_orcus-parser.mk -@@ -39,6 +39,8 @@ $(eval $(call gb_Library_add_generated_e - 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_e - 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 \ - )) -Index: libreoffice-5.1.3.2/external/liborcus/Library_orcus.mk -=================================================================== ---- libreoffice-5.1.3.2.orig/external/liborcus/Library_orcus.mk -+++ libreoffice-5.1.3.2/external/liborcus/Library_orcus.mk -@@ -13,6 +13,7 @@ $(eval $(call gb_Library_use_unpacked,or - - $(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_e - 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_e - 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_e - 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: -Index: libreoffice-5.1.3.2/external/liborcus/UnpackedTarball_liborcus.mk -=================================================================== ---- libreoffice-5.1.3.2.orig/external/liborcus/UnpackedTarball_liborcus.mk -+++ libreoffice-5.1.3.2/external/liborcus/UnpackedTarball_liborcus.mk -@@ -16,8 +16,15 @@ $(eval $(call gb_UnpackedTarball_set_pat - $(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 \ -+ external/liborcus/0001-Fix-for-OSX-build-inside-LibreOffice.patch \ -+ external/liborcus/0001-Get-it-to-build-on-Windows.patch \ - )) - -+ifeq ($(OS),WNT) -+$(eval $(call gb_UnpackedTarball_add_patches,liborcus,\ -+ external/liborcus/windows-constants-hack.patch \ -+)) -+endif -+ -+ - # vim: set noet sw=4 ts=4: -Index: libreoffice-5.1.3.2/external/liborcus/fix-crash-ooo55043-1.patch.0 -=================================================================== ---- libreoffice-5.1.3.2.orig/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."); -- -Index: libreoffice-5.1.3.2/external/liborcus/unusedheader.patch.0 -=================================================================== ---- libreoffice-5.1.3.2.orig/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 -- #include -- ---#include --- -- using namespace std; -- -- namespace orcus { -Index: libreoffice-5.1.3.2/external/liborcus/windows-constants-hack.patch -=================================================================== ---- /dev/null -+++ libreoffice-5.1.3.2/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 { -+ -Index: libreoffice-5.1.3.2/sc/Library_scfilt.mk -=================================================================== ---- libreoffice-5.1.3.2.orig/sc/Library_scfilt.mk -+++ libreoffice-5.1.3.2/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 \ -Index: libreoffice-5.1.3.2/sc/source/filter/inc/orcusinterface.hxx -=================================================================== ---- libreoffice-5.1.3.2.orig/sc/source/filter/inc/orcusinterface.hxx -+++ libreoffice-5.1.3.2/sc/source/filter/inc/orcusinterface.hxx -@@ -381,6 +381,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, -@@ -431,6 +432,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; - }; - -Index: libreoffice-5.1.3.2/sc/source/filter/orcus/filterdetect.cxx -=================================================================== ---- libreoffice-5.1.3.2.orig/sc/source/filter/orcus/filterdetect.cxx -+++ libreoffice-5.1.3.2/sc/source/filter/orcus/filterdetect.cxx -@@ -93,7 +93,7 @@ OUString OrcusFormatDetect::detect(css:: - } - - orcus::format_t eFormat = orcus::detect(reinterpret_cast(aContent.getStr()), aContent.getLength()); -- if (eFormat == orcus::format_gnumeric) -+ if (eFormat == orcus::format_t::gnumeric) - return OUString("Gnumeric XML"); - - return OUString(); -Index: libreoffice-5.1.3.2/sc/source/filter/orcus/interface.cxx -=================================================================== ---- libreoffice-5.1.3.2.orig/sc/source/filter/orcus/interface.cxx -+++ libreoffice-5.1.3.2/sc/source/filter/orcus/interface.cxx -@@ -55,7 +55,7 @@ void ScOrcusGlobalSettings::set_default_ - - 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, - { - 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( - { - 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 getCalc - 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_d - { - 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: -@@ -948,15 +948,15 @@ void ScOrcusStyles::set_font_underline(o - { - 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; - } -@@ -1020,6 +1020,12 @@ void ScOrcusStyles::set_border_style(orc - // 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, -@@ -1187,6 +1193,11 @@ void ScOrcusStyles::set_cell_style_built - 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); diff --git a/0001-mdds-1.0.patch b/0001-mdds-1.0.patch deleted file mode 100644 index dbf1aaf..0000000 --- a/0001-mdds-1.0.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a7c3a2a9be83686657c06f37d521f9f6d2004ddd Mon Sep 17 00:00:00 2001 -From: Markus Mohrhard -Date: Fri, 9 Oct 2015 01:03:29 +0200 -Subject: update to mdds 1.0 - -Change-Id: I5b6e928ab5a5f2bf84d50f3f0221c0585670d972 -Reviewed-on: https://gerrit.libreoffice.org/20251 -Tested-by: Jenkins -Reviewed-by: Markus Mohrhard -Tested-by: Markus Mohrhard - -diff --git a/configure.ac b/configure.ac -index 57a41f7..e00df959 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -8759,7 +8759,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.0 >= 1.0.0], ["-I${WORKDIR}/UnpackedTarball/mdds/include"]) - - dnl =================================================================== - dnl Check for system glm - diff --git a/0002-boost-filesystem1.patch b/0002-boost-filesystem1.patch deleted file mode 100644 index cdffdf5..0000000 --- a/0002-boost-filesystem1.patch +++ /dev/null @@ -1,158 +0,0 @@ -From ed41a33ca22f46b123df4132d376247682af07af Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Tue, 8 Mar 2016 06:23:24 +0100 -Subject: detect Boost.Filesystem - -Change-Id: I86c268f49f44bd1e208a9de781a16bf19450c64c - -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 . -+# -+# This macro calls: -+# -+# AC_SUBST(BOOST_FILESYSTEM_LIB) -+# -+# And sets: -+# -+# HAVE_BOOST_FILESYSTEM -+# -+# LICENSE -+# -+# Copyright (c) 2009 Thomas Porschberg -+# Copyright (c) 2009 Michael Tindal -+# Copyright (c) 2009 Roman Rybalko -+# -+# 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 ]], -+ [[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 -+]) --- -cgit v0.10.2 - diff --git a/0003-boost-filesystem2.patch b/0003-boost-filesystem2.patch deleted file mode 100644 index f48d784..0000000 --- a/0003-boost-filesystem2.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b4339fa7eee12f173b2273aed5dc6b8abae528f4 Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Tue, 8 Mar 2016 06:08:36 +0100 -Subject: define boost_filestystem external for system boost too - -Change-Id: Ie9bfc6a5f3e1862acbd1bb08c6f2bb0b63f2587e - -Index: libreoffice-5.1.1.3/RepositoryExternal.mk -=================================================================== ---- libreoffice-5.1.1.3.orig/RepositoryExternal.mk -+++ libreoffice-5.1.1.3/RepositoryExternal.mk -@@ -676,6 +676,13 @@ $(call gb_LinkTarget_add_libs,$(1),\ - - 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_set_include,$(1),\ - $$(INCLUDE) \ diff --git a/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz b/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz deleted file mode 100644 index 9abd3a2..0000000 --- a/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776 -size 96939 diff --git a/10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2 b/10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2 deleted file mode 100644 index b091a60..0000000 --- a/10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9595601c41051356d03d0a7d5dcad334fe1b420d221f6885d143c14bb8d62163 -size 1129140 diff --git a/17df8301bcc459e83f8a8f3aca6183b2-graphite-minimal-1.3.6.tgz b/17df8301bcc459e83f8a8f3aca6183b2-graphite-minimal-1.3.6.tgz deleted file mode 100644 index 4672cde..0000000 --- a/17df8301bcc459e83f8a8f3aca6183b2-graphite-minimal-1.3.6.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:db27e1a6092b8ea00b5f8eec2a3ea500756fbb769c1023a1afc3386c5918d1b8 -size 154437 diff --git a/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz b/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz deleted file mode 100644 index 1574547..0000000 --- a/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a -size 1652670 diff --git a/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz b/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz deleted file mode 100644 index 1f099c7..0000000 --- a/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:171816288f14215c69e730f7a4f1c325739873e21f946ff83884b350574e6695 -size 769268 diff --git a/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz b/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz deleted file mode 100644 index ce3caeb..0000000 --- a/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f9a496d3418b0e15894fb351652cd4fa5ca434ebfc3ce3bb8da40defd8b097f2 -size 1882664 diff --git a/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz b/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz deleted file mode 100644 index 7a52ac3..0000000 --- a/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ae7bc26118cf1b58d8bed62ed364612d5a2380ad14acb03ca88ff3bab22b2e8b -size 262206 diff --git a/32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz b/32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz deleted file mode 100644 index 57627b9..0000000 --- a/32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d9a274fc086e61119d5c9beafb8d05527e040ec86f4c0961276ca8de0a049dbd -size 1624112 diff --git a/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip b/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip deleted file mode 100644 index 9bac764..0000000 --- a/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b -size 1180582 diff --git a/3941e9cab2f4f9d8faee3e8d57ae7664-glew-1.12.0.zip b/3941e9cab2f4f9d8faee3e8d57ae7664-glew-1.12.0.zip deleted file mode 100644 index 6cebf8c..0000000 --- a/3941e9cab2f4f9d8faee3e8d57ae7664-glew-1.12.0.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6f1083eb034efbc3b2017ef052d58f3e9bd70963ec2acd26b3d59231ee1633d4 -size 925313 diff --git a/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip b/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip deleted file mode 100644 index 451c1f5..0000000 --- a/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045 -size 153157 diff --git a/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip b/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip deleted file mode 100644 index 5d3558d..0000000 --- a/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e0531091787c0f16c83965fdcbc49162c059d7f0c64669e7f119699321549743 -size 5750610 diff --git a/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz b/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz deleted file mode 100644 index ae107e9..0000000 --- a/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab -size 2241498 diff --git a/4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz b/4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz deleted file mode 100644 index 96e8349..0000000 --- a/4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e26fb9c18e6ebf71100f434070d50196a21d592b715e361850c3b4e789b5f6ef -size 1788163 diff --git a/5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz b/5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz deleted file mode 100644 index c5c6e15..0000000 --- a/5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a87e02913dee3ee659db5abf6d7dafcfcd85dd4b24bf4389d8d4afe8c8dcf9b6 -size 738119 diff --git a/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz b/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz deleted file mode 100644 index 490d60b..0000000 --- a/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705 -size 638369 diff --git a/625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz b/625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz deleted file mode 100644 index 39de5ce..0000000 --- a/625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2445238cd0eb167e99a1147394f61325490559f3df7e7e8f628043fb70cbf2f4 -size 522654 diff --git a/7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz b/7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz deleted file mode 100644 index a4e94bf..0000000 --- a/7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a25f14dad39e93a2f9cdf09166ee53981f7212dce829e4208e07a522963a8585 -size 506106 diff --git a/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip b/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip deleted file mode 100644 index 728e5d6..0000000 --- a/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:abe2c57ac12ba45d83563b02e240fa95d973376de2f720aab8fe11f2e621c095 -size 762419 diff --git a/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip b/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip deleted file mode 100644 index ed38746..0000000 --- a/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3d853b19b1d94a6efa69e7af90f7f2b09ecf302913bee3da796c15ecfebcfac8 -size 2938721 diff --git a/Firebird-2.5.4.26856-0.tar.bz2 b/Firebird-2.5.4.26856-0.tar.bz2 deleted file mode 100644 index 4b587a6..0000000 --- a/Firebird-2.5.4.26856-0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4e775dcf218640d3af507a816aef0060f52a295b9ee5f66ec66f0b0564da18d3 -size 13744859 diff --git a/_constraints b/_constraints index fb0f5f3..2c6e2ea 100644 --- a/_constraints +++ b/_constraints @@ -9,7 +9,7 @@ 2000 - 40 + 30 @@ -22,10 +22,10 @@ - 4000 + 6000 - 40 + 30 diff --git a/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz b/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz deleted file mode 100644 index 62cd73f..0000000 --- a/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60 -size 1923436 diff --git a/aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.tar.bz2 b/aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.tar.bz2 deleted file mode 100644 index 401b443..0000000 --- a/aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:08e2f64bfe3f750be7391eb0af53967e164b628c59f02be4d83789eb4f036eaa -size 672452 diff --git a/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip b/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip deleted file mode 100644 index 1d547e9..0000000 --- a/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66 -size 2929311 diff --git a/b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz b/b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz deleted file mode 100644 index 0a2e22a..0000000 --- a/b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:abf0e93d80cc79bdf383fd3e904255bf98bc729356d6cf2f673bce74b08b1cfd -size 1469921 diff --git a/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip b/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip deleted file mode 100644 index 3c982e6..0000000 --- a/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd -size 743031 diff --git a/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip b/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip deleted file mode 100644 index 75d89aa..0000000 --- a/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a -size 5290295 diff --git a/bnc856729.patch b/bnc856729.patch deleted file mode 100644 index f0f1990..0000000 --- a/bnc856729.patch +++ /dev/null @@ -1,155 +0,0 @@ -From a5928a57a53df84cacd2975e227f9e03d50456a6 Mon Sep 17 00:00:00 2001 -From: Miklos Vajna -Date: Fri, 15 Apr 2016 15:46:06 +0200 -Subject: [PATCH] tdf#99315 VclPixelProcessor2D: fix double border line width - -Regression from commit 2c91cb08d65cd35fa8ef6eaca3677aa82fb58cbe (better -drawing support for borders of different width, fdo#33634, 2012-04-04), -the problem is that previously the width of inner/outer double border -lines got rounded to integer values quite early, but after the commit -they are kept at a double precision for much longer, which needs pixel -correction in VclPixelProcessor2D. - -Example: if the border with is 1.47, and the line gets moved by 0.2 -pixels, then the inner and outer edge of the line will be 0.2 and 1.67, -which gets rounded to 0 -> 2 in the pixel processor. Previously the -input was rounded to 1, so moving by 0.2 resulted in 0.2 -> 1.2, which -got rounded to 0 -> 1. The result is that sometimes the line width is 1 -pixel wider than expected. - -Fix the problem by allowing VclPixelProcessor2D to request pixel -correction from BorderLinePrimitive2D. It wouldn't be possible to do -pixel correction only in VclPixelProcessor2D, as it has no idea what to -correct: it only gets polygons, so it has no idea if e.g. the top of a -polygon is the outer edge of a top border line or an inner edge of a -bottom border line. - -Conflicts: - drawinglayer/source/primitive2d/borderlineprimitive2d.cxx - -(cherry picked from commits 1ee570a4e625719f8bf270d372926c0d829ae6f0, -555c9add26e06030402c73f885de98f4b96826f0, -304f50684d3ac08e973fd27e6acf3e821394d164, -422f10c5d7ebe6f4b778636c9c1eb6dbdf708a27, -ce12a5021a080cc1781e0e0256af5e0085e11ef2 and -cac70559013e575009657aa3c5168b88b1f14691) - -Change-Id: I1971f3a952fbcdc598ab46c659e12d976c13cbe6 -Reviewed-on: https://gerrit.libreoffice.org/24238 -Tested-by: Jenkins -Reviewed-by: Eike Rathke -Tested-by: Eike Rathke ---- - drawinglayer/CppunitTest_drawinglayer_border.mk | 52 +++++++ - drawinglayer/Module_drawinglayer.mk | 4 + - drawinglayer/qa/unit/border.cxx | 150 +++++++++++++++++++++ - .../source/primitive2d/borderlineprimitive2d.cxx | 28 +++- - .../source/processor2d/vclpixelprocessor2d.cxx | 7 +- - .../primitive2d/borderlineprimitive2d.hxx | 2 + - 6 files changed, 239 insertions(+), 4 deletions(-) - create mode 100644 drawinglayer/CppunitTest_drawinglayer_border.mk - create mode 100644 drawinglayer/qa/unit/border.cxx - -diff --git a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx -index 30e656d..30e7dcb 100644 ---- a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx -+++ b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx -@@ -28,6 +28,17 @@ - #include - #include - -+#if defined(ANDROID) -+namespace std -+{ -+template -+T round(T x) -+{ -+ return ::round(x); -+} -+} -+#endif -+ - namespace drawinglayer { - - namespace { -@@ -63,7 +74,7 @@ primitive2d::Primitive2DReference makeSolidLinePrimitive( - const basegfx::B2DVector& rVector, const basegfx::BColor& rColor, double fLineWidth, double fGap) - { - const basegfx::B2DVector aPerpendicular = basegfx::getPerpendicular(rVector); -- const basegfx::B2DVector aLineWidthOffset = ((fLineWidth + 1.0) * 0.5) * aPerpendicular; -+ const basegfx::B2DVector aLineWidthOffset = (fLineWidth * 0.5) * aPerpendicular; - - basegfx::B2DPolygon aPolygon; - aPolygon.append(rStart + aLineWidthOffset); -@@ -163,6 +174,11 @@ primitive2d::Primitive2DReference makeSolidLinePrimitive( - - Primitive2DSequence BorderLinePrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const - { -+ return createDecomposition(rViewInformation, false); -+ } -+ -+ Primitive2DSequence BorderLinePrimitive2D::createDecomposition(const geometry::ViewInformation2D& rViewInformation, bool bPixelCorrection) const -+ { - Primitive2DSequence xRetval; - - if(!getStart().equal(getEnd()) && ( isInsideUsed() || isOutsideUsed() ) ) -@@ -199,8 +215,11 @@ primitive2d::Primitive2DReference makeSolidLinePrimitive( - xRetval[0] = makeHairLinePrimitive( - getStart(), getEnd(), aVector, getRGBColorLeft(), 0.0); - else -+ { -+ double fWidth = bPixelCorrection ? std::round(fLeftWidth) : fLeftWidth; - xRetval[0] = makeSolidLinePrimitive( -- aClipRegion, aTmpStart, aTmpEnd, aVector, getRGBColorLeft(), fLeftWidth, -fLeftWidth/2.0); -+ aClipRegion, aTmpStart, aTmpEnd, aVector, getRGBColorLeft(), fWidth, -fLeftWidth/2.0); -+ } - - // "outside" line - -@@ -208,8 +227,11 @@ primitive2d::Primitive2DReference makeSolidLinePrimitive( - xRetval[1] = makeHairLinePrimitive( - getStart(), getEnd(), aVector, getRGBColorRight(), fLeftWidth+mfDistance); - else -+ { -+ double fWidth = bPixelCorrection ? std::round(fRightWidth) : fRightWidth; - xRetval[1] = makeSolidLinePrimitive( -- aClipRegion, aTmpStart, aTmpEnd, aVector, getRGBColorRight(), fRightWidth, mfDistance+fRightWidth/2.0); -+ aClipRegion, aTmpStart, aTmpEnd, aVector, getRGBColorRight(), fWidth, mfDistance+fRightWidth/2.0); -+ } - } - else - { -diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx -index 8dcd74e..8398573 100644 ---- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx -+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx -@@ -1232,7 +1232,12 @@ namespace drawinglayer - static_cast(rCandidate); - - if (!tryDrawBorderLinePrimitive2DDirect(rBorder)) -- process(rCandidate.get2DDecomposition(getViewInformation2D())); -+ { -+ if (rBorder.getStyle() == table::BorderLineStyle::DOUBLE) -+ process(rBorder.createDecomposition(getViewInformation2D(), true)); -+ else -+ process(rCandidate.get2DDecomposition(getViewInformation2D())); -+ } - - mpOutputDevice->SetAntialiasing(nAntiAliasing); - break; -diff --git a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx -index 72e04d5..f152f2d 100644 ---- a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx -+++ b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx -@@ -132,6 +132,8 @@ namespace drawinglayer - bool hasGapColor( ) const { return mbHasGapColor; } - short getStyle () const { return mnStyle; } - double getPatternScale() const { return mfPatternScale; } -+ /// Same as create2DDecomposition(), but can do pixel correction if requested. -+ Primitive2DSequence createDecomposition(const geometry::ViewInformation2D& rViewInformation, bool bPixelCorrection) const; - - /// compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; --- -2.6.6 - diff --git a/bnc939998.patch b/bnc939998.patch deleted file mode 100644 index 5acc029..0000000 --- a/bnc939998.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 940b21a87cffffca0985c33e9ebb78ddf3aa0c3b Mon Sep 17 00:00:00 2001 -From: Mike Kaganski -Date: Wed, 13 Apr 2016 20:07:52 +1000 -Subject: [PATCH] tdf#93124: Fix incorrect text fit in imported PPT - take two - -This patch just fixes incorrect decision when the block alignment must -be applied. - -diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx -index 437207f..7ac251c 100644 ---- a/filter/source/msfilter/svdfppt.cxx -+++ b/filter/source/msfilter/svdfppt.cxx -@@ -893,7 +893,6 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi - eTHA = SDRTEXTHORZADJUST_LEFT; - break; - } -- // if there is a 100% use of following attributes, the textbox can been aligned also in vertical direction - switch ( eTextAnchor ) - { - case mso_anchorTopCentered : -@@ -903,20 +902,20 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi - case mso_anchorBottomCenteredBaseline: - { - // check if it is sensible to use the centered alignment -- sal_uInt32 nMask = PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_LEFT | PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_RIGHT; -- if ( ( nTextFlags & nMask ) != nMask ) // if the textobject has left and also right aligned pararagraphs -- eTVA = SDRTEXTVERTADJUST_CENTER; // the text has to be displayed using the full width; -- } -- break; -- -- default : -- { -- if ( nTextFlags == PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_LEFT ) -- eTVA = SDRTEXTVERTADJUST_TOP; -- else if ( nTextFlags == PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_RIGHT ) -- eTVA = SDRTEXTVERTADJUST_BOTTOM; -+ const sal_uInt32 nMask = PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_LEFT | PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_CENTER | PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_RIGHT | PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_BLOCK; -+ switch (nTextFlags & nMask) -+ { -+ case PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_LEFT: -+ case PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_CENTER: -+ case PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_RIGHT: -+ case PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_BLOCK: -+ eTVA = SDRTEXTVERTADJUST_CENTER; // If the textobject has only one type of alignment, then the text has not to be displayed using the full width; -+ break; -+ } -+ break; - } -- break; -+ default: -+ break; - } - nMinFrameWidth = rTextRect.GetWidth() - ( nTextLeft + nTextRight ); - } -@@ -949,7 +948,6 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi - eTVA = SDRTEXTVERTADJUST_BOTTOM; - break; - } -- // if there is a 100% usage of following attributes, the textbox can be aligned also in horizontal direction - switch ( eTextAnchor ) - { - case mso_anchorTopCentered : -@@ -959,20 +957,20 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi - case mso_anchorBottomCenteredBaseline: - { - // check if it is sensible to use the centered alignment -- sal_uInt32 nMask = PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_LEFT | PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_RIGHT; -- if ( ( nTextFlags & nMask ) != nMask ) // if the textobject has left and also right aligned pararagraphs -- eTHA = SDRTEXTHORZADJUST_CENTER; // the text has to be displayed using the full width; -- } -- break; -- -- default : -- { -- if ( nTextFlags == PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_LEFT ) -- eTHA = SDRTEXTHORZADJUST_LEFT; -- else if ( nTextFlags == PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_RIGHT ) -- eTHA = SDRTEXTHORZADJUST_RIGHT; -+ const sal_uInt32 nMask = PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_LEFT | PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_CENTER | PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_RIGHT | PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_BLOCK; -+ switch (nTextFlags & nMask) -+ { -+ case PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_LEFT: -+ case PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_CENTER: -+ case PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_RIGHT: -+ case PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_BLOCK: -+ eTHA = SDRTEXTHORZADJUST_CENTER; // If the textobject has only one type of alignment, then the text has not to be displayed using the full width; -+ break; -+ } -+ break; - } -- break; -+ default: -+ break; - } - nMinFrameHeight = rTextRect.GetHeight() - ( nTextTop + nTextBottom ); - } diff --git a/bnc945443.patch b/bnc945443.patch deleted file mode 100644 index c2ad247..0000000 --- a/bnc945443.patch +++ /dev/null @@ -1,187 +0,0 @@ -From 64b2f209b72c5a5662afcb0ac1706b882e0e059b Mon Sep 17 00:00:00 2001 -From: Miklos Vajna -Date: Tue, 19 Apr 2016 17:38:14 +0200 -Subject: [PATCH] tdf#99396 SvxTableController::SetVertical: implement undo - support - -All the table and cell objects know how to undo this change, what was -missing is the begin/end undo calls and the broadcast of the cell -format change. - -(cherry picked from commits 3057b5cdb989d44613518900b25ebad8b7c600a2, -d60d70d92cec7bbc471f8f0c653d443282227d34, -6819992113947e7a6272bf750fee712c2df41905 and -100eb15b4d8529d7a11d98a28742f31f0f792fa1) - -Conflicts: - sd/qa/unit/misc-tests.cxx - -Change-Id: I3dfd203faf5c579da2937fedab5647129a8e903a -Reviewed-on: https://gerrit.libreoffice.org/24276 -Tested-by: Jenkins -Reviewed-by: Andras Timar ---- - include/svx/svdotable.hxx | 4 ++ - sd/inc/drawdoc.hxx | 2 +- - sd/qa/unit/data/tdf99396.odp | Bin 0 -> 10956 bytes - sd/qa/unit/misc-tests.cxx | 104 +++++++++++++++++++++++++++++++++ - sd/source/ui/table/TableDesignPane.cxx | 10 +++- - svx/source/table/cell.cxx | 5 ++ - svx/source/table/svdotable.cxx | 12 ++++ - svx/source/table/tablecontroller.cxx | 18 +++++- - 8 files changed, 152 insertions(+), 3 deletions(-) - create mode 100644 sd/qa/unit/data/tdf99396.odp - -diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx -index 78a7e53c..f70d768 100644 ---- a/include/svx/svdotable.hxx -+++ b/include/svx/svdotable.hxx -@@ -31,6 +31,7 @@ - - class SvStream; - class SfxStyleSheet; -+class SdrUndoAction; - - namespace sdr { namespace contact { - class ViewContactOfTableObj; -@@ -257,6 +258,9 @@ public: - - css::text::WritingMode GetWritingMode() const; - -+ /// Add an undo action that should be on the undo stack after ending text edit. -+ void AddUndo(SdrUndoAction* pUndo); -+ - virtual void onEditOutlinerStatusEvent( EditStatus* pEditStatus ) override; - - -diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx -index e2ff20c..ee8a876 100644 ---- a/sd/inc/drawdoc.hxx -+++ b/sd/inc/drawdoc.hxx -@@ -571,7 +571,7 @@ public: - languages set at this document */ - SAL_DLLPRIVATE void getDefaultFonts( vcl::Font& rLatinFont, vcl::Font& rCJKFont, vcl::Font& rCTLFont ); - -- SAL_DLLPRIVATE sd::UndoManager* GetUndoManager() const; -+ sd::UndoManager* GetUndoManager() const; - - /** converts the given western font height to a corresponding ctl font height, depending on the system language */ - SAL_DLLPRIVATE static sal_uInt32 convertFontHeightToCTL( sal_uInt32 nWesternFontHeight ); -diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx -index 2bd52b5..4ae2e1d 100644 ---- a/sd/source/ui/table/TableDesignPane.cxx -+++ b/sd/source/ui/table/TableDesignPane.cxx -@@ -806,7 +806,15 @@ short TableDesignDialog::Execute() - - VclPtr createTableDesignPanel( vcl::Window* pParent, ViewShellBase& rBase ) - { -- return VclPtr::Create( pParent, rBase ); -+ VclPtr pRet = nullptr; -+ try -+ { -+ pRet = VclPtr::Create( pParent, rBase ); -+ } -+ catch (const uno::Exception&) -+ { -+ } -+ return pRet; - } - - void showTableDesignDialog( vcl::Window* pParent, ViewShellBase& rBase ) -diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx -index b2d1604..c783cb1 100644 ---- a/svx/source/table/cell.cxx -+++ b/svx/source/table/cell.cxx -@@ -799,6 +799,11 @@ void Cell::AddUndo() - { - CellRef xCell( this ); - GetModel()->AddUndo( new CellUndo( &rObj, xCell ) ); -+ -+ // Undo action for the after-text-edit-ended stack. -+ SdrTableObj* pTableObj = dynamic_cast(&rObj); -+ if (pTableObj && pTableObj->IsTextEditActive()) -+ pTableObj->AddUndo(new CellUndo(pTableObj, xCell)); - } - } - -diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx -index 15bbb7f..5b979fe 100644 ---- a/svx/source/table/svdotable.cxx -+++ b/svx/source/table/svdotable.cxx -@@ -205,6 +205,7 @@ public: - CellPos maEditPos; - TableStyleSettings maTableStyle; - Reference< XIndexAccess > mxTableStyle; -+ std::vector> maUndos; - - void SetModel(SdrModel* pOldModel, SdrModel* pNewModel); - -@@ -1860,7 +1861,14 @@ void SdrTableObj::EndTextEdit(SdrOutliner& rOutl) - if(rOutl.IsModified()) - { - if( GetModel() && GetModel()->IsUndoEnabled() ) -+ { -+ // These actions should be on the undo stack after text edit. -+ for (std::unique_ptr& pAction : mpImpl->maUndos) -+ GetModel()->AddUndo(pAction.release()); -+ mpImpl->maUndos.clear(); -+ - GetModel()->AddUndo( GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*this) ); -+ } - - OutlinerParaObject* pNewText = nullptr; - Paragraph* p1stPara = rOutl.GetParagraph( 0 ); -@@ -2085,6 +2093,10 @@ WritingMode SdrTableObj::GetWritingMode() const - return eWritingMode; - } - -+void SdrTableObj::AddUndo(SdrUndoAction* pUndo) -+{ -+ mpImpl->maUndos.push_back(std::unique_ptr(pUndo)); -+} - - - // gets base transformation and rectangle of object. If it's an SdrPathObj it fills the PolyPolygon -diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx -index 0238e85..beb75e0 100644 ---- a/svx/source/table/tablecontroller.cxx -+++ b/svx/source/table/tablecontroller.cxx -@@ -1177,6 +1177,13 @@ void SvxTableController::SetVertical( sal_uInt16 nSId ) - { - TableModelNotifyGuard aGuard( mxTable.get() ); - -+ bool bUndo = mpModel && mpModel->IsUndoEnabled(); -+ if (bUndo) -+ { -+ mpModel->BegUndo(ImpGetResStr(STR_TABLE_NUMFORMAT)); -+ mpModel->AddUndo(mpModel->GetSdrUndoFactory().CreateUndoAttrObject(*pTableObj)); -+ } -+ - CellPos aStart, aEnd; - getSelectedCells( aStart, aEnd ); - -@@ -1203,11 +1210,20 @@ void SvxTableController::SetVertical( sal_uInt16 nSId ) - { - CellRef xCell( dynamic_cast< Cell* >( mxTable->getCellByPosition( nCol, nRow ).get() ) ); - if( xCell.is() ) -- xCell->SetMergedItem(aItem); -+ { -+ if (bUndo) -+ xCell->AddUndo(); -+ SfxItemSet aSet(xCell->GetItemSet()); -+ aSet.Put(aItem); -+ xCell->SetMergedItemSetAndBroadcast(aSet, /*bClearAllItems=*/false); -+ } - } - } - - UpdateTableShape(); -+ -+ if (bUndo) -+ mpModel->EndUndo(); - } - } - --- -2.6.6 - diff --git a/bnc945445.patch b/bnc945445.patch deleted file mode 100644 index 197089a..0000000 --- a/bnc945445.patch +++ /dev/null @@ -1,276 +0,0 @@ -From 5c32e526d7cc1f623ca1b60a16537efa5740dd6c Mon Sep 17 00:00:00 2001 -From: Miklos Vajna -Date: Mon, 25 Apr 2016 10:57:49 +0200 -Subject: [PATCH] tdf#99452 svx: fix undo of table row edge drag - -The problem as seen by the user: if you have a table of 2 rows and 1 column, -and the separator line is dragged upwards by the mouse, then undo doesn't -restore the original situation. - -Two items are created on the undo stack: sd::UndoGeoObject and -sdr::table::TableRowUndo. Let's say the table height is 8000 mm100 and the two -cell heights are 4000 and 4000. If the user resizes the first cell, so that its -height is 2000, then the new table height will be 6000. The problem is that -when undo is executed, first sd::UndoGeoObject resizes the table, distributing -the newly available 2000 between the existing rows, and then -sdr::table::TableRowUndo sets the row height of the first row: the height of -the second cell will be larger than expected. Fix the problem by not doing a -relayout during sd::UndoGeoObject, but doing a relayout after -sdr::table::TableRowUndo in this case. - -This is done by: - -1) Adding a new SdrDragStat::mbEndDragChangesLayout, so that -SdrTableObj::applySpecialDrag() can inform SdrDragObjOwn::EndSdrDrag() that -TableRowUndo will do the layout instead of UndoGeoObject. (This is done only in -case a row edge is dragged, as otherwise it's not guaranteed that a -TableRowUndo will follow the UndoGeoObject on the undo stack.) - -2) Adding a new SdrUndoGeoObj::mbSkipChangeLayout, so that -SdrTableObj::applySpecialDrag() can let SdrUndoGeoObj::Undo() not do the -layout. - -3) Adding a sdr::table::SdrTableObjImpl::mbSkipChangeLayout, so that -SdrUndoGeoObj::Undo() can let SdrTableObj::NbcSetLogicRect() not do the layout. - -4) Marking the table model as modified in TableRowUndo::setData(), so it does -the layout at the end of the undo group. - -(cherry picked from commits cafc53f8b4c08443524b1da6f4918d49afd45bb5, -8d1fa417bc49a9e9eee923e3ce6a37d7b0f056f1 and -758e6f39d96237881198818e3bac432012be61d8) - -Conflicts: - sd/qa/unit/tiledrendering/tiledrendering.cxx - svx/source/table/svdotable.cxx - -Change-Id: I8adde3cdad5741e6fcb420e333ce336e18c77cf1 -Reviewed-on: https://gerrit.libreoffice.org/24392 -Tested-by: Jenkins -Reviewed-by: Andras Timar ---- - include/svx/svddrag.hxx | 4 +++ - include/svx/svdotable.hxx | 3 ++ - include/svx/svdundo.hxx | 3 ++ - sd/qa/unit/tiledrendering/data/table.odp | Bin 0 -> 10559 bytes - sd/qa/unit/tiledrendering/tiledrendering.cxx | 52 +++++++++++++++++++++++++++ - svx/source/svdraw/svddrag.cxx | 1 + - svx/source/svdraw/svddrgmt.cxx | 6 ++++ - svx/source/svdraw/svdundo.cxx | 7 ++++ - svx/source/table/svdotable.cxx | 14 +++++++- - svx/source/table/tablerow.cxx | 4 +++ - svx/source/table/tablerow.hxx | 2 ++ - svx/source/table/tableundo.cxx | 3 ++ - 12 files changed, 98 insertions(+), 1 deletion(-) - create mode 100644 sd/qa/unit/tiledrendering/data/table.odp - -diff --git a/include/svx/svddrag.hxx b/include/svx/svddrag.hxx -index ac2a978..aa4a03e 100644 ---- a/include/svx/svddrag.hxx -+++ b/include/svx/svddrag.hxx -@@ -55,6 +55,8 @@ protected: - - bool bEndDragChangesAttributes; - bool bEndDragChangesGeoAndAttributes; -+ /// Table row drag: table will re-layout itself later. -+ bool mbEndDragChangesLayout; - bool bMouseIsUp; - - bool bShown; // Xor visible? -@@ -133,6 +135,8 @@ public: - void SetEndDragChangesAttributes(bool bOn) { bEndDragChangesAttributes=bOn; } - bool IsEndDragChangesGeoAndAttributes() const { return bEndDragChangesGeoAndAttributes; } - void SetEndDragChangesGeoAndAttributes(bool bOn) { bEndDragChangesGeoAndAttributes=bOn; } -+ bool IsEndDragChangesLayout() const { return mbEndDragChangesLayout; } -+ void SetEndDragChangesLayout(bool bOn) { mbEndDragChangesLayout=bOn; } - - // Is set by the view and can be evaluated by Obj - bool IsMouseDown() const { return !bMouseIsUp; } -diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx -index f70d768..408f0b8 100644 ---- a/include/svx/svdotable.hxx -+++ b/include/svx/svdotable.hxx -@@ -261,6 +261,9 @@ public: - /// Add an undo action that should be on the undo stack after ending text edit. - void AddUndo(SdrUndoAction* pUndo); - -+ /// Next time layouting would be done, skip it (to layout at the end of multiple actions). -+ void SetSkipChangeLayout(bool bSkipChangeLayout); -+ - virtual void onEditOutlinerStatusEvent( EditStatus* pEditStatus ) override; - - -diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx -index 966e408..7d4973f 100644 ---- a/include/svx/svdundo.hxx -+++ b/include/svx/svdundo.hxx -@@ -213,6 +213,8 @@ protected: - SdrObjGeoData* pRedoGeo; - // If we have a group object: - SdrUndoGroup* pUndoGroup; -+ /// If we have a table object, should its layout change? -+ bool mbSkipChangeLayout; - - public: - SdrUndoGeoObj(SdrObject& rNewObj); -@@ -222,6 +224,7 @@ public: - virtual void Redo() override; - - virtual OUString GetComment() const override; -+ void SetSkipChangeLayout(bool bOn) { mbSkipChangeLayout=bOn; } - }; - - /** -diff --git a/svx/source/svdraw/svddrag.cxx b/svx/source/svdraw/svddrag.cxx -index 91cd2d1..2f44f47 100644 ---- a/svx/source/svdraw/svddrag.cxx -+++ b/svx/source/svdraw/svddrag.cxx -@@ -50,6 +50,7 @@ void SdrDragStat::Reset() - pDragMethod=nullptr; - bEndDragChangesAttributes=false; - bEndDragChangesGeoAndAttributes=false; -+ mbEndDragChangesLayout=false; - bMouseIsUp=false; - Clear(true); - aActionRect=Rectangle(); -diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx -index bff9a6c..9d70c20 100644 ---- a/svx/source/svdraw/svddrgmt.cxx -+++ b/svx/source/svdraw/svddrgmt.cxx -@@ -1423,6 +1423,12 @@ bool SdrDragObjOwn::EndSdrDrag(bool /*bCopy*/) - } - - bRet = pObj->applySpecialDrag(DragStat()); -+ if (DragStat().IsEndDragChangesLayout()) -+ { -+ auto pGeoUndo = dynamic_cast(pUndo); -+ if (pGeoUndo) -+ pGeoUndo->SetSkipChangeLayout(true); -+ } - - if(bRet) - { -diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx -index b3cf6ae..9567d9e 100644 ---- a/svx/source/svdraw/svdundo.cxx -+++ b/svx/source/svdraw/svdundo.cxx -@@ -603,6 +603,7 @@ SdrUndoGeoObj::SdrUndoGeoObj(SdrObject& rNewObj) - , pUndoGeo(nullptr) - , pRedoGeo(nullptr) - , pUndoGroup(nullptr) -+ , mbSkipChangeLayout(false) - { - SdrObjList* pOL=rNewObj.GetSubList(); - if (pOL!=nullptr && pOL->GetObjCount() && dynamic_cast( &rNewObj) == nullptr) -@@ -645,7 +646,13 @@ void SdrUndoGeoObj::Undo() - { - delete pRedoGeo; - pRedoGeo=pObj->GetGeoData(); -+ -+ auto pTableObj = dynamic_cast(pObj); -+ if (pTableObj && mbSkipChangeLayout) -+ pTableObj->SetSkipChangeLayout(true); - pObj->SetGeoData(*pUndoGeo); -+ if (pTableObj && mbSkipChangeLayout && pTableObj) -+ pTableObj->SetSkipChangeLayout(false); - } - } - -diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx -index 5b979fe..4fbcb1f 100644 ---- a/svx/source/table/svdotable.cxx -+++ b/svx/source/table/svdotable.cxx -@@ -206,6 +206,7 @@ public: - TableStyleSettings maTableStyle; - Reference< XIndexAccess > mxTableStyle; - std::vector> maUndos; -+ bool mbSkipChangeLayout; - - void SetModel(SdrModel* pOldModel, SdrModel* pNewModel); - -@@ -262,6 +263,7 @@ sal_Int32 SdrTableObjImpl::lastColCount; - SdrTableObjImpl::SdrTableObjImpl() - : mpTableObj( nullptr ) - , mpLayouter( nullptr ) -+, mbSkipChangeLayout(false) - { - } - -@@ -1950,7 +1952,11 @@ void SdrTableObj::NbcSetLogicRect(const Rectangle& rRect) - const bool bWidth = maLogicRect.getWidth() != maRect.getWidth(); - const bool bHeight = maLogicRect.getHeight() != maRect.getHeight(); - maRect = maLogicRect; -- NbcAdjustTextFrameWidthAndHeight( !bHeight, !bWidth ); -+ if (mpImpl->mbSkipChangeLayout) -+ // Avoid distributing newly available space between existing cells. -+ NbcAdjustTextFrameWidthAndHeight(); -+ else -+ NbcAdjustTextFrameWidthAndHeight(!bHeight, !bWidth); - SetRectsDirty(); - } - -@@ -2098,6 +2104,11 @@ void SdrTableObj::AddUndo(SdrUndoAction* pUndo) - mpImpl->maUndos.push_back(std::unique_ptr(pUndo)); - } - -+void SdrTableObj::SetSkipChangeLayout(bool bSkipChangeLayout) -+{ -+ mpImpl->mbSkipChangeLayout = bSkipChangeLayout; -+} -+ - - // gets base transformation and rectangle of object. If it's an SdrPathObj it fills the PolyPolygon - // with the base geometry and returns TRUE. Otherwise it returns FALSE. -@@ -2341,6 +2352,7 @@ bool SdrTableObj::applySpecialDrag(SdrDragStat& rDrag) - if( GetModel() && IsInserted() ) - { - rDrag.SetEndDragChangesAttributes(true); -+ rDrag.SetEndDragChangesLayout(true); - } - - mpImpl->DragEdge( pEdgeHdl->IsHorizontalEdge(), pEdgeHdl->GetPointNum(), pEdgeHdl->GetValidDragOffset( rDrag ) ); -diff --git a/svx/source/table/tablerow.cxx b/svx/source/table/tablerow.cxx -index d86f7e9..37212b7 100644 ---- a/svx/source/table/tablerow.cxx -+++ b/svx/source/table/tablerow.cxx -@@ -157,6 +157,10 @@ void TableRow::removeColumns( sal_Int32 nIndex, sal_Int32 nCount ) - } - } - -+TableModelRef const & TableRow::getModel() const -+{ -+ return mxTableModel; -+} - - // XCellRange - -diff --git a/svx/source/table/tablerow.hxx b/svx/source/table/tablerow.hxx -index cc8c236..5fdd940 100644 ---- a/svx/source/table/tablerow.hxx -+++ b/svx/source/table/tablerow.hxx -@@ -48,6 +48,8 @@ public: - - void insertColumns( sal_Int32 nIndex, sal_Int32 nCount, CellVector::iterator* pIter = nullptr ); - void removeColumns( sal_Int32 nIndex, sal_Int32 nCount ); -+ /// Reference to the table model containing this row. -+ TableModelRef const & getModel() const; - - // XCellRange - virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; -diff --git a/svx/source/table/tableundo.cxx b/svx/source/table/tableundo.cxx -index 250675e..59d08a2 100644 ---- a/svx/source/table/tableundo.cxx -+++ b/svx/source/table/tableundo.cxx -@@ -492,6 +492,9 @@ void TableRowUndo::setData( const Data& rData ) - mxRow->mbIsVisible = rData.mbIsVisible; - mxRow->mbIsStartOfNewPage = rData.mbIsStartOfNewPage; - mxRow->maName = rData.maName; -+ -+ // Trigger re-layout of the table. -+ mxRow->getModel()->setModified(true); - } - - --- -2.6.6 - diff --git a/boost_1_59_0.tar.bz2 b/boost_1_59_0.tar.bz2 deleted file mode 100644 index 7a7a0c9..0000000 --- a/boost_1_59_0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca -size 70389425 diff --git a/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2 b/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2 deleted file mode 100644 index 1586ae8..0000000 --- a/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461 -size 16113737 diff --git a/c4a2d71ff56aec5ebfab2a3f059be99d-icu4c-56_1-src.tgz b/c4a2d71ff56aec5ebfab2a3f059be99d-icu4c-56_1-src.tgz deleted file mode 100644 index d9c8866..0000000 --- a/c4a2d71ff56aec5ebfab2a3f059be99d-icu4c-56_1-src.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3a64e9105c734dcf631c0b3ed60404531bce6c0f5a64bfe1a6402a4cc2314816 -size 25721871 diff --git a/ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz b/ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz new file mode 100644 index 0000000..c292eb4 --- /dev/null +++ b/ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305 +size 1769329 diff --git a/commons-logging-1.2-src.tar.gz b/commons-logging-1.2-src.tar.gz deleted file mode 100644 index 5a213c4..0000000 --- a/commons-logging-1.2-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81 -size 188536 diff --git a/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz b/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz deleted file mode 100644 index 6bbde9d..0000000 --- a/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f -size 16525605 diff --git a/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip b/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip deleted file mode 100644 index c7d04d8..0000000 --- a/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133 -size 207563 diff --git a/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip b/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip deleted file mode 100644 index bd4a309..0000000 --- a/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e1fb87f3f7b980d33414473279615c4644027e013012d156efa538bc2b031772 -size 1396007 diff --git a/ec1941a74d3ef513c4ce57a9092b74e1-bsh-2.0b5-src.zip b/ec1941a74d3ef513c4ce57a9092b74e1-bsh-2.0b5-src.zip deleted file mode 100644 index e0edf43..0000000 --- a/ec1941a74d3ef513c4ce57a9092b74e1-bsh-2.0b5-src.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:90993aa17a786996653fc5fcf148e879fb3689b8678f9ba99b376a5a13dff513 -size 1982036 diff --git a/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip b/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip deleted file mode 100644 index d2e8098..0000000 --- a/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:75c80359c9ce343c20aab8a36a45cb3b9ee7c61cf92c13ae45399d854423a9ba -size 427800 diff --git a/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip b/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip deleted file mode 100644 index c1b3560..0000000 --- a/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343 -size 211919 diff --git a/harfbuzz-0.9.40.tar.bz2 b/harfbuzz-0.9.40.tar.bz2 deleted file mode 100644 index f99fb1c..0000000 --- a/harfbuzz-0.9.40.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1771d53583be6d91ca961854b2a24fb239ef0545eed221ae3349abae0ab8321f -size 1182989 diff --git a/language-subtag-registry-2016-02-10.tar.bz2 b/language-subtag-registry-2016-02-10.tar.bz2 deleted file mode 100644 index b03a3e1..0000000 --- a/language-subtag-registry-2016-02-10.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1e3a74b39e999bc9ff9fb0dd6fa6a64a0ed6bf7f0775ff3756e7c9e8db45a353 -size 73266 diff --git a/lcms2-2.6.tar.gz b/lcms2-2.6.tar.gz deleted file mode 100644 index dabf83b..0000000 --- a/lcms2-2.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5172528839647c54c3da211837225e221be93e4733f5b5e9f57668f7107e14b1 -size 4583389 diff --git a/libabw-0.1.1.tar.bz2 b/libabw-0.1.1.tar.bz2 deleted file mode 100644 index 8efc6d9..0000000 --- a/libabw-0.1.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7a3d3415cf82ab9894f601d1b3057c4615060304d5279efdec6275e01b96a199 -size 369311 diff --git a/libcdr-0.1.2.tar.bz2 b/libcdr-0.1.2.tar.bz2 deleted file mode 100644 index 5f620a4..0000000 --- a/libcdr-0.1.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d05a986dab9f960e64466072653a900d03f8257b084440d9d16599e16060581e -size 696296 diff --git a/libe-book-0.1.2.tar.bz2 b/libe-book-0.1.2.tar.bz2 deleted file mode 100644 index 4b23dcf..0000000 --- a/libe-book-0.1.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b710a57c633205b933015474d0ac0862253d1c52114d535dd09b20939a0d1850 -size 465922 diff --git a/libetonyek-0.1.6.tar.bz2 b/libetonyek-0.1.6.tar.bz2 deleted file mode 100644 index e59e13b..0000000 --- a/libetonyek-0.1.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:032f53e8d7691e48a73ddbe74fa84c906ff6ff32a33e6ee2a935b6fdb6aecb78 -size 1696455 diff --git a/libfreehand-0.1.1.tar.bz2 b/libfreehand-0.1.1.tar.bz2 deleted file mode 100644 index 756feb9..0000000 --- a/libfreehand-0.1.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:45dab0e5d632eb51eeb00847972ca03835d6791149e9e714f093a9df2b445877 -size 597212 diff --git a/libmspub-0.1.2.tar.bz2 b/libmspub-0.1.2.tar.bz2 deleted file mode 100644 index 90e7198..0000000 --- a/libmspub-0.1.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:26d488527ffbb0b41686d4bab756e3e6aaeb99f88adeb169d0c16d2cde96859a -size 429360 diff --git a/libmwaw-0.3.7.tar.bz2 b/libmwaw-0.3.7.tar.bz2 deleted file mode 100644 index 5e5d216..0000000 --- a/libmwaw-0.3.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a66b3e45a5ba5dd89849a766e128585cac8aaf9e9c6f037040200e5bf31f1427 -size 1390872 diff --git a/libodfgen-0.1.6.tar.bz2 b/libodfgen-0.1.6.tar.bz2 deleted file mode 100644 index 7225352..0000000 --- a/libodfgen-0.1.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2 -size 446705 diff --git a/liborcus-0.11.0.tar.gz b/liborcus-0.11.0.tar.gz deleted file mode 100644 index 8991934..0000000 --- a/liborcus-0.11.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7af7b9993801dd0b1ccdf734f51c1617975f92bcb9396c4de49ed88444e5b357 -size 2032540 diff --git a/libpagemaker-0.0.2.tar.bz2 b/libpagemaker-0.0.2.tar.bz2 deleted file mode 100644 index a4607b9..0000000 --- a/libpagemaker-0.0.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:43be46721affcb5a967406c09acfc36c79d2d968917fe36a21cc004230a01e0f -size 358918 diff --git a/libreoffice-5.1.3.2.tar.xz b/libreoffice-5.1.3.2.tar.xz deleted file mode 100644 index e045f46..0000000 --- a/libreoffice-5.1.3.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cd5a1ca7c9ea100f811f8f12dc9bae29e71a6a65b127be6de5e14f223e3c07c4 -size 176087264 diff --git a/libreoffice-5.2.0.0.beta1.tar.xz b/libreoffice-5.2.0.0.beta1.tar.xz new file mode 100644 index 0000000..8b6b771 --- /dev/null +++ b/libreoffice-5.2.0.0.beta1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8efb6f7fb07f6d771f20ede9a230e98be315db8e0b0378961227681860ebdda7 +size 183325064 diff --git a/libreoffice-desktop-icons-256x256.tar.bz2 b/libreoffice-desktop-icons-256x256.tar.bz2 deleted file mode 100644 index d72ce05..0000000 --- a/libreoffice-desktop-icons-256x256.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6e9c32ff72b71b953f971d3f1b518ab2560dfa57aa93388d420dae0c9b381ace -size 283612 diff --git a/libreoffice-help-5.1.3.2.tar.xz b/libreoffice-help-5.1.3.2.tar.xz deleted file mode 100644 index 04c14b8..0000000 --- a/libreoffice-help-5.1.3.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f58def670340d67027d8cd52ef07669fbe7db05d1c6e490700dde8b53fe6093b -size 1904908 diff --git a/libreoffice-help-5.2.0.0.beta1.tar.xz b/libreoffice-help-5.2.0.0.beta1.tar.xz new file mode 100644 index 0000000..78e1252 --- /dev/null +++ b/libreoffice-help-5.2.0.0.beta1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:747b979573c31b64cba7aff46483a5fcb04033f70f678e91c27281330d208628 +size 1934260 diff --git a/libreoffice-hotfix-disablebrokenshapetest.patch b/libreoffice-hotfix-disablebrokenshapetest.patch index 8eb39bb..721e8cb 100644 --- a/libreoffice-hotfix-disablebrokenshapetest.patch +++ b/libreoffice-hotfix-disablebrokenshapetest.patch @@ -1,7 +1,7 @@ -Index: libreoffice-5.1.2.2/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx +Index: libreoffice-5.2.0.0.alpha1/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx =================================================================== ---- libreoffice-5.1.2.2.orig/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx -+++ libreoffice-5.1.2.2/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx +--- libreoffice-5.2.0.0.alpha1.orig/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx ++++ libreoffice-5.2.0.0.alpha1/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx @@ -1103,29 +1103,6 @@ DECLARE_OOXMLEXPORT_TEST(testTDF93675, " assertXPath(pXmlDoc, "//w:ind", "start", "1418"); } @@ -17,7 +17,7 @@ Index: libreoffice-5.1.2.2/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx - // check rotation angle - assertXPath(pXmlDoc, "//a:xfrm", "rot", "13500000"); - // check the first few coordinates of the polygon --#ifndef MACOSX /* Retina-reatled rounding rountrip error +-#ifndef MACOSX /* Retina-related rounding rountrip error - * hard to smooth out due to the use of string compare - * instead of number */ - assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "x", "2351"); diff --git a/libreoffice-translations-5.1.3.2.tar.xz b/libreoffice-translations-5.1.3.2.tar.xz deleted file mode 100644 index 920eeb8..0000000 --- a/libreoffice-translations-5.1.3.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f12305ca6f5f87b26b99fc481db475eb0d733513032e20e170a99724c8932f0d -size 131729640 diff --git a/libreoffice-translations-5.2.0.0.beta1.tar.xz b/libreoffice-translations-5.2.0.0.beta1.tar.xz new file mode 100644 index 0000000..aa2fc39 --- /dev/null +++ b/libreoffice-translations-5.2.0.0.beta1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f13991bbc4249fba4b0234f5d7517b9e2a2bfe01470b4ade21924ec9e24a429e +size 131320904 diff --git a/libreoffice.changes b/libreoffice.changes index ad48470..6bd5fe4 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Thu Jun 2 08:53:49 UTC 2016 - tchvatal@suse.com + +- Version update to 5.2.0.0.beta1: + * Disable support for sle11, not needed anymore + * Cleanup the specfile from all the compat conditionals per above + * Disable bundled help and point to upstream wiki always (speeds + up build quite a bit) + * Use pkgconfig style dependencies instead of the develpkgs + * Remove all the bundled tarballs that were aedded for sle11 + * Adjust the constraints a bit to reflect reality + * Remove merged patches: + * scp2-user-config-suse.diff + * 0001-Make-HAVE_JAVA6-be-always-false.patch + * 0001-mdds-1.0.patch + * 0001-liborcus-0.11.patch + * 0002-boost-filesystem1.patch + * 0003-boost-filesystem2.patch + * bnc856729.patch + * bnc939998.patch + * bnc945443.patch + * bnc945445.patch + * Refresh patches: + * libreoffice-hotfix-disablebrokenshapetest.patch + * system-pyuno.diff + ------------------------------------------------------------------- Mon May 9 20:39:22 UTC 2016 - andras.timar@collabora.com diff --git a/libreoffice.spec b/libreoffice.spec index b6af916..14bf3af 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -22,49 +22,15 @@ %define numbertext_version 0.9.5 # Urls %define external_url http://dev-www.libreoffice.org/src/ -%define tarball_url http://download.documentfoundation.org/libreoffice/src/5.1.3 -# Old Make and bundle or not -%if 0%{?suse_version} > 1230 -%bcond_with oldmake -%else -%bcond_without oldmake -%endif -# GTK3, gstreamer and fresh doxygen switch -%if 0%{?suse_version} > 1230 -%bcond_without newmedia -%else -%bcond_with newmedia -%endif -# Wether to use internal libs or rely on system ones -%if 0%{?suse_version} > 1230 -%bcond_without systemlibs -%else -%bcond_with systemlibs -%endif +%define tarball_url http://download.documentfoundation.org/libreoffice/src/5.2.0 # Wether to enable the kde integration -%if 0%{?suse_version} > 1315 || 0%{?is_opensuse} || 0%{?suse_version} < 1130 +%if 0%{?is_opensuse} %bcond_without kdeintegration %else %bcond_with kdeintegration %endif -# Wether to provide noarch subpackages -%if 0%{?suse_version} > 1130 -%bcond_without noarch_subpkgs -%else -%bcond_with noarch_subpkgs -%endif -# python2 or python3 as base -%if 0%{?suse_version} > 1130 -%global python_type python3 -%else -%global python_type python -%global python3_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") -BuildRequires: python-importlib -Requires: python-importlib -%endif -# This is used due to the need for beta releases Name: libreoffice -Version: 5.1.3.2 +Version: 5.2.0.0.beta1 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 @@ -73,11 +39,7 @@ Url: http://www.documentfoundation.org/ Source0: %{tarball_url}/libreoffice-%{version}.tar.xz Source1: %{tarball_url}/libreoffice-help-%{version}.tar.xz Source2: %{tarball_url}/libreoffice-translations-%{version}.tar.xz -# 256x256 desktop icons (bnc#722644) -Source20: libreoffice-desktop-icons-256x256.tar.bz2 Source99: %{name}-rpmlintrc -# Prebuilt sofficerc for the noarch upstream branding package -Source201: sofficerc-upstream # prebuilt extensions Source402: %{external_url}/b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_%{numbertext_version}.oxt # used extensions sources @@ -87,7 +49,7 @@ Source452: %{external_url}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.t Source1999: %{external_url}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 # Internal bundled stuff we can't remove # XMLSec is patched over and over in here -Source2000: %{external_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz +Source2000: %{external_url}/ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz # To build this we would pull cygwin; not worth it Source2001: http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll # hsqldb simply does not work with new system version, but luckily we migrate to firebird @@ -97,162 +59,140 @@ Source2003: %{external_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip Source2004: %{external_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip # Needed for wiki-published and always taken as bundled Source2005: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip -# Bundled sources for without-system-libs build -Source2006: %{external_url}/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz -Source2007: %{external_url}/librevenge-0.0.4.tar.bz2 -Source2008: %{external_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz -Source2009: %{external_url}/libetonyek-0.1.6.tar.bz2 -Source2010: %{external_url}/libe-book-0.1.2.tar.bz2 -Source2011: %{external_url}/libfreehand-0.1.1.tar.bz2 -Source2012: %{external_url}/libodfgen-0.1.6.tar.bz2 -Source2013: %{external_url}/libcdr-0.1.2.tar.bz2 -Source2014: %{external_url}/libmspub-0.1.2.tar.bz2 -Source2015: %{external_url}/libmwaw-0.3.7.tar.bz2 -Source2016: %{external_url}/libpagemaker-0.0.2.tar.bz2 -Source2017: %{external_url}/libvisio-0.1.5.tar.bz2 -Source2018: %{external_url}/5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz -Source2019: %{external_url}/libwpd-0.10.1.tar.bz2 -Source2020: %{external_url}/libwpg-0.3.1.tar.bz2 -Source2021: %{external_url}/libwps-0.4.2.tar.bz2 -Source2022: %{external_url}/libabw-0.1.1.tar.bz2 -Source2023: %{external_url}/lcms2-2.6.tar.gz -Source2024: %{external_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip -Source2025: %{external_url}/mdds_0.12.1.tar.bz2 -Source2026: %{external_url}/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz -Source2027: %{external_url}/7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz -Source2028: %{external_url}/boost_1_59_0.tar.bz2 -Source2029: %{external_url}/3941e9cab2f4f9d8faee3e8d57ae7664-glew-1.12.0.zip -Source2030: %{external_url}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip -Source2031: %{external_url}/c4a2d71ff56aec5ebfab2a3f059be99d-icu4c-56_1-src.tgz -Source2032: %{external_url}/17df8301bcc459e83f8a8f3aca6183b2-graphite-minimal-1.3.6.tgz -Source2033: %{external_url}/liborcus-0.11.0.tar.gz -Source2034: %{external_url}/harfbuzz-0.9.40.tar.bz2 -Source2035: %{external_url}/32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz -Source2036: %{external_url}/10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2 -Source2037: %{external_url}/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz -Source2038: %{external_url}/ec1941a74d3ef513c4ce57a9092b74e1-bsh-2.0b5-src.zip -Source2039: %{external_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip -Source2040: %{external_url}/Firebird-2.5.4.26856-0.tar.bz2 -Source2041: %{external_url}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz -Source2042: %{external_url}/4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz -Source2043: %{external_url}/625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz -Source2044: %{external_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz -Source2045: %{external_url}/commons-logging-1.2-src.tar.gz -Source2046: %{external_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip -Source2047: %{external_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip -Source2048: %{external_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip -Source2049: %{external_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip -Source2050: %{external_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip -Source2051: %{external_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip -Source2052: %{external_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip -Source2053: %{external_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip -Source2054: %{external_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip -Source2055: %{external_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip -Source2056: %{external_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip -Source2057: %{external_url}/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz -Source2058: %{external_url}/aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.tar.bz2 -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-2016-02-10.tar.bz2 -# Make for old distros where too old gnumake resides -Source3000: http://ftp.gnu.org/gnu/make/make-4.1.tar.bz2 # PATCH-FIX-SUSE: disable really fragile test run on hsqldb Patch0: disable-flaky-hsqldb-test.patch -# change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse -# to avoid BerkleyDB incompatibility with the plain build -# FIXME: make it configurable and push upstream -Patch1: scp2-user-config-suse.diff # correctly bootstrap python stuff with system python (deb#501028, bnc#90701) Patch3: system-pyuno.diff # do not use the broken help; unopkg complained about it when registering extensions # FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files 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: broken patch command on sle11 fails to apply patch -Patch12: 0001-mdds-1.0.patch -Patch13: 0001-liborcus-0.11.patch -Patch14: 0002-boost-filesystem1.patch -Patch15: 0003-boost-filesystem2.patch # PATCH-HOTFIX-UPSTREAM: disable test that rounds wrongly on most archs Patch16: libreoffice-hotfix-disablebrokenshapetest.patch -# bnc#856729 - LO-L3: fix double borders in Calc -Patch17: bnc856729.patch -# bnc#939998 - LO-L3: PPT file shows wrong titles -Patch18: bnc939998.patch -# bnc#945443 - LO-L3: Undo ignores vertical alignment -Patch19: bnc945443.patch -# bnc#945445 - LO-L3: Undo does not revert changes of table separation lines -Patch20: bnc945445.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: %{name}-share-linker -BuildRequires: %{python_type}-devel -BuildRequires: %{python_type}-xml -BuildRequires: ImageMagick BuildRequires: ant -BuildRequires: ant-apache-regexp -BuildRequires: ant-nodeps BuildRequires: autoconf BuildRequires: bison -BuildRequires: bluez-devel +BuildRequires: boost-devel +BuildRequires: bsh2 +BuildRequires: commons-codec +BuildRequires: commons-httpclient +BuildRequires: commons-lang +BuildRequires: commons-logging BuildRequires: cups-devel BuildRequires: curl-devel -BuildRequires: db-devel -BuildRequires: dbus-1-glib-devel +BuildRequires: doxygen >= 1.8.4 BuildRequires: fdupes -BuildRequires: flac-devel BuildRequires: flex +BuildRequires: flute BuildRequires: gcc-c++ -# Only for backtracking to see failing tests, pain to rebuild otherwise -BuildRequires: gdb +BuildRequires: glm-devel BuildRequires: gperf -BuildRequires: gtk2-devel -BuildRequires: hunspell-devel BuildRequires: hyphen-devel +# genbrk binary is requires +BuildRequires: icu BuildRequires: java-devel >= 1.6 -BuildRequires: krb5 -BuildRequires: krb5-devel +BuildRequires: junit4 +BuildRequires: libbase BuildRequires: libcppunit-devel BuildRequires: liberation-fonts -BuildRequires: libexpat-devel -BuildRequires: libpoppler-devel +BuildRequires: libexif +BuildRequires: libfonts +BuildRequires: libformula +BuildRequires: libjpeg-devel +BuildRequires: liblayout +BuildRequires: libloader +BuildRequires: libmysqlclient-devel +BuildRequires: libmysqlcppconn-devel >= 1.0.6 +BuildRequires: librepository +BuildRequires: libserializer BuildRequires: libtool +BuildRequires: lpsolve-devel BuildRequires: make -BuildRequires: mozilla-nspr-devel >= 4.8 -BuildRequires: mozilla-nss-devel >= 3.9.3 -BuildRequires: mythes-devel BuildRequires: neon-devel >= 0.26.0 +BuildRequires: openCOLLADA-devel BuildRequires: openldap2-devel -BuildRequires: pam-devel -BuildRequires: patch -BuildRequires: perl-Archive-Zip -BuildRequires: perl-Compress-Zlib +BuildRequires: pentaho-libxml +BuildRequires: pentaho-reporting-flow-engine +BuildRequires: pkgconfig +BuildRequires: postgresql-devel +# needed for the free command in build phase BuildRequires: procps +BuildRequires: python3-xml +BuildRequires: sac +BuildRequires: ucpp BuildRequires: unixODBC-devel BuildRequires: unzip BuildRequires: update-desktop-files +BuildRequires: xml-commons-apis BuildRequires: xorg-x11 BuildRequires: xorg-x11-fonts BuildRequires: xz BuildRequires: zip -Requires: %{python_type} +BuildRequires: perl(Archive::Zip) +BuildRequires: perl(Digest::MD5) +BuildRequires: pkgconfig(bluez) +BuildRequires: pkgconfig(dbus-glib-1) +BuildRequires: pkgconfig(expat) +BuildRequires: pkgconfig(fbembed) +BuildRequires: pkgconfig(gl) +BuildRequires: pkgconfig(glew) >= 1.10.0 +BuildRequires: pkgconfig(glu) +BuildRequires: pkgconfig(gobject-introspection-1.0) +BuildRequires: pkgconfig(graphite2) >= 0.9.3 +BuildRequires: pkgconfig(gssrpc) +BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) +BuildRequires: pkgconfig(gtk+-2.0) >= 2.18.0 +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(harfbuzz) +BuildRequires: pkgconfig(hunspell) +BuildRequires: pkgconfig(icu-i18n) +BuildRequires: pkgconfig(krb5) +BuildRequires: pkgconfig(lcms2) +BuildRequires: pkgconfig(libabw-0.1) +BuildRequires: pkgconfig(libcdr-0.1) >= 0.1 +BuildRequires: pkgconfig(libclucene-core) +BuildRequires: pkgconfig(libcmis-0.5) >= 0.5.0 +BuildRequires: pkgconfig(libe-book-0.1) >= 0.1.1 +BuildRequires: pkgconfig(libetonyek-0.1) >= 0.1.4 +BuildRequires: pkgconfig(libexttextcat) >= 3.1.1 +BuildRequires: pkgconfig(libfreehand-0.1) +BuildRequires: pkgconfig(libgltf-0.0) +BuildRequires: pkgconfig(liblangtag) +BuildRequires: pkgconfig(libmspub-0.1) >= 0.1 +BuildRequires: pkgconfig(libmwaw-0.3) >= 0.3.5 +BuildRequires: pkgconfig(libodfgen-0.1) >= 0.1.4 +BuildRequires: pkgconfig(liborcus-0.11) +BuildRequires: pkgconfig(libpagemaker-0.0) +BuildRequires: pkgconfig(librevenge-0.0) >= 0.0.1 +BuildRequires: pkgconfig(librsvg-2.0) +BuildRequires: pkgconfig(libvisio-0.1) >= 0.1 +BuildRequires: pkgconfig(libwpd-0.10) >= 0.10 +BuildRequires: pkgconfig(libwpg-0.3) +BuildRequires: pkgconfig(libwps-0.4) >= 0.4.2 +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(libxslt) +BuildRequires: pkgconfig(mdds-1.2) +BuildRequires: pkgconfig(mythes) +BuildRequires: pkgconfig(nspr) >= 4.8 +BuildRequires: pkgconfig(nss) >= 3.9.3 +BuildRequires: pkgconfig(poppler) +BuildRequires: pkgconfig(poppler-cpp) +BuildRequires: pkgconfig(python3) +BuildRequires: pkgconfig(redland) +BuildRequires: pkgconfig(sane-backends) +BuildRequires: pkgconfig(xt) Requires: google-carlito-fonts -# Fonts are needed for tests Requires: liberation-fonts Requires: libreoffice-branding >= 4.0 Requires: libreoffice-icon-themes = %{version} # We need at least english to launch ourselves. Requires: libreoffice-l10n-en = %{version} -Requires(post): coreutils -Requires(post): grep -Requires(post): gtk2 -Requires(post): zip -Requires(postun): coreutils -Requires(postun): gtk2 -Requires(pre): findutils +Requires: python3 +Requires(post): update-desktop-files +Requires(postun): update-desktop-files Provides: %{name}-draw-extensions = %{version} Obsoletes: %{name}-draw-extensions < %{version} Provides: %{name}-impress-extensions = %{version} @@ -270,99 +210,12 @@ Obsoletes: %{name}-ure < %{version} Provides: %{name}-icon-theme-crystal = %{version} Obsoletes: %{name}-icon-theme-crystal < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: %arm aarch64 %ix86 x86_64 ppc ppc64 +ExclusiveArch: %arm aarch64 %ix86 x86_64 ppc ppc64 ppc64le s390x %if %{with kdeintegration} BuildRequires: libkde4-devel -%endif -%if %{with systemlibs} -BuildRequires: boost-devel -BuildRequires: bsh2 -BuildRequires: clucene-core-devel -BuildRequires: commons-codec -BuildRequires: commons-httpclient -BuildRequires: commons-lang -BuildRequires: commons-logging -BuildRequires: flute -BuildRequires: glew-devel >= 1.10.0 -BuildRequires: glm-devel -BuildRequires: glu-devel -BuildRequires: graphite2-devel >= 0.9.3 -BuildRequires: harfbuzz-devel -BuildRequires: icu -BuildRequires: junit4 -BuildRequires: libXt-devel -BuildRequires: libabw-devel -BuildRequires: libbase -BuildRequires: libcdr-devel >= 0.1 -BuildRequires: libcmis-devel >= 0.5.0 -BuildRequires: libe-book-devel >= 0.1.1 -BuildRequires: libetonyek-devel >= 0.1.4 -BuildRequires: libexif -BuildRequires: libexttextcat-devel >= 3.1.1 -BuildRequires: libfbembed-devel -BuildRequires: libfonts -BuildRequires: libformula -BuildRequires: libfreehand-devel -BuildRequires: libicu-devel -BuildRequires: liblangtag-devel -BuildRequires: liblayout -BuildRequires: liblcms2-devel -BuildRequires: libloader -BuildRequires: libmspub-devel >= 0.1 -BuildRequires: libmwaw-devel >= 0.3.5 -BuildRequires: libmysqlclient-devel -BuildRequires: libmysqlcppconn-devel >= 1.0.6 -BuildRequires: libodfgen-devel >= 0.1.4 -BuildRequires: liborcus-devel >= 0.9.1 -BuildRequires: libpagemaker-devel -BuildRequires: libredland-devel -BuildRequires: librepository -BuildRequires: librevenge-devel >= 0.0.1 -BuildRequires: librsvg-devel -BuildRequires: libserializer -BuildRequires: libvisio-devel >= 0.1 -BuildRequires: libwpd-devel >= 0.10 -BuildRequires: libwpg-devel -BuildRequires: libwps-devel >= 0.4.2 -BuildRequires: libxml2-devel -BuildRequires: libxslt-devel -BuildRequires: lpsolve-devel -BuildRequires: npapi-sdk -BuildRequires: openCOLLADA-devel -BuildRequires: pentaho-libxml -BuildRequires: pentaho-reporting-flow-engine -BuildRequires: postgresql-devel -BuildRequires: recode -BuildRequires: rhino -BuildRequires: sac -BuildRequires: sane-backends-devel -BuildRequires: ucpp -BuildRequires: vigra-devel -BuildRequires: xml-commons-apis -BuildRequires: pkgconfig(fbembed) -BuildRequires: pkgconfig(mdds-1.0) %else -BuildRequires: chrpath -%endif -%if %{with newmedia} -BuildRequires: doxygen >= 1.8.4 -BuildRequires: gstreamer-plugins-base-devel -BuildRequires: gtk3-devel -BuildRequires: libgltf-devel -BuildRequires: pkgconfig(gobject-introspection-1.0) -%else -BuildRequires: gcc48-c++ -BuildRequires: gstreamer010-plugins-base-devel -%endif -# we need a JRE for oobase and the other stuff -%ifarch %ix86 -Recommends: jre-32 >= 1.6 -%endif -%ifarch x86_64 aarch64 ppc64 -Recommends: jre-64 >= 1.6 -%endif -%ifarch ppc -Recommends: jre-32 >= 1.6 +Provides: %{name}-kde4 = %{version} +Obsoletes: %{name}-kde4 < %{version} %endif %description @@ -401,9 +254,7 @@ Conflicts: otherproviders(libreoffice-branding) Provides: libreoffice-branding = %{version} Provides: libreoffice-branding-openSUSE = 4.0.1 Obsoletes: libreoffice-branding-openSUSE < 4.0.1 -%if %{with noarch_subpkgs} BuildArch: noarch -%endif %description branding-upstream This package includes the original branding for the LibreOffice office suite. @@ -418,9 +269,7 @@ Requires(postun): %{name}-share-linker Supplements: packageand(libreoffice:plasma5-workspace) Provides: libreoffice-icon-themes = %{version} Obsoletes: libreoffice-icon-themes < %{version} -%if %{with noarch_subpkgs} BuildArch: noarch -%endif %description icon-theme-breeze This package provides Breeze LibreOffice icon theme. It is used in KDE @@ -435,9 +284,7 @@ Requires(postun): %{name}-share-linker Supplements: libreoffice Provides: libreoffice-icon-themes = %{version} Obsoletes: libreoffice-icon-themes < %{version} -%if %{with noarch_subpkgs} BuildArch: noarch -%endif %description icon-theme-galaxy This package provides Galaxy LibreOffice icon theme. It is used in the original OOo-3.x by default. @@ -452,9 +299,7 @@ Requires(postun): %{name}-share-linker Supplements: libreoffice Provides: libreoffice-icon-themes = %{version} Obsoletes: libreoffice-icon-themes < %{version} -%if %{with noarch_subpkgs} BuildArch: noarch -%endif %description icon-theme-hicontrast This package provides Hicontrast LibreOffice icon theme. @@ -469,9 +314,7 @@ Requires(postun): %{name}-share-linker Supplements: packageand(libreoffice:kdebase4-workspace) Provides: libreoffice-icon-themes = %{version} Obsoletes: libreoffice-icon-themes < %{version} -%if %{with noarch_subpkgs} BuildArch: noarch -%endif %description icon-theme-oxygen This package provides Oxygen LibreOffice icon theme. It is used in KDE4 by default. @@ -487,9 +330,7 @@ Requires(postun): %{name}-share-linker Supplements: libreoffice Provides: libreoffice-icon-themes = %{version} Obsoletes: libreoffice-icon-themes < %{version} -%if %{with noarch_subpkgs} BuildArch: noarch -%endif %description icon-theme-sifr This package provides Sifr LibreOffice icon theme. @@ -504,9 +345,7 @@ Requires(postun): %{name}-share-linker Supplements: packageand(libreoffice:gnome-session) Provides: libreoffice-icon-themes = %{version} Obsoletes: libreoffice-icon-themes < %{version} -%if %{with noarch_subpkgs} BuildArch: noarch -%endif %description icon-theme-tango This package provides Tango LibreOffice icon theme. It is used in GNOME by default @@ -517,9 +356,7 @@ Summary: Support for creating LibreOffice dialogs in glade 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 Group: Productivity/Office/Suite Requires: %{name} = %{version} -%if %{with noarch_subpkgs} BuildArch: noarch -%endif %description glade %{name}-glade contains a catalog of LibreOffice-specific widgets for @@ -529,13 +366,11 @@ glade and ui-previewer tool to check the visual appearance of dialogs. Summary: Additional support for debugging with gdb 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 Group: Productivity/Office/Suite -Requires: %{python_type}-six Requires: gdb Requires: libreoffice = %{version} +Requires: python3-six Supplements: libreoffice-debuginfo = %{version} -%if %{with noarch_subpkgs} BuildArch: noarch -%endif %description gdb-pretty-printers This package provides gdb pretty printers for package %{name}. @@ -545,10 +380,14 @@ Summary: LibreOffice Base License: LGPL-3.0 Group: Productivity/Office/Suite Requires: %{name} = %{version} -%if %{with systemlibs} Requires: pentaho-reporting-flow-engine -%endif Supplements: %{name} +%ifarch %arm %ix86 ppc +Requires: jre-32 >= 1.6 +%endif +%ifarch x86_64 aarch64 ppc64 ppc64le s390x +Requires: jre-64 >= 1.6 +%endif %description base This module allows you to manage databases, create queries and reports @@ -708,13 +547,11 @@ Group: Documentation/HTML Requires: %{name} = %{version} Requires: gcc-c++ Requires: make +Requires: ucpp Requires: zip Recommends: java-devel Provides: libreoffice-ure-devel = %{version} Obsoletes: libreoffice-ure-devel < %{version} -%if %{with systemlibs} -Requires: ucpp -%endif %description sdk This package contains the files needed to build plugins/add-ons for @@ -741,6 +578,12 @@ Summary: OfficeBean Java Bean component for LibreOffice License: LGPL-3.0 Group: Productivity/Office/Suite Requires: %{name} = %{version} +%ifarch %arm %ix86 ppc +Requires: jre-32 >= 1.6 +%endif +%ifarch x86_64 aarch64 ppc64 ppc64le s390x +Requires: jre-64 >= 1.6 +%endif %description officebean With the OfficeBean, a developer can easily write Java applications, @@ -762,14 +605,10 @@ appearance and behavior. Summary: MySQL Database Driver for LibreOffice License: GPL-2.0 and LGPL-3.0 Group: Productivity/Office/Suite -Requires: libreoffice-base = %{version} # This mysql thing is just dlopened # WARNING: the soname might change! -%if 0%{?suse_version} == 1110 -Requires: libmysql55client_r18 -%else Requires: libmysqlclient_r18 -%endif +Requires: libreoffice-base = %{version} Requires(pre): libreoffice = %{version} Supplements: packageand(libreoffice-base:mysql-client) @@ -786,13 +625,11 @@ Requires: libreoffice-calc = %{version} Requires: libreoffice-pyuno = %{version} Requires(pre): libreoffice = %{version} # the watchWindow extension is written in java -%ifarch %ix86 ppc -Requires: jre-32 > 1.5 -Recommends: jre-32 >= 1.6 +%ifarch %arm %ix86 ppc +Requires: jre-32 >= 1.6 %endif -%ifarch x86_64 aarch64 ppc64 -Requires: jre-64 > 1.5 -Recommends: jre-64 >= 1.6 +%ifarch x86_64 aarch64 ppc64 ppc64le s390x +Requires: jre-64 >= 1.6 %endif %description calc-extensions @@ -809,13 +646,11 @@ Group: Productivity/Office/Suite Requires: libreoffice-writer = %{version} Requires(pre): libreoffice = %{version} # the wiki extension is written in java -%ifarch %ix86 ppc -Requires: jre-32 > 1.5 -Recommends: jre-32 >= 1.6 +%ifarch %arm %ix86 ppc +Requires: jre-32 >= 1.6 %endif -%ifarch x86_64 aarch64 ppc64 -Requires: jre-64 > 1.5 -Recommends: jre-64 >= 1.6 +%ifarch x86_64 aarch64 ppc64 ppc64le s390x +Requires: jre-64 >= 1.6 %endif %description writer-extensions @@ -927,13 +762,12 @@ fi \ # S:s: script classification (cjk, ctl). -S is only a marker, as it does # not add any .xcd into the package (the file does not exist for at # least one CTL-using locale, si) -# T has help files # Xx: has autotext definitions # # Example: # libreoffice-l10n-cs: langpack for Czech lang. Requiring myspell-cs_CZ: # %%langpack -l cs -n Czech -m cs_CZ -%define langpack(c:Ei:L:l:Mm:n:p:q:r:S:s:TXx:) \ +%define langpack(c:Ei:L:l:Mm:n:p:q:r:S:s:Xx:) \ %define project LibreOffice \ %define lang %{-l:%{-l*}}%{!-l:%{error:Language code not defined}} \ %define _langpack_lang %{-L:%{-L*}}%{!-L:%{lang}} \ @@ -947,9 +781,7 @@ Group: Productivity/Office/Suite \ Requires: %{name} = %{version} \ Requires: %{name}-share-linker \ Provides: locale(libreoffice:%{lang}) \ -%if %{with noarch_subpkgs} \ BuildArch: noarch \ -%endif \ %{-m:Requires: myspell-%{-m*}}%{!-m:%{-M:Requires: myspell-%{lang}}} \ %{-r:Requires: %{-r*}} \ %{-p: \ @@ -989,10 +821,6 @@ Provides additional %{langname} translations and resources for %{project}. \ %{-x:%{autotextdir}/%{-x*}}%{!-x:%{-X:%{autotextdir}/%{_langpack_lang}}} \ %{-c:%{_datadir}/%{name}/share/registry/%{-c*}.xcd} \ %{-s:%{_datadir}/%{name}/share/registry/%{-s*}_%{_langpack_lang}.xcd} \ -%{-T: \ -%docdir %{_datadir}/%{name}/help/%{_langpack_lang} \ -%{_datadir}/%{name}/help/%{_langpack_lang} \ -} \ %{-i:%{expand:%%_langpack_common %{-i*}}} \ } \ \ @@ -1002,110 +830,87 @@ Provides additional %{langname} translations and resources for %{project}. \ %langpack -l af -n Afrikaans -m af_ZA %langpack -l ar -n Arabic -s ctl -m ar %langpack -l as -n Assamese -%langpack -l bg -n Bulgarian -T -X -m bg_BG -%langpack -l bn -n Bengali -T -m bn_BD +%langpack -l bg -n Bulgarian -X -m bg_BG +%langpack -l bn -n Bengali -m bn_BD %langpack -l br -n Breton -m br_FR -%langpack -l ca -n Catalan -T -M -X -%langpack -l cs -n Czech -T -X -m cs_CZ +%langpack -l ca -n Catalan -M -X +%langpack -l cs -n Czech -X -m cs_CZ %langpack -l cy -n Welsh -%langpack -l da -n Danish -T -X -m da_DK -%langpack -l de -n German -T -X -M -%langpack -l dz -n Dzongkha -s ctl -T -%langpack -l el -n Greek -T -m el_GR -%langpack -l en -n English -L en-US -T -X -p en-GB -q en-ZA -M -%langpack -l es -n Spanish -M -T -X -%langpack -l et -n Estonian -T -m et_EE -%langpack -l eu -n Basque -T +%langpack -l da -n Danish -X -m da_DK +%langpack -l de -n German -X -M +%langpack -l dz -n Dzongkha -s ctl +%langpack -l el -n Greek -m el_GR +%langpack -l en -n English -L en-US -X -p en-GB -q en-ZA -M +%langpack -l es -n Spanish -M -X +%langpack -l et -n Estonian -m et_EE +%langpack -l eu -n Basque %langpack -l fa -n Farsi -s ctl -X -%langpack -l fi -n Finnish -r libreoffice-voikko -T -X -%langpack -l fr -n French -T -X -m fr_FR +%langpack -l fi -n Finnish -r libreoffice-voikko -X +%langpack -l fr -n French -X -m fr_FR %langpack -l ga -n Irish -%langpack -l gl -n Galician -T -M -%langpack -l gu -n Gujarati -s ctl -T -p gu-IN -m gu_IN -%langpack -l he -n Hebrew -s ctl -T -m he_IL -%langpack -l hi -n Hindi -s ctl -T -p hi-IN -m hi_IN -%langpack -l hr -n Croatian -T -m hr_HR -X -%langpack -l hu -n Hungarian -T -X -m hu_HU -%langpack -l it -n Italian -T -X -m it_IT -%langpack -l ja -n Japanese -s cjk -T -X +%langpack -l gl -n Galician -M +%langpack -l gu -n Gujarati -s ctl -p gu-IN -m gu_IN +%langpack -l he -n Hebrew -s ctl -m he_IL +%langpack -l hi -n Hindi -s ctl -p hi-IN -m hi_IN +%langpack -l hr -n Croatian -m hr_HR -X +%langpack -l hu -n Hungarian -X -m hu_HU +%langpack -l it -n Italian -X -m it_IT +%langpack -l ja -n Japanese -s cjk -X %langpack -l kk -n Kazakh %langpack -l kn -n Kannada -%langpack -l ko -n Korean -s cjk -T -X +%langpack -l ko -n Korean -s cjk -X %langpack -l lt -n Lithuanian -m lt_LT -X %langpack -l lv -n Latvian -m lv_LV %langpack -l mai -n Maithili %langpack -l ml -n Malayalam %langpack -l mr -n Marathi -%langpack -l nb -n Bokmal -M -T -m no -%langpack -l nl -n Dutch -T -X -m nl_NL -%langpack -l nn -n Nynorsk -T -m no +%langpack -l nb -n Bokmal -M -m no +%langpack -l nl -n Dutch -X -m nl_NL +%langpack -l nn -n Nynorsk -m no %define langpack_lang Southern Ndebele %langpack -l nr -n %{langpack_lang} %define langpack_lang Northern Sotho %langpack -l nso -n %{langpack_lang} %langpack -l or -n Odia -s ctl %langpack -l pa -n Punjabi -s ctl -L pa-IN -p pa-IN -%langpack -l pl -n Polish -T -X -m pl_PL +%langpack -l pl -n Polish -X -m pl_PL %define langpack_lang Brazilian Portuguese -%langpack -l pt-BR -n %{langpack_lang} -m pt_BR -p pt_BR -T -X -%langpack -l pt-PT -n Portuguese -m pt_PT -T -L pt -x pt -p pt +%langpack -l pt-BR -n %{langpack_lang} -m pt_BR -p pt_BR -X +%langpack -l pt-PT -n Portuguese -m pt_PT -L pt -x pt -p pt %langpack -l ro -n Romanian -M -X -%langpack -l ru -n Russian -T -X -m ru_RU -%langpack -l si -n Sinhalese -S ctl -T -m si_LK -%langpack -l sk -n Slovak -T -X -m sk_SK -%langpack -l sl -n Slovenian -T -X -m sl_SI +%langpack -l ru -n Russian -X -m ru_RU +%langpack -l si -n Sinhalese -S ctl -m si_LK +%langpack -l sk -n Slovak -X -m sk_SK +%langpack -l sl -n Slovenian -X -m sl_SI %langpack -l sr -n Serbian -i sr-Latn -M %langpack -l ss -n Swati %define langpack_lang Southern Sotho %langpack -l st -n %{langpack_lang} -%langpack -l sv -n Swedish -T -X -m sv_SE +%langpack -l sv -n Swedish -X -m sv_SE %langpack -l ta -n Tamil -s ctl %langpack -l te -n Telugu -m te_IN %langpack -l th -n Thai -s ctl -c ctlseqcheck_th -m th_TH %langpack -l tn -n Tswana -%langpack -l tr -n Turkish -T -X +%langpack -l tr -n Turkish -X %langpack -l ts -n Tsonga -%langpack -l uk -n Ukrainian -T -m uk_UA +%langpack -l uk -n Ukrainian -m uk_UA %langpack -l ve -n Venda %langpack -l xh -n Xhosa %define langpack_lang Simplified Chinese -%langpack -l zh-Hans -n %{langpack_lang} -p zh-CN -s cjk -T -L zh-CN -x zh-CN +%langpack -l zh-Hans -n %{langpack_lang} -p zh-CN -s cjk -L zh-CN -x zh-CN %define langpack_lang Traditional Chinese -%langpack -l zh-Hant -n %{langpack_lang} -p zh-TW -s cjk -T -L zh-TW -x zh-TW +%langpack -l zh-Hant -n %{langpack_lang} -p zh-TW -s cjk -L zh-TW -x zh-TW %langpack -l zu -n Zulu -m zu_ZA %undefine langpack_lang %prep %setup -q -b1 -b2 %patch0 -p1 -%patch1 %patch3 -p1 %patch4 %patch5 -%if !%{with systemlibs} -%patch7 -p1 -%endif -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 %patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 -%patch20 -p1 %patch990 -p1 -# 256x256 icons -tar -xjf %{SOURCE20} - -# Unpack and compile new gmake -%if %{with oldmake} -tar -xjvf %{SOURCE3000} -cd make-4.1 -CFLAGS="%{optflags}" %configure -make %{?_smp_mflags} -cd - -%endif # Do not generate doxygen timestamp echo "HTML_TIMESTAMP = NO" >> odk/docs/cpp/Doxyfile @@ -1141,12 +946,8 @@ fi # make sure that JAVA_HOME is set correctly source %{_sysconfdir}/profile.d/alljava.sh # use RPM_OPT_FLAGS, ... -%if 0%{?is_opensuse} != 1 -# ON IBS remove big debugsymbols as we simply consume too much space +# remove big debugsymbols as we simply consume too much space ARCH_FLAGS="`echo %{optflags} | sed -e 's/^-g /-g1 /g' -e 's/ -g / -g1 /g' -e 's/ -g$/ -g1/g'`" -%else -ARCH_FLAGS="%{optflags}" -%endif CFLAGS="$ARCH_FLAGS" CXXFLAGS="$ARCH_FLAGS" export ARCH_FLAGS CFLAGS CXXFLAGS @@ -1155,27 +956,6 @@ export ARCH_FLAGS CFLAGS CXXFLAGS export OPENCOLLADA_CFLAGS='-I/usr/include/COLLADABaseUtils -I/usr/include/COLLADAFramework -I/usr/include/COLLADASaxFrameworkLoader -I/usr/include/GeneratedSaxParser' export OPENCOLLADA_LIBS='-lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser' -# Whack in our python so we don't have to use internal one -# which is quite nightmare. -export PYTHON=%{_bindir}/%{python_type} -%if %{with newmedia} -export PYTHON_CFLAGS=`pkg-config --cflags %{python_type}` -export PYTHON_LIBS=`pkg-config --libs %{python_type}` -%else -export PYTHON_CFLAGS=`%{python_type}-config --cflags` -export PYTHON_LIBS=`%{python_type}-config --libs` -%endif - -# Old systems need help in finding the gcc -%if !%{with newmedia} -export CC=%{_bindir}/gcc-4.8 -export CXX=%{_bindir}/g++-4.8 -%endif - -%if %{with oldmake} -export PATH="$RPM_BUILD_DIR/libreoffice-%{version}/make-4.1:$PATH:%{_prefix}/sbin" -%endif - # do not run configure in autogen but use macro later export NOCONFIGURE=yes ./autogen.sh @@ -1184,41 +964,20 @@ export NOCONFIGURE=yes --enable-mergelibs \ --docdir=%{_docdir}/%{name} \ --with-compat-oowrappers \ -%if %{with systemlibs} --with-system-headers \ --with-system-libs \ --with-system-jars \ --with-system-ucpp \ -%else - --without-system-libs \ - --without-system-jars \ - --without-system-headers \ - --without-junit \ - --with-system-expat \ - --with-system-curl \ - --with-system-neon \ - --with-system-hunspell \ - --with-system-mythes \ - --with-system-bluez \ - --with-system-openldap \ - --with-system-odbc \ - --with-system-nss \ - --with-system-jpeg \ - --with-system-libpng \ - --with-system-cppunit \ - --with-system-poppler \ - --with-system-openssl \ -%endif --with-system-dicts \ --with-vendor=SUSE \ --with-alloc=system \ + --with-tls=openssl \ --with-lang='%{langpack_langs}' \ --disable-fetch-external \ --with-external-tar="$RPM_SOURCE_DIR" \ --disable-epm \ --disable-online-update \ --disable-systray \ -%if %{with newmedia} --disable-gstreamer-0-10 \ --enable-gstreamer-1-0 \ --enable-gtk3 \ @@ -1226,13 +985,6 @@ export NOCONFIGURE=yes --with-doxygen \ --enable-gltf \ --enable-collada --with-system-opencollada \ -%else - --enable-gstreamer-0-10 \ - --disable-gstreamer-1-0 \ - --disable-gtk3 \ - --without-doxygen \ - --disable-gltf \ -%endif --enable-release-build \ --enable-split-app-modules \ --enable-split-opt-features \ @@ -1241,7 +993,6 @@ export NOCONFIGURE=yes --enable-largefile \ --enable-python=system \ --enable-randr \ - --enable-randr-link \ --without-fonts \ --without-myspell-dicts \ --with-jdk-home=$JAVA_HOME \ @@ -1250,7 +1001,8 @@ export NOCONFIGURE=yes --with-external-dict-dir=%{_datadir}/hunspell \ --with-external-hyph-dir=%{_datadir}/hyphen \ --with-external-thes-dir=%{_datadir}/mythes \ - --with-help \ + --without-helppack-integration \ + --without-help \ --enable-odk \ %if %{with kdeintegration} --enable-kde4 \ @@ -1274,11 +1026,9 @@ export NOCONFIGURE=yes --enable-symbols # no coinormp packages for coinmp -# hack to correctly bootstrap python stuff with system python, (deb#501028, i#90701) +# hack to correctly bootstrap python stuff with system python, (deb#501028, bnc#90701) sed -i -e "s|@INSTALLDIR@|%{_libdir}/%{name}|" pyuno/source/module/uno.py pyuno/source/officehelper.py -# Allow deep backtracking if the build crashes -ulimit -c unlimited # just call make here as we added the jobs in configure # The check phase is run here too if it is split with nocheck # install of jars get broken sometimes @@ -1290,15 +1040,9 @@ make DESTDIR=%{buildroot} distro-pack-install # Do not pollute build log set +x -# FIXME: Hack add missing file -install -m755 instdir/program/libsaxlo.so %{buildroot}/%{_libdir}/%{name}/program/libsaxlo.so -echo "%{_libdir}/%{name}/program/libsaxlo.so" >>file-lists/common_list.txt - # Split out gtk3 interface to -gtk3 subpackage -%if %{with newmedia} grep -v "%{_libdir}/libreoffice/program/libvclplug_gtk3lo.so" file-lists/gnome_list.txt > tmplist mv tmplist file-lists/gnome_list.txt -%endif ################ # update desktop files @@ -1377,12 +1121,6 @@ mv %{buildroot}/%{_libdir}/%{name}/share/autotext/ %{buildroot}/%{_datadir}/%{na ################ # branding split ################ -# first check wheter the prebuilt sofficerc is still the same -if ! diff %{buildroot}%{_libdir}/%{name}/program/sofficerc $RPM_SOURCE_DIR/sofficerc-upstream ; then - echo "Error: The file \"sofficerc\" has changed in the sources" - echo " Please, update the prebuilt variant in $RPM_SOURCE_DIR/sofficerc-upstream" - exit 1; -fi # create symlinks for all brandings to noarch pkg mkdir -p %{buildroot}/%{_datadir}/%{name}/program/shell echo "%{_datadir}/%{name}/program/shell" >> file-lists/branding_upstream.txt @@ -1433,55 +1171,28 @@ done # Remove pointless readmes rm -rf %{buildroot}%{_libdir}/%{name}/readmes/ -# Clean RPATH on some 3rd party bundled libs -%if !%{with systemlibs} -chrpath --replace '$ORIGIN' %{buildroot}%{_libdir}/%{name}/program/libwpd-0.10-lo.so.10 -chrpath --replace '$ORIGIN' %{buildroot}%{_libdir}/%{name}/program/libwpg-0.3-lo.so.3 -chrpath --replace '$ORIGIN' %{buildroot}%{_libdir}/%{name}/program/libetonyek-0.1-lo.so.1 -chrpath --replace '$ORIGIN' %{buildroot}%{_libdir}/%{name}/program/libmwaw-0.3-lo.so.3 -chrpath --replace '$ORIGIN' %{buildroot}%{_libdir}/%{name}/program/libwps-0.4-lo.so.4 -chrpath --replace '$ORIGIN' %{buildroot}%{_libdir}/%{name}/program/libodfgen-0.1-lo.so.1 -chrpath --replace '$ORIGIN' %{buildroot}%{_libdir}/%{name}/program/librdf-lo.so.0 -chrpath --replace '$ORIGIN' %{buildroot}%{_libdir}/%{name}/program/librasqal-lo.so.3 -%endif - # Generate python cache files -%if 0%{?suse_version} > 1130 %py3_compile %{buildroot}/%{_libdir}/libreoffice/program/ %py3_compile %{buildroot}/%{_libdir}/libreoffice/share/extensions/ %py3_compile %{buildroot}/%{_libdir}/libreoffice/share/Scripts/python/ %py3_compile %{buildroot}/%{_libdir}/libreoffice/sdk/examples/python/ -%else -%py_compile %{buildroot}/%{_libdir}/libreoffice/program/ -%py_compile %{buildroot}/%{_libdir}/libreoffice/share/extensions/ -%py_compile %{buildroot}/%{_libdir}/libreoffice/share/Scripts/python/ -%py_compile %{buildroot}/%{_libdir}/libreoffice/sdk/examples/python/ -%endif - # Move python cache to respective filelist for i in file-lists/*.txt; do if [ `cat "${i}" | grep '\.py$' |wc -l` -gt 0 ]; then cat "${i}" | grep '\.py$' > pyfiles.txt for j in `cat pyfiles.txt`; do # python3 has __pycache__ dir while py2 does not - %if %{with newmedia} - pydir="${j%/*}" - pyname="${j##*/}" - echo "%dir ${pydir}/__pycache__/" >> "${i}" - echo "${pydir}/__pycache__/${pyname%.*}*.pyc" >> "${i}" - %else - # just add c to state pyc - echo "${j}c" >> "${i}" - %endif + pydir="${j%/*}" + pyname="${j##*/}" + echo "%dir ${pydir}/__pycache__/" >> "${i}" + echo "${pydir}/__pycache__/${pyname%.*}*.pyc" >> "${i}" done fi done rm pyfiles.txt # Symlink libreofficekit to libdir -%if %{with newmedia} ln -s %{_libdir}/%{name}/program/liblibreofficekitgtk.so %{buildroot}%{_libdir}/liblibreofficekitgtk.so -%endif # Symlink uno.py and unohelper.py so that python can find them # This is done after the cache files generating on purpose @@ -1509,16 +1220,9 @@ export SRCDIR="./" %post /sbin/ldconfig -%if %suse_version > 1130 %mime_database_post %desktop_database_post %icon_theme_cache_post -%else -test -f /usr/bin/update-mime-database && /usr/bin/update-mime-database %{_datadir}/mime > /dev/null || : -test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /dev/null || : -test -f /sbin/conf.d/SuSEconfig.gtk2 && SuSEconfig --module gtk2 > /dev/null || : -test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : -%endif %preun uno_cache="%{_libdir}/%{name}/share/uno_packages/cache/uno_packages/" @@ -1529,112 +1233,45 @@ exit 0 %postun /sbin/ldconfig -%if %suse_version > 1130 %icon_theme_cache_postun %desktop_database_postun %mime_database_postun -%else -test -f /usr/bin/update-mime-database && /usr/bin/update-mime-database %{_datadir}/mime > /dev/null || : -test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /dev/null || : -test -f /sbin/conf.d/SuSEconfig.gtk2 && SuSEconfig --module gtk2 > /dev/null || : -test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : -%endif %post base -%if %suse_version > 1130 %desktop_database_post -%else -test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /dev/null || : -test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : -%endif %postun base -%if %suse_version > 1130 %desktop_database_postun -%else -test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /dev/null || : -test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : -%endif %post calc -%if %suse_version > 1130 %desktop_database_post -%else -test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /dev/null || : -test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : -%endif %postun calc -%if %suse_version > 1130 %desktop_database_postun -%else -test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /dev/null || : -test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : -%endif %post draw -%if %suse_version > 1130 %desktop_database_post -%else -test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /dev/null || : -test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : -%endif %postun draw -%if %suse_version > 1130 %desktop_database_postun -%else -test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /dev/null || : -test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : -%endif %post math -%if %suse_version > 1130 %desktop_database_post -%else -test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /dev/null || : -test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : -%endif %postun math -%if %suse_version > 1130 %desktop_database_postun -%else -test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /dev/null || : -test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : -%endif %post impress -%if %suse_version > 1130 %desktop_database_post -%else -test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /dev/null || : -test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : -%endif %postun impress -%if %suse_version > 1130 %desktop_database_postun -%else -test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /dev/null || : -test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : -%endif %post writer -%if %suse_version > 1130 %desktop_database_post -%else -test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /dev/null || : -test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : -%endif %postun writer -%if %suse_version > 1130 %desktop_database_postun -%else -test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /dev/null || : -test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : -%endif %_link_noarch_files icon-theme-breeze %_link_noarch_files icon-theme-galaxy @@ -1650,11 +1287,11 @@ test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null | %exclude %{_datadir}/%{name}/program/flat_logo.svg %exclude %{_datadir}/%{name}/program/*.png %exclude %{_datadir}/%{name}/program/shell/*.svg -# such a big icons are not provided by other packages -# FIXME: last time checked on openSUSE-12.2 +%if 0%{?suse_version} < 1330 %dir %{_datadir}/icons/hicolor/512x512 %dir %{_datadir}/icons/hicolor/512x512/apps %dir %{_datadir}/icons/hicolor/512x512/mimetypes +%endif # FIXME: this is KDE4 only, wipe? %dir %{_datadir}/icons/locolor %dir %{_datadir}/icons/locolor/16x16 @@ -1664,18 +1301,21 @@ test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null | %dir %{_datadir}/icons/locolor/32x32/apps %dir %{_datadir}/icons/locolor/32x32/mimetypes -%if %{with newmedia} %files -n libreofficekit %defattr(-,root,root) %dir %{_libdir}/girepository-1.0 %{_libdir}/girepository-1.0/LOKDocView-0.1.typelib %{_libdir}/liblibreofficekitgtk.so +%dir %{_libdir}/libreoffice/share/libreofficekit +%{_libdir}/libreoffice/share/libreofficekit/handle_graphic.png +%{_libdir}/libreoffice/share/libreofficekit/handle_image_end.png +%{_libdir}/libreoffice/share/libreofficekit/handle_image_middle.png +%{_libdir}/libreoffice/share/libreofficekit/handle_image_start.png %files -n libreofficekit-devel %defattr(-,root,root) %dir %{_datadir}/gir-1.0 %{_datadir}/gir-1.0/LOKDocView-0.1.gir -%endif %files glade %defattr(-,root,root) @@ -1724,11 +1364,9 @@ test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null | %files -f file-lists/gnome_list.txt gnome %defattr(-,root,root) -%if %{with newmedia} %files gtk3 %defattr(-,root,root) %{_libdir}/libreoffice/program/libvclplug_gtk3lo.so -%endif %if %{with kdeintegration} %files -f file-lists/kde4_list.txt kde4 diff --git a/librevenge-0.0.4.tar.bz2 b/librevenge-0.0.4.tar.bz2 deleted file mode 100644 index 3bf3e56..0000000 --- a/librevenge-0.0.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf -size 529833 diff --git a/libvisio-0.1.5.tar.bz2 b/libvisio-0.1.5.tar.bz2 deleted file mode 100644 index ee437ef..0000000 --- a/libvisio-0.1.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b83b7991a40b4e7f07d0cac7bb46ddfac84dece705fd18e21bfd119a09be458e -size 602628 diff --git a/libwpd-0.10.1.tar.bz2 b/libwpd-0.10.1.tar.bz2 deleted file mode 100644 index 5823eb6..0000000 --- a/libwpd-0.10.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:efc20361d6e43f9ff74de5f4d86c2ce9c677693f5da08b0a88d603b7475a508d -size 656856 diff --git a/libwpg-0.3.1.tar.bz2 b/libwpg-0.3.1.tar.bz2 deleted file mode 100644 index a5f3349..0000000 --- a/libwpg-0.3.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:29049b95895914e680390717a243b291448e76e0f82fb4d2479adee5330fbb59 -size 397128 diff --git a/libwps-0.4.2.tar.bz2 b/libwps-0.4.2.tar.bz2 deleted file mode 100644 index 825981b..0000000 --- a/libwps-0.4.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:254b8aeb36a3b58eabf682b04a5a6cf9b01267e762c7dc57d4533b95f30dc587 -size 708847 diff --git a/make-4.1.tar.bz2 b/make-4.1.tar.bz2 deleted file mode 100644 index 5313e31..0000000 --- a/make-4.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0bc7613389650ee6a24554b52572a272f7356164fd2c4132b0bcf13123e4fca5 -size 1327342 diff --git a/mdds_0.12.1.tar.bz2 b/mdds_0.12.1.tar.bz2 deleted file mode 100644 index 7e776d7..0000000 --- a/mdds_0.12.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:23565e9d7810a6ac30478833813db847f80e927b414a7be07b7cc03ed3aae83d -size 153265 diff --git a/scp2-user-config-suse.diff b/scp2-user-config-suse.diff deleted file mode 100644 index 1d9f728..0000000 --- a/scp2-user-config-suse.diff +++ /dev/null @@ -1,34 +0,0 @@ ---- - officecfg/registry/data/org/openoffice/Setup.xcu | 2 +- - scp2/source/ooo/common_brand.scp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git officecfg/registry/data/org/openoffice/Setup.xcu officecfg/registry/data/org/openoffice/Setup.xcu -index 8e18ca5..7c0b95d 100644 ---- officecfg/registry/data/org/openoffice/Setup.xcu -+++ officecfg/registry/data/org/openoffice/Setup.xcu -@@ -788,7 +788,7 @@ - 10 - - -- Libreoffice 3=libreoffice/3,Openofice.org 3=openoffice.org/3,OpenOffice.org 2=openoffice.org2,StarOffice 8=staroffice8,StarSuite 8=starsuite8 -+ Libreoffice 3=libreoffice/3-suse,Openofice.org 3=ooo3,OpenOffice.org 2=ooo-2.0,StarOffice 8=staroffice8,StarSuite 8=starsuite8 - - - -diff --git scp2/source/ooo/common_brand.scp scp2/source/ooo/common_brand.scp -index 7bbf873..0b235a0 100644 ---- scp2/source/ooo/common_brand.scp -+++ scp2/source/ooo/common_brand.scp -@@ -774,7 +774,7 @@ ProfileItem gid_Brand_Profileitem_Bootstrap_Userinstall - #elif defined MACOSX - Value = "$SYSUSERCONFIG/%ONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION"; - #else -- Value = "$SYSUSERCONFIG/%LCONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION"; -+ Value = "$SYSUSERCONFIG/%LCONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION-suse"; - #endif - End - --- -1.7.0.1 - diff --git a/sofficerc-upstream b/sofficerc-upstream deleted file mode 100644 index e1e42f7..0000000 --- a/sofficerc-upstream +++ /dev/null @@ -1,11 +0,0 @@ -[Bootstrap] -HideEula=1 -Logo=1 -NativeProgress=false -ProgressBarColor=0,0,0 -ProgressFrameColor=102,102,102 -ProgressPosition=35,153 -ProgressSize=444,8 -ProgressTextBaseline=145 -ProgressTextColor=255,255,255 -URE_BOOTSTRAP=${ORIGIN}/fundamentalrc diff --git a/system-pyuno.diff b/system-pyuno.diff index fab79c2..10f03fd 100644 --- a/system-pyuno.diff +++ b/system-pyuno.diff @@ -1,7 +1,8 @@ -diff -urN libreoffice-4.0.0.0.beta2.old/desktop/scripts/soffice.sh libreoffice-4.0.0.0.beta2/desktop/scripts/soffice.sh ---- libreoffice-4.0.0.0.beta2.old/desktop/scripts/soffice.sh 2012-12-19 19:09:46.518989541 +0100 -+++ libreoffice-4.0.0.0.beta2/desktop/scripts/soffice.sh 2012-12-19 19:10:21.810986269 +0100 -@@ -120,6 +120,9 @@ +Index: libreoffice-5.2.0.0.alpha1/desktop/scripts/soffice.sh +=================================================================== +--- libreoffice-5.2.0.0.alpha1.orig/desktop/scripts/soffice.sh ++++ libreoffice-5.2.0.0.alpha1/desktop/scripts/soffice.sh +@@ -137,6 +137,9 @@ if echo "$checks" | grep -q "cc" ; then exit 1; fi @@ -9,11 +10,12 @@ diff -urN libreoffice-4.0.0.0.beta2.old/desktop/scripts/soffice.sh libreoffice-4 +export PYTHONPATH + case "`uname -s`" in - NetBSD|OpenBSD|FreeBSD|DragonFly) + NetBSD|OpenBSD|DragonFly) # this is a temporary hack until we can live with the default search paths -diff -urN libreoffice-4.0.0.0.beta2.old/pyuno/source/module/uno.py libreoffice-4.0.0.0.beta2/pyuno/source/module/uno.py ---- libreoffice-4.0.0.0.beta2.old/pyuno/source/module/uno.py 2012-12-19 19:09:49.483989266 +0100 -+++ libreoffice-4.0.0.0.beta2/pyuno/source/module/uno.py 2012-12-19 19:10:21.810986269 +0100 +Index: libreoffice-5.2.0.0.alpha1/pyuno/source/module/uno.py +=================================================================== +--- libreoffice-5.2.0.0.alpha1.orig/pyuno/source/module/uno.py ++++ libreoffice-5.2.0.0.alpha1/pyuno/source/module/uno.py @@ -16,8 +16,12 @@ # except in compliance with the License. You may obtain a copy of # the License at http://www.apache.org/licenses/LICENSE-2.0 . @@ -27,10 +29,11 @@ diff -urN libreoffice-4.0.0.0.beta2.old/pyuno/source/module/uno.py libreoffice-4 import pyuno try: -diff -urN libreoffice-4.0.0.0.beta2.old/pyuno/source/officehelper.py libreoffice-4.0.0.0.beta2/pyuno/source/officehelper.py ---- libreoffice-4.0.0.0.beta2.old/pyuno/source/officehelper.py 2012-12-19 19:09:46.868989508 +0100 -+++ libreoffice-4.0.0.0.beta2/pyuno/source/officehelper.py 2012-12-19 19:10:21.810986269 +0100 -@@ -44,7 +44,7 @@ +Index: libreoffice-5.2.0.0.alpha1/pyuno/source/officehelper.py +=================================================================== +--- libreoffice-5.2.0.0.alpha1.orig/pyuno/source/officehelper.py ++++ libreoffice-5.2.0.0.alpha1/pyuno/source/officehelper.py +@@ -44,7 +44,7 @@ def bootstrap(): if "UNO_PATH" in os.environ: sOffice = os.environ["UNO_PATH"] else: From a3ab4b08b7d46a17f7b2f5a922094e60f61ec4545c0ed0c344165f9b137a06ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 2 Jun 2016 12:08:37 +0000 Subject: [PATCH 07/10] - Add patch to fix build missing-include.patch OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=408 --- libreoffice.changes | 5 +++++ libreoffice.spec | 3 +++ missing-include.patch | 29 +++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 missing-include.patch diff --git a/libreoffice.changes b/libreoffice.changes index 6bd5fe4..5ef4134 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jun 2 12:07:43 UTC 2016 - tchvatal@suse.com + +- Add patch to fix build missing-include.patch + ------------------------------------------------------------------- Thu Jun 2 08:53:49 UTC 2016 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 14bf3af..cb7cb0b 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -61,6 +61,8 @@ Source2004: %{external_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip Source2005: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip # PATCH-FIX-SUSE: disable really fragile test run on hsqldb Patch0: disable-flaky-hsqldb-test.patch +# PATCH-FIX-UPSTREAM: add missing include, already merged +Patch1: missing-include.patch # correctly bootstrap python stuff with system python (deb#501028, bnc#90701) Patch3: system-pyuno.diff # do not use the broken help; unopkg complained about it when registering extensions @@ -906,6 +908,7 @@ Provides additional %{langname} translations and resources for %{project}. \ %prep %setup -q -b1 -b2 %patch0 -p1 +%patch1 -p1 %patch3 -p1 %patch4 %patch5 diff --git a/missing-include.patch b/missing-include.patch new file mode 100644 index 0000000..bf34045 --- /dev/null +++ b/missing-include.patch @@ -0,0 +1,29 @@ +From 43144d4220fc45bf3bafcce387ff7f5b965bff92 Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann +Date: Mon, 30 May 2016 13:33:37 +0200 +Subject: Missing include + +Change-Id: Id61e2de27ec307fa7773d3f0d5a0810005f1c364 +(cherry picked from commit 336b62080bd06000e5ac3c7687b34bac2afc79a9) +Reviewed-on: https://gerrit.libreoffice.org/25716 +Reviewed-by: Stephan Bergmann +Tested-by: Stephan Bergmann + +diff --git a/mysqlc/source/mysqlc_preparedstatement.cxx b/mysqlc/source/mysqlc_preparedstatement.cxx +index 8122424..5bd8a7e 100644 +--- a/mysqlc/source/mysqlc_preparedstatement.cxx ++++ b/mysqlc/source/mysqlc_preparedstatement.cxx +@@ -22,9 +22,9 @@ + #include "mysqlc_propertyids.hxx" + #include "mysqlc_resultsetmetadata.hxx" + ++#include + #include + #include +- + #include + #include + #include +-- +cgit v0.10.2 + From fd2640a208b800f7650561c50f673e256fef51d2f6d98c9c24e578acea231d1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 10 Jun 2016 12:26:44 +0000 Subject: [PATCH 08/10] - Version update to 5.2.0.0.beta2: * More bugfixes on road to 5.2 series * missing-include.patch OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=409 --- libreoffice-5.2.0.0.beta1.tar.xz | 3 -- libreoffice-5.2.0.0.beta2.tar.xz | 3 ++ libreoffice-help-5.2.0.0.beta1.tar.xz | 3 -- libreoffice-help-5.2.0.0.beta2.tar.xz | 3 ++ libreoffice-translations-5.2.0.0.beta1.tar.xz | 3 -- libreoffice-translations-5.2.0.0.beta2.tar.xz | 3 ++ libreoffice.changes | 7 +++++ libreoffice.spec | 5 +--- missing-include.patch | 29 ------------------- 9 files changed, 17 insertions(+), 42 deletions(-) delete mode 100644 libreoffice-5.2.0.0.beta1.tar.xz create mode 100644 libreoffice-5.2.0.0.beta2.tar.xz delete mode 100644 libreoffice-help-5.2.0.0.beta1.tar.xz create mode 100644 libreoffice-help-5.2.0.0.beta2.tar.xz delete mode 100644 libreoffice-translations-5.2.0.0.beta1.tar.xz create mode 100644 libreoffice-translations-5.2.0.0.beta2.tar.xz delete mode 100644 missing-include.patch diff --git a/libreoffice-5.2.0.0.beta1.tar.xz b/libreoffice-5.2.0.0.beta1.tar.xz deleted file mode 100644 index 8b6b771..0000000 --- a/libreoffice-5.2.0.0.beta1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8efb6f7fb07f6d771f20ede9a230e98be315db8e0b0378961227681860ebdda7 -size 183325064 diff --git a/libreoffice-5.2.0.0.beta2.tar.xz b/libreoffice-5.2.0.0.beta2.tar.xz new file mode 100644 index 0000000..92cae84 --- /dev/null +++ b/libreoffice-5.2.0.0.beta2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f79cb34c346bf38f4d02e2a97279f78acc2207ca9f1e04de8462c0ad251351f3 +size 183373624 diff --git a/libreoffice-help-5.2.0.0.beta1.tar.xz b/libreoffice-help-5.2.0.0.beta1.tar.xz deleted file mode 100644 index 78e1252..0000000 --- a/libreoffice-help-5.2.0.0.beta1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:747b979573c31b64cba7aff46483a5fcb04033f70f678e91c27281330d208628 -size 1934260 diff --git a/libreoffice-help-5.2.0.0.beta2.tar.xz b/libreoffice-help-5.2.0.0.beta2.tar.xz new file mode 100644 index 0000000..b6628bc --- /dev/null +++ b/libreoffice-help-5.2.0.0.beta2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a0e189fbe9a8742c26701dbd9358d08616b6b043a0bf578dadbb606ab5d32338 +size 1934864 diff --git a/libreoffice-translations-5.2.0.0.beta1.tar.xz b/libreoffice-translations-5.2.0.0.beta1.tar.xz deleted file mode 100644 index aa2fc39..0000000 --- a/libreoffice-translations-5.2.0.0.beta1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f13991bbc4249fba4b0234f5d7517b9e2a2bfe01470b4ade21924ec9e24a429e -size 131320904 diff --git a/libreoffice-translations-5.2.0.0.beta2.tar.xz b/libreoffice-translations-5.2.0.0.beta2.tar.xz new file mode 100644 index 0000000..9f0e344 --- /dev/null +++ b/libreoffice-translations-5.2.0.0.beta2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0839d7df2c786f791eba7fcd7cb9ef18139de1e8d5a7aeb820705e7ce66b6dc7 +size 131364908 diff --git a/libreoffice.changes b/libreoffice.changes index 5ef4134..853b51b 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jun 10 12:00:58 UTC 2016 - tchvatal@suse.com + +- Version update to 5.2.0.0.beta2: + * More bugfixes on road to 5.2 series + * missing-include.patch + ------------------------------------------------------------------- Thu Jun 2 12:07:43 UTC 2016 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index cb7cb0b..3a6dd2f 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -30,7 +30,7 @@ %bcond_with kdeintegration %endif Name: libreoffice -Version: 5.2.0.0.beta1 +Version: 5.2.0.0.beta2 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 @@ -61,8 +61,6 @@ Source2004: %{external_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip Source2005: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip # PATCH-FIX-SUSE: disable really fragile test run on hsqldb Patch0: disable-flaky-hsqldb-test.patch -# PATCH-FIX-UPSTREAM: add missing include, already merged -Patch1: missing-include.patch # correctly bootstrap python stuff with system python (deb#501028, bnc#90701) Patch3: system-pyuno.diff # do not use the broken help; unopkg complained about it when registering extensions @@ -908,7 +906,6 @@ Provides additional %{langname} translations and resources for %{project}. \ %prep %setup -q -b1 -b2 %patch0 -p1 -%patch1 -p1 %patch3 -p1 %patch4 %patch5 diff --git a/missing-include.patch b/missing-include.patch deleted file mode 100644 index bf34045..0000000 --- a/missing-include.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 43144d4220fc45bf3bafcce387ff7f5b965bff92 Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann -Date: Mon, 30 May 2016 13:33:37 +0200 -Subject: Missing include - -Change-Id: Id61e2de27ec307fa7773d3f0d5a0810005f1c364 -(cherry picked from commit 336b62080bd06000e5ac3c7687b34bac2afc79a9) -Reviewed-on: https://gerrit.libreoffice.org/25716 -Reviewed-by: Stephan Bergmann -Tested-by: Stephan Bergmann - -diff --git a/mysqlc/source/mysqlc_preparedstatement.cxx b/mysqlc/source/mysqlc_preparedstatement.cxx -index 8122424..5bd8a7e 100644 ---- a/mysqlc/source/mysqlc_preparedstatement.cxx -+++ b/mysqlc/source/mysqlc_preparedstatement.cxx -@@ -22,9 +22,9 @@ - #include "mysqlc_propertyids.hxx" - #include "mysqlc_resultsetmetadata.hxx" - -+#include - #include - #include -- - #include - #include - #include --- -cgit v0.10.2 - From 50d533888aefca7caffb13e675fb52e33c36252e8640afca872f49af2d775bac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 13 Jun 2016 10:41:56 +0000 Subject: [PATCH 09/10] * Fixes bnc#967015 CVE-2016-0795 bnc#967014 CVE-2016-0794 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=410 --- libreoffice.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/libreoffice.changes b/libreoffice.changes index 853b51b..e357ac4 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -65,6 +65,7 @@ Tue Apr 26 09:46:38 UTC 2016 - andras.timar@collabora.com - Version update to 5.1.3.1: * Various small bugfixes all around 5.1 series + * Fixes bnc#967015 CVE-2016-0795 bnc#967014 CVE-2016-0794 ------------------------------------------------------------------- Tue Apr 26 09:10:05 UTC 2016 - andras.timar@collabora.com From 21eada26ac5f1b986a2cde572ca7e387af9d33fbd19070ca050b11378df5e55e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 13 Jun 2016 10:43:05 +0000 Subject: [PATCH 10/10] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=411 --- libreoffice.changes | 1 - 1 file changed, 1 deletion(-) diff --git a/libreoffice.changes b/libreoffice.changes index e357ac4..853b51b 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -65,7 +65,6 @@ Tue Apr 26 09:46:38 UTC 2016 - andras.timar@collabora.com - Version update to 5.1.3.1: * Various small bugfixes all around 5.1 series - * Fixes bnc#967015 CVE-2016-0795 bnc#967014 CVE-2016-0794 ------------------------------------------------------------------- Tue Apr 26 09:10:05 UTC 2016 - andras.timar@collabora.com