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

- Refresh patches:

Browse Source 
* 0001-liborcus-0.11.patch

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=404
This commit is contained in:
Tomáš Chvátal 2016-05-09 09:28:08 +00:00 committed by Git OBS Bridge
parent 842508d4c3
commit d352b6fafe
2 changed files with 56 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
0001-liborcus-0.11.patch
View File

@ -10,10 +10,10 @@ Reviewed-on: https://gerrit.libreoffice.org/22943
Tested-by: Jenkins <ci@libreoffice.org> Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
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.3.2.orig/RepositoryExternal.mk
+++ libreoffice-5.1.2.2/RepositoryExternal.mk +++ libreoffice-5.1.3.2/RepositoryExternal.mk
@@ -786,6 +786,21 @@ $(call gb_LinkTarget_set_include,$(1),\ @@ -786,6 +786,21 @@ $(call gb_LinkTarget_set_include,$(1),\
endef endef
@ -54,10 +54,10 @@ Index: libreoffice-5.1.2.2/RepositoryExternal.mk
) )
endef 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.3.2.orig/configure.ac
+++ libreoffice-5.1.2.2/configure.ac +++ libreoffice-5.1.3.2/configure.ac
@@ -9143,7 +9143,7 @@ if test -z "$enable_orcus" -o "$enable_o @@ -9143,7 +9143,7 @@ if test -z "$enable_orcus" -o "$enable_o
ENABLE_ORCUS="TRUE" ENABLE_ORCUS="TRUE"
AC_DEFINE(ENABLE_ORCUS) 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 "$with_system_orcus" != "yes"; then
if test "$SYSTEM_BOOST" = "TRUE"; 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.3.2.orig/download.lst
+++ libreoffice-5.1.2.2/download.lst +++ libreoffice-5.1.3.2/download.lst
@@ -112,8 +112,8 @@ export OPENCOLLADA_TARBALL := OpenCOLLAD @@ -113,8 +113,8 @@ export OPENCOLLADA_TARBALL := OpenCOLLAD
export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
export OPENSSL_MD5SUM := f3c710c045cdee5fd114feb69feba7aa export OPENSSL_MD5SUM := 9392e65072ce4b614c1392eefc1f23d0
export OPENSSL_TARBALL := openssl-1.0.2g.tar.gz export OPENSSL_TARBALL := openssl-1.0.2h.tar.gz
-export ORCUS_MD5SUM := e6efcbe50a5fd4d50d513c9a7a4139b0 -export ORCUS_MD5SUM := e6efcbe50a5fd4d50d513c9a7a4139b0
-export ORCUS_TARBALL := liborcus-0.9.2.tar.gz -export ORCUS_TARBALL := liborcus-0.9.2.tar.gz
+export ORCUS_MD5SUM := ca1e5d486b29cd519bb1d9845a6a768e +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_MD5SUM := 593f0aa47bf2efc0efda2d28fae063b2
export OWNCLOUD_ANDROID_LIB_TARBALL := owncloud-android-library-0.9.4-no-binary-deps.tar.gz export OWNCLOUD_ANDROID_LIB_TARBALL := owncloud-android-library-0.9.4-no-binary-deps.tar.gz
export PAGEMAKER_MD5SUM := 795cc7a59ace4db2b12586971d668671 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.3.2.orig/external/boost/Module_boost.mk
+++ libreoffice-5.1.2.2/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)) @@ -11,6 +11,7 @@ $(eval $(call gb_Module_Module,boost))
$(eval $(call gb_Module_add_targets,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_system \
StaticLibrary_boost_iostreams \ StaticLibrary_boost_iostreams \
UnpackedTarball_boost \ 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 --- /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 @@ @@ -0,0 +1,36 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# -*- 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: +# 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 --- /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 @@ @@ -0,0 +1,1175 @@
+From a1df2d984d527931c6cbbe6547856283bdbf6a9b Mon Sep 17 00:00:00 2001 +From a1df2d984d527931c6cbbe6547856283bdbf6a9b Mon Sep 17 00:00:00 2001
+From: Kohei Yoshida <kohei.yoshida@gmail.com> +From: Kohei Yoshida <kohei.yoshida@gmail.com>
@ -1315,10 +1315,10 @@ Index: libreoffice-5.1.2.2/external/liborcus/0001-Fix-for-OSX-build-inside-Libre
+-- +--
+2.4.5 +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 --- /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 @@ @@ -0,0 +1,212 @@
+From c5d7282214727bcc28b6ec7e2b8016b40872cd3b Mon Sep 17 00:00:00 2001 +From c5d7282214727bcc28b6ec7e2b8016b40872cd3b Mon Sep 17 00:00:00 2001
+From: Kohei Yoshida <kohei.yoshida@gmail.com> +From: Kohei Yoshida <kohei.yoshida@gmail.com>
@ -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 +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.3.2.orig/external/liborcus/ExternalPackage_liborcus.mk
+++ libreoffice-5.1.2.2/external/liborcus/ExternalPackage_liborcus.mk +++ libreoffice-5.1.3.2/external/liborcus/ExternalPackage_liborcus.mk
@@ -12,11 +12,11 @@ $(eval $(call gb_ExternalPackage_Externa @@ -12,11 +12,11 @@ $(eval $(call gb_ExternalPackage_Externa
$(eval $(call gb_ExternalPackage_use_external_project,liborcus,liborcus)) $(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 endif
# vim: set noet sw=4 ts=4: # 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.3.2.orig/external/liborcus/ExternalProject_liborcus.mk
+++ libreoffice-5.1.2.2/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 @@ -13,6 +13,7 @@ $(eval $(call gb_ExternalProject_use_aut
$(eval $(call gb_ExternalProject_use_externals,liborcus, \ $(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.3.2.orig/external/liborcus/Library_orcus-parser.mk
+++ libreoffice-5.1.2.2/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 @@ -39,6 +39,8 @@ $(eval $(call gb_Library_add_generated_e
UnpackedTarball/liborcus/src/parser/css_types \ UnpackedTarball/liborcus/src/parser/css_types \
UnpackedTarball/liborcus/src/parser/csv_parser_base \ 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 \
UnpackedTarball/liborcus/src/parser/zip_archive_stream \ 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.3.2.orig/external/liborcus/Library_orcus.mk
+++ libreoffice-5.1.2.2/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 @@ -13,6 +13,7 @@ $(eval $(call gb_Library_use_unpacked,or
$(eval $(call gb_Library_use_externals,orcus,\ $(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: # 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.3.2.orig/external/liborcus/UnpackedTarball_liborcus.mk
+++ libreoffice-5.1.2.2/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 @@ -16,8 +16,15 @@ $(eval $(call gb_UnpackedTarball_set_pat
$(eval $(call gb_UnpackedTarball_add_patches,liborcus,\ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/0001-workaround-a-linking-problem-on-windows.patch \ 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: # 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 +++ /dev/null
@@ -1,17 +0,0 @@ @@ -1,17 +0,0 @@
---- src/parser/zip_archive_stream.cpp ---- 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) - if (length_available < length)
- throw zip_error("There is not enough stream left to fill requested 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 +++ /dev/null
@@ -1,11 +0,0 @@ @@ -1,11 +0,0 @@
---- ./src/parser/pstring.cpp.orig 2015-12-02 14:38:44.658744408 +0000 ---- ./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; - using namespace std;
- -
- namespace orcus { - 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 --- /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 @@ @@ -0,0 +1,15 @@
+diff --git a/src/liborcus/info.cpp b/src/liborcus/info.cpp +diff --git a/src/liborcus/info.cpp b/src/liborcus/info.cpp
+index ae571f5..539ce18 100644 +index ae571f5..539ce18 100644
@ -1774,10 +1774,10 @@ Index: libreoffice-5.1.2.2/external/liborcus/windows-constants-hack.patch
+ +
+ namespace orcus { + 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.3.2.orig/sc/Library_scfilt.mk
+++ libreoffice-5.1.2.2/sc/Library_scfilt.mk +++ libreoffice-5.1.3.2/sc/Library_scfilt.mk
@@ -227,6 +227,7 @@ ifeq ($(ENABLE_ORCUS),TRUE) @@ -227,6 +227,7 @@ ifeq ($(ENABLE_ORCUS),TRUE)
$(eval $(call gb_Library_use_externals,scfilt,\ $(eval $(call gb_Library_use_externals,scfilt,\
orcus \ orcus \
@ -1786,10 +1786,10 @@ Index: libreoffice-5.1.2.2/sc/Library_scfilt.mk
boost_system \ boost_system \
boost_iostreams \ boost_iostreams \
zlib \ 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.3.2.orig/sc/source/filter/inc/orcusinterface.hxx
+++ libreoffice-5.1.2.2/sc/source/filter/inc/orcusinterface.hxx +++ libreoffice-5.1.3.2/sc/source/filter/inc/orcusinterface.hxx
@@ -381,6 +381,7 @@ public: @@ -381,6 +381,7 @@ public:
virtual void set_border_count(size_t n) override; 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; 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.3.2.orig/sc/source/filter/orcus/filterdetect.cxx
+++ libreoffice-5.1.2.2/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:: @@ -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("Gnumeric XML");
return OUString(); 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.3.2.orig/sc/source/filter/orcus/interface.cxx
+++ libreoffice-5.1.2.2/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_ @@ -55,7 +55,7 @@ void ScOrcusGlobalSettings::set_default_
orcus::spreadsheet::formula_grammar_t ScOrcusGlobalSettings::get_default_formula_grammar() const orcus::spreadsheet::formula_grammar_t ScOrcusGlobalSettings::get_default_formula_grammar() const

2
libreoffice.changes
View File

@ -2,6 +2,8 @@
Fri May 6 13:36:10 UTC 2016 - tchvatal@suse.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 - 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 Wed May 4 12:07:44 UTC 2016 - tchvatal@suse.com