[libreoffice] 01/02: (fix) build with mdds 1.2
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 2ab508ad55e3e2ade337f1e8f643892eac412d79
Author: Rene Engelhard <rene@rene-engelhard.de>
Date: Sat May 14 00:26:57 2016 +0200
(fix) build with mdds 1.2
---
changelog | 7 ++-
control | 4 +-
patches/mdds-1.2.0.diff | 144 ++++++++++++++++++++++++++++++++++++++++++++++++
patches/series | 1 +
rules | 16 +++---
tests/control | 2 +-
6 files changed, 162 insertions(+), 12 deletions(-)
diff --git a/changelog b/changelog
index f8ce44d..fb0edd0 100644
--- a/changelog
+++ b/changelog
@@ -9,7 +9,12 @@ libreoffice (1:5.1.3-1) unstable; urgency=medium
* debian/*.lintian-overrides: remove obsolete
binary-or-shlib-defines-rpath and no-debconf-config overrides
- -- Rene Engelhard <rene@debian.org> Thu, 12 May 2016 00:08:07 +0200
+ * debian/patches/mdds-1.2.0.diff: backport patch to build with mdds 1.2
+ from master
+ * debian/rules:
+ - bump libmdds-dev and liborcus-dev build-deps and update orcus handling
+
+ -- Rene Engelhard <rene@debian.org> Sat, 14 May 2016 00:18:49 +0200
libreoffice (1:5.1.3~rc2-3) unstable; urgency=medium
diff --git a/control b/control
index a772bd5..cb15709 100644
--- a/control
+++ b/control
@@ -91,7 +91,7 @@ Build-Depends: ant (>= 1.7.0) [!mips64],
liblcms2-dev,
libldap2-dev,
liblpsolve55-dev (>= 5.5.0.13-5+b1),
- libmdds-dev (>= 1.0),
+ libmdds-dev (>= 1.2),
libmspub-dev (>= 0.1),
libmwaw-dev (>= 0.3.1),
libmysqlclient-dev,
@@ -101,7 +101,7 @@ Build-Depends: ant (>= 1.7.0) [!mips64],
libnss3-dev (>= 3.12.3),
libo3dgc-dev (>= 0~20131011-2) [amd64 i386],
libodfgen-dev (>= 0.1),
- liborcus-dev (>= 0.11),
+ liborcus-dev (>= 0.11.2),
libpagemaker-dev,
libpcre3-dev [amd64 i386],
libpng-dev,
diff --git a/patches/mdds-1.2.0.diff b/patches/mdds-1.2.0.diff
new file mode 100644
index 0000000..86ae920
--- /dev/null
+++ b/patches/mdds-1.2.0.diff
@@ -0,0 +1,144 @@
+From db729f3b685fd832a3ec7387b339cf2bbeb4bd4d Mon Sep 17 00:00:00 2001
+From: Kohei Yoshida <kohei.yoshida@gmail.com>
+Date: Wed, 11 May 2016 21:45:56 -0400
+Subject: Update mdds to 1.2.0. Note that the API version is also up.
+
+liborcus-0.11.2 is out only to make it buildable with mdds-1.2.
+
+Change-Id: I9648d827b008da252c57be0ebfd2efccb008ac70
+Reviewed-on: https://gerrit.libreoffice.org/24944
+Tested-by: Jenkins <ci@libreoffice.org>
+Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
+
+diff --git a/configure.ac b/configure.ac
+index 3f1b7f0..6dea282 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -8832,7 +8832,7 @@ AC_SUBST(SYSTEM_BOOST)
+ dnl ===================================================================
+ dnl Check for system mdds
+ dnl ===================================================================
+-libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds >= 0.12.0], ["-I${WORKDIR}/UnpackedTarball/mdds/include"])
++libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.2 >= 1.2.0], ["-I${WORKDIR}/UnpackedTarball/mdds/include"])
+
+ dnl ===================================================================
+ dnl Check for system glm
+@@ -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/download.lst b/download.lst
+index a2483c2..ddd6edc 100644
+--- a/download.lst
++++ b/download.lst
+@@ -94,8 +94,8 @@
+ export LIBXSLT_TARBALL := 9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz
+ export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
+ export MARIADB_TARBALL := a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz
+-export MDDS_MD5SUM := ef2560ed5416652a7fe195305b14cebe
+-export MDDS_TARBALL := mdds_0.12.1.tar.bz2
++export MDDS_MD5SUM := 9f3383fb7bae825eab69f3a6ec1d74b2
++export MDDS_TARBALL := mdds-1.2.0.tar.bz2
+ export MSPUB_MD5SUM := ff9d0f9dd8fbc523408ea1953d5bde41
+ export MSPUB_TARBALL := libmspub-0.1.2.tar.bz2
+ export MWAW_MD5SUM := 4a8a53a9d997cf0e2bd208178797dbfb
+@@ -113,8 +113,8 @@
+ export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
+ export OPENSSL_MD5SUM := 9392e65072ce4b614c1392eefc1f23d0
+ export OPENSSL_TARBALL := openssl-1.0.2h.tar.gz
+-export ORCUS_MD5SUM := ca1e5d486b29cd519bb1d9845a6a768e
+-export ORCUS_TARBALL := liborcus-0.11.0.tar.gz
++export ORCUS_MD5SUM := 205badaee72adf99422add8c4c49d669
++export ORCUS_TARBALL := liborcus-0.11.2.tar.gz
+ export OWNCLOUD_ANDROID_LIB_MD5SUM := 593f0aa47bf2efc0efda2d28fae063b2
+ export OWNCLOUD_ANDROID_LIB_TARBALL := owncloud-android-library-0.9.4-no-binary-deps.tar.gz
+ export PAGEMAKER_MD5SUM := 795cc7a59ace4db2b12586971d668671
+diff --git a/sc/inc/mtvelements.hxx b/sc/inc/mtvelements.hxx
+index 0bc5162..18edafc 100644
+--- a/sc/inc/mtvelements.hxx
++++ b/sc/inc/mtvelements.hxx
+@@ -53,6 +53,7 @@ const mdds::mtv::element_t element_type_cellnote = mdds::mtv::element_type_user_
+ /// Mapped standard element types (for convenience).
+ const mdds::mtv::element_t element_type_numeric = mdds::mtv::element_type_numeric;
+ const mdds::mtv::element_t element_type_empty = mdds::mtv::element_type_empty;
++const mdds::mtv::element_t element_type_uint16 = mdds::mtv::element_type_ushort;
+
+ /// Custom element blocks.
+
+@@ -65,6 +66,7 @@ typedef mdds::mtv::noncopyable_managed_element_block<element_type_formula, ScFor
+
+ /// Mapped standard element blocks (for convenience).
+ typedef mdds::mtv::numeric_element_block numeric_block;
++typedef mdds::mtv::ushort_element_block uint16_block;
+
+ /// This needs to be in the same namespace as CellTextAttr.
+ MDDS_MTV_DEFINE_ELEMENT_CALLBACKS(CellTextAttr, element_type_celltextattr, CellTextAttr(), celltextattr_block)
+diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
+index f1ce9a5..1689809 100644
+--- a/sc/source/core/tool/scmatrix.cxx
++++ b/sc/source/core/tool/scmatrix.cxx
+@@ -57,17 +57,15 @@ using ::std::unary_function;
+ * Custom string trait struct to tell mdds::multi_type_matrix about the
+ * custom string type and how to handle blocks storing them.
+ */
+-struct custom_string_trait
++struct matrix_trait
+ {
+- typedef svl::SharedString string_type;
+ typedef sc::string_block string_element_block;
+-
+- static const mdds::mtv::element_t string_type_identifier = sc::element_type_string;
++ typedef sc::uint16_block integer_element_block;
+
+ typedef mdds::mtv::custom_block_func1<sc::string_block> element_block_func;
+ };
+
+-typedef mdds::multi_type_matrix<custom_string_trait> MatrixImplType;
++typedef mdds::multi_type_matrix<matrix_trait> MatrixImplType;
+
+ namespace {
+
+@@ -2304,6 +2302,7 @@ public:
+ }
+ }
+ break;
++ case mdds::mtm::element_integer:
+ case mdds::mtm::element_string:
+ case mdds::mtm::element_empty:
+ default:
+diff --git a/svl/source/misc/gridprinter.cxx b/svl/source/misc/gridprinter.cxx
+index 4044b3e..70e7439 100644
+--- a/svl/source/misc/gridprinter.cxx
++++ b/svl/source/misc/gridprinter.cxx
+@@ -26,12 +26,10 @@ const mdds::mtv::element_t element_type_string = mdds::mtv::element_type_user_st
+ // String block
+ typedef mdds::mtv::default_element_block<element_type_string, OUString> string_block;
+
+-struct custom_string_trait
++struct matrix_trait
+ {
+- typedef OUString string_type;
+ typedef string_block string_element_block;
+-
+- static const mdds::mtv::element_t string_type_identifier = element_type_string;
++ typedef mdds::mtv::ushort_element_block integer_element_block;
+
+ typedef mdds::mtv::custom_block_func1<string_block> element_block_func;
+ };
+@@ -48,7 +46,7 @@ MDDS_MTV_DEFINE_ELEMENT_CALLBACKS(OUString, svl::element_type_string, OUString()
+
+ namespace svl {
+
+-typedef mdds::multi_type_matrix<custom_string_trait> MatrixImplType;
++typedef mdds::multi_type_matrix<matrix_trait> MatrixImplType;
+
+ struct GridPrinter::Impl
+ {
+--
+cgit v0.10.2
+
diff --git a/patches/series b/patches/series
index 77bd49b..5273052 100644
--- a/patches/series
+++ b/patches/series
@@ -36,3 +36,4 @@ OPENCL_DLL_NAME.diff
no-packagekit-per-default.diff
liborcus-0.11.diff
kde4-cflags-no-usr-include.diff
+mdds-1.2.0.diff
diff --git a/rules b/rules
index 909d14b..afd82a8 100755
--- a/rules
+++ b/rules
@@ -168,7 +168,7 @@ ifeq "$(BOOST_VERSION)" "default"
endif
endif
SYSTEM_STUFF += mdds
-MDDS_VER := 1.0
+MDDS_VER := 1.2
SYSTEM_STUFF += vigra
USE_EXTERNAL_CXXLIBS=y
SYSTEM_STUFF += mythes
@@ -471,7 +471,7 @@ ENABLE_LIBLANGTAG=y
SYSTEM_STUFF += liblangtag
ENABLE_ORCUS=y
SYSTEM_STUFF += orcus
-LIBORCUS_MINVER=0.11
+LIBORCUS_MINVER=0.11.2
USE_UCPP=y
ifeq "$(USE_UCPP)" "y"
SYSTEM_STUFF += ucpp
@@ -1169,9 +1169,9 @@ ifneq (,$(filter boost, $(SYSTEM_STUFF)))
endif
ifneq (,$(filter mdds, $(SYSTEM_STUFF)))
- ifeq "$(MDDS_VER)" "1.0"
- BUILD_DEPS += , libmdds-dev (>= 1.0)
- export MDDS_CFLAGS=$(shell pkg-config --cflags mdds-1.0)
+ ifeq "$(MDDS_VER)" "1.2"
+ BUILD_DEPS += , libmdds-dev (>= 1.2)
+ export MDDS_CFLAGS=$(shell pkg-config --cflags mdds-1.2)
export MDDS_LIBS=' '
else
BUILD_DEPS += , libmdds-dev (>= 0.12)
@@ -1659,7 +1659,7 @@ endif
rm -f dbaccess/qa/extras/testdocuments/fdo84315.odb.lck
ifeq (,$(filter orcus, $(SYSTEM_STUFF)))
- cd $(TARFILE_LOCATION) && rm -f liborcus-0.11.0.tar.gz
+ cd $(TARFILE_LOCATION) && rm -f liborcus-0.11.2.tar.gz
endif
# Files created in debian directory
@@ -1870,7 +1870,7 @@ ifeq "$(ENABLE_FIREBIRD)" "y"
endif
ifneq (,$(filter mdds, $(SYSTEM_STUFF)))
- ifneq "$(MDDS_VER)" "1.0"
+ ifneq "$(MDDS_VER)" "1.2"
perl -pi -e "s/(Build-Conflicts: .*)/\1,libmdds-dev (>= 1.0),/" debian/control
endif
endif
@@ -1956,7 +1956,7 @@ ifneq "$(PACKAGE_UNOWINREG_DLL)" "y"
endif
ifeq (,$(filter orcus, $(SYSTEM_STUFF)))
- cd $(TARFILE_LOCATION) && ln -sf liborcus-0.11.0.tar.gz.dfsg liborcus-0.11.0.tar.gz
+ cd $(TARFILE_LOCATION) && ln -sf liborcus-0.11.2.tar.gz.dfsg liborcus-0.11.2.tar.gz
endif
touch $@
diff --git a/tests/control b/tests/control
index 8922285..aa23265 100644
--- a/tests/control
+++ b/tests/control
@@ -1,5 +1,5 @@
Tests: junit-subsequentcheck
-Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libarchive-zip-perl, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.0.2-4) , opencollada-dev (>= 0.1.0~2 [...]
+Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libarchive-zip-perl, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.0.2-4) , opencollada-dev (>= 0.1.0~2 [...]
Tests: pyuno-import
Depends: python3-uno
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: