diff --git a/extra/libreoffice-fresh/PKGBUILD b/extra/libreoffice-fresh/PKGBUILD index 454a589f5..1b651853f 100644 --- a/extra/libreoffice-fresh/PKGBUILD +++ b/extra/libreoffice-fresh/PKGBUILD @@ -19,7 +19,7 @@ pkgbase=libreoffice-fresh pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh') _LOver=5.1.3.2 pkgver=5.1.3 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -74,6 +74,7 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc} libreoffice-fresh.sh libreoffice-fresh.csh update_liborcus_to_0.11.0.diff remove_unnecessary_orcus_external_usage_from_makefiles.diff + liborcus-0.11.2.diff gcc6_buildfix.diff) noextract=(boost_1_59_0.tar.bz2 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz @@ -143,6 +144,7 @@ md5sums=('cbe602264e58f7c93e72068c408e3551' 'e7e4b3e70e99e5cba8f8dfcacf3b0d87' '3f526b966a672d1237cfcbadae0e3f95' 'ac71e21ecc0976b2ea6e233854963d4b' + '58616b84405f0a610a713bbd060d3214' '6752d22fc5bcbdbef0640c6aca163e50') prepare() { @@ -185,8 +187,11 @@ prepare() { patch -Np1 -i ${srcdir}/update_liborcus_to_0.11.0.diff # https://cgit.freedesktop.org/libreoffice/core/commit/?id=07d4c443e21cd22545d4516515c50b1c8dd39a9b patch -Np1 -i ${srcdir}/remove_unnecessary_orcus_external_usage_from_makefiles.diff - - sed -i "s:mdds >= 0.12.0:mdds-1.0 >= 0.12.0:g" configure.ac +# return 1 + # https://cgit.freedesktop.org/libreoffice/core/commit/?id=db729f3b685fd832a3ec7387b339cf2bbeb4bd4d + patch -Np1 -i ${srcdir}/liborcus-0.11.2.diff + +# sed -i "s:mdds >= 0.12.0:mdds-1.2 >= 0.12.0:g" configure.ac # fix checking whether KDE is >= 4.2... configure: error: KDE version too old # http://bugs.debian.org/823145 diff --git a/extra/libreoffice-fresh/liborcus-0.11.2.diff b/extra/libreoffice-fresh/liborcus-0.11.2.diff new file mode 100644 index 000000000..08a4af572 --- /dev/null +++ b/extra/libreoffice-fresh/liborcus-0.11.2.diff @@ -0,0 +1,118 @@ +From db729f3b685fd832a3ec7387b339cf2bbeb4bd4d Mon Sep 17 00:00:00 2001 +From: Kohei Yoshida +Date: Wed, 11 May 2016 21:45:56 -0400 +Subject: Update mdds to 1.2.0. Note that the API version is also up. + +liborcus-0.11.2 is out only to make it buildable with mdds-1.2. + +Change-Id: I9648d827b008da252c57be0ebfd2efccb008ac70 +Reviewed-on: https://gerrit.libreoffice.org/24944 +Tested-by: Jenkins +Reviewed-by: Kohei Yoshida + +diff --git a/configure.ac b/configure.ac +index 3f1b7f0..6dea282 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -8832,7 +8832,7 @@ AC_SUBST(SYSTEM_BOOST) + dnl =================================================================== + dnl Check for system mdds + dnl =================================================================== +-libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds >= 0.12.0], ["-I${WORKDIR}/UnpackedTarball/mdds/include"]) ++libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.2 >= 1.2.0], ["-I${WORKDIR}/UnpackedTarball/mdds/include"]) + + dnl =================================================================== + dnl Check for system glm +@@ -9148,7 +9148,7 @@ if test -z "$enable_orcus" -o "$enable_orcus" != no; then + ENABLE_ORCUS="TRUE" + AC_DEFINE(ENABLE_ORCUS) + +- libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.11 >= 0.11.0]) ++ libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.11 >= 0.11.2]) + if test "$with_system_orcus" != "yes"; then + if test "$SYSTEM_BOOST" = "TRUE"; then + # =========================================================== +diff --git a/sc/inc/mtvelements.hxx b/sc/inc/mtvelements.hxx +index 0bc5162..18edafc 100644 +--- a/sc/inc/mtvelements.hxx ++++ b/sc/inc/mtvelements.hxx +@@ -53,6 +53,7 @@ const mdds::mtv::element_t element_type_cellnote = mdds::mtv::element_type_user_ + /// Mapped standard element types (for convenience). + const mdds::mtv::element_t element_type_numeric = mdds::mtv::element_type_numeric; + const mdds::mtv::element_t element_type_empty = mdds::mtv::element_type_empty; ++const mdds::mtv::element_t element_type_uint16 = mdds::mtv::element_type_ushort; + + /// Custom element blocks. + +@@ -65,6 +66,7 @@ typedef mdds::mtv::noncopyable_managed_element_block element_block_func; + }; + +-typedef mdds::multi_type_matrix MatrixImplType; ++typedef mdds::multi_type_matrix MatrixImplType; + + namespace { + +@@ -2304,6 +2302,7 @@ public: + } + } + break; ++ case mdds::mtm::element_integer: + case mdds::mtm::element_empty: + break; + } +diff --git a/svl/source/misc/gridprinter.cxx b/svl/source/misc/gridprinter.cxx +index 4044b3e..70e7439 100644 +--- a/svl/source/misc/gridprinter.cxx ++++ b/svl/source/misc/gridprinter.cxx +@@ -26,12 +26,10 @@ const mdds::mtv::element_t element_type_string = mdds::mtv::element_type_user_st + // String block + typedef mdds::mtv::default_element_block string_block; + +-struct custom_string_trait ++struct matrix_trait + { +- typedef OUString string_type; + typedef string_block string_element_block; +- +- static const mdds::mtv::element_t string_type_identifier = element_type_string; ++ typedef mdds::mtv::ushort_element_block integer_element_block; + + typedef mdds::mtv::custom_block_func1 element_block_func; + }; +@@ -48,7 +46,7 @@ MDDS_MTV_DEFINE_ELEMENT_CALLBACKS(OUString, svl::element_type_string, OUString() + + namespace svl { + +-typedef mdds::multi_type_matrix MatrixImplType; ++typedef mdds::multi_type_matrix MatrixImplType; + + struct GridPrinter::Impl + { +-- +cgit v0.10.2 +