archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2025-02-16 23:57:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

extra/libreoffice-still to 5.1.5-1

Browse source
This commit is contained in:
Kevin Mihelich 2016-08-05 00:08:11 +00:00
parent 3f0277923b
commit acf5de3a97
7 changed files with 2306 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

108
extra/libreoffice-still/PKGBUILD
View file

@ -8,11 +8,18 @@
buildarch=28
highmem=1
# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
# Note: These are for Arch Linux use ONLY. For your own distribution, please
# get your own set of keys. Feel free to contact foutrelis@archlinux.org for
# more information.
_google_default_client_id=413772536636.apps.googleusercontent.com
_google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4
pkgbase=libreoffice-still
pkgname=('libreoffice-still-sdk' 'libreoffice-still')
_LOver=5.0.6.3
pkgver=5.0.6
pkgrel=2
_LOver=5.1.5.2
pkgver=5.1.5
pkgrel=1
arch=('i686' 'x86_64')
license=('LGPL3')
url="http://www.libreoffice.org/"
@ -21,20 +28,21 @@ makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.5' 'libwpd>=0.9.2' 'lib
'libxslt' 'redland' 'icu' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite'
'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr'
'libmspub' 'harfbuzz-icu' 'glew' 'nss' 'clucene' 'hicolor-icon-theme'
'desktop-file-utils' 'shared-mime-info' 'gtk2' 'xdg-utils' 'gst-plugins-base-libs'
'desktop-file-utils' 'shared-mime-info' 'gtk2' 'gst-plugins-base-libs'
'glu' 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'apache-ant'
'gperf' 'kdelibs' 'cppunit' 'beanshell2' 'vigra' 'clucene' #'gtk3'
'gperf' 'kdelibs' 'gtk3' 'cppunit' 'beanshell2' 'vigra' 'clucene'
'junit' 'libmythes' 'libwpg' 'mesa' 'java-environment' 'postgresql-libs'
'bluez-libs' 'harfbuzz-icu' 'gdb' 'doxygen' 'libatomic_ops' 'glew'
'bluez-libs' 'harfbuzz-icu' 'gdb' 'doxygen' 'libatomic_ops' 'mdds' 'glew'
'apr' 'serf' 'ttf-liberation' 'glm' 'libxinerama' 'libpagemaker'
'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'libfbclient')
'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'liborcus' 'liblangtag'
'libexttextcat' 'libfbclient' 'libcmis')
_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
#_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
_additional_source_url="http://dev-www.libreoffice.org/src"
_additional_source_url2="http://dev-www.libreoffice.org/extern"
source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
${_additional_source_url}/d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2
${_additional_source_url}/boost_1_59_0.tar.bz2
${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
@ -52,9 +60,6 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
${_additional_source_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
${_additional_source_url}/10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2
${_additional_source_url}/mdds_0.12.1.tar.bz2
${_additional_source_url}/7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2
${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
${_additional_source_url}/language-subtag-registry-2015-08-04.tar.bz2
${_additional_source_url}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
@ -63,16 +68,16 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
${_additional_source_url}/libgltf/libgltf-0.0.2.tar.bz2
${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
${_additional_source_url}/5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz
${_additional_source_url}/libfreehand-0.1.1.tar.bz2
${_additional_source_url}/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
make-pyuno-work-with-system-wide-module-install.diff
libreoffice-still.sh libreoffice-still.csh
update_liborcus_to_0.11.0.diff
remove_unnecessary_orcus_external_usage_from_makefiles.diff
liborcus-0.11.2.diff
gcc6_buildfix.diff
fix_gcc_build_error.diff
hunspell14_buildfix.diff)
noextract=(d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2
buildfix.diff)
noextract=(boost_1_59_0.tar.bz2
1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
@ -90,9 +95,6 @@ noextract=(d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2
3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2
mdds_0.12.1.tar.bz2
7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2
0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
language-subtag-registry-2015-08-04.tar.bz2
4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
@ -101,18 +103,16 @@ noextract=(d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2
libgltf-0.0.2.tar.bz2
d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz
libfreehand-0.1.1.tar.bz2
36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
185d60944ea767075d27247c3162b3bc-unowinreg.dll)
validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build@documentfoundation.org>
md5sums=('541d92329d433696c478f7669ac976f1'
md5sums=('7103457a9d55544d8ce93e009f1b2ca1'
'SKIP'
'902b0fa074a8b60a9598f558e9d687f7'
'05c2471dcbd424515ae9b0dd605e7c8c'
'SKIP'
'644f33f2bc84fe9ffd8a4c09b41a36fc'
'7670bbe6b922add9fe82f57ac4ca506e'
'SKIP'
'd6eef4b4cacb2183f2bf265a5a03a354'
'6aa9a5c6a4ca1016edd0ed1178e3cb87'
'1f24ab1d39f4a51faf22244c94a6203f'
'35c94d2df8893241173de1d16b6034c0'
'798b2ffdc8bcfe7bca2cf92b62caf685'
@ -130,9 +130,6 @@ md5sums=('541d92329d433696c478f7669ac976f1'
'3bdf40c0d199af31923e900d082ca2dd'
'ace6ab49184e329db254e454a010f56d'
'db60e4fde8dd6d6807523deb71ee34dc'
'10d61fbaa6a06348823651b1bd7940fe'
'ef2560ed5416652a7fe195305b14cebe'
'7681383be6ce489d84c1c74f4e7f9643'
'0168229624cfac409e766913506961a8'
'bf5986dbfa1c9a0f26cf1b00ed369484'
'4b87018f7fff1d054939d19920b751a0'
@ -141,18 +138,19 @@ md5sums=('541d92329d433696c478f7669ac976f1'
'd63a9f47ab048f5009d90693d6aa6424'
'd8bd5eed178db6e2b18eeed243f85aa8'
'ba2930200c9f019c2d93a8c88c651a0f'
'5821b806a98e6c38370970e682ce76e8'
'8cf70c5dc4d24d2dc4a107f509d2d6d7'
'36271d3fa0d9dec1632029b6d7aac925'
'185d60944ea767075d27247c3162b3bc'
'dcb5ad3e5f7139227677ea064b075422'
'40680393752d98bcb590f1f62efa61a9'
'f82232620f3e27d1532c49af4b36ce9a'
'3f526b966a672d1237cfcbadae0e3f95'
'ac71e21ecc0976b2ea6e233854963d4b'
'58616b84405f0a610a713bbd060d3214'
'6752d22fc5bcbdbef0640c6aca163e50'
'60a6a9bf86bbcefa8c712dc8ba8ab73f'
'2afac5aa93f7bcd85058348147c962e4')
'd386f3a0b484cd3929329a294159f5bc')
prepare() {
cd libreoffice-$_LOver
# move external sources into place
@ -161,6 +159,9 @@ prepare() {
ln -s ${srcdir}/$source .
done
popd
# https://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-5-2&id=e13db0f16c4ac5a243587e881d7b18979d07f478
patch -Np1 -i ../buildfix.diff
# unowinreg.dll must be a file not a symlink or the result will become a broken symlink
# /usr/share/libreoffice/sdk/classes/win/unowinreg.dll -> /build/libreoffice/src/185d60944ea767075d27247c3162b3bc-unowinreg.dll
@ -181,19 +182,22 @@ prepare() {
# i686 build broken
[ "$CARCH" = "i686" ] && sed -i '/CppunitTest_sw_ooxmlimport/d' sw/Module_sw.mk
[ "$CARCH" = "i686" ] && sed -i '/CppunitTest_sw_ooxmlexport7/d' sw/Module_sw.mk
[ "$CARCH" = "i686" ] && sed -i '/CppunitTest_basic_scanner/d' basic/Module_basic.mk
# qt4 fix
sed -i "s:qmake:qmake-qt4:g" configure.ac
# https://cgit.freedesktop.org/libreoffice/core/commit/?id=b325b4c286b56a63316063a3ac4648bf7b7efcbe
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
# https://cgit.freedesktop.org/libreoffice/core/commit/?id=db729f3b685fd832a3ec7387b339cf2bbeb4bd4d
patch -Np1 -i ${srcdir}/liborcus-0.11.2.diff
# fix checking whether KDE is >= 4.2... configure: error: KDE version too old
# http://bugs.debian.org/823145
patch -Np1 -i ${srcdir}/gcc6_buildfix.diff
# commit b9fa2963cf12e6987b3a0acc219c4fa591e41be8
patch -Np1 -i ${srcdir}/fix_gcc_build_error.diff
# hunspell 1.4.x fix
patch -Np1 -i ${srcdir}/hunspell14_buildfix.diff
}
build() {
@ -201,13 +205,12 @@ build() {
# strip -s from Makeflags in case you use it to shorten build logs
_MAKEFLAGS=${MAKEFLAGS/-s/}
./autogen.sh --with-build-version="${_LOver} Arch Linux build-${pkgrel}" --with-vendor="Arch Linux" \
--enable-split-app-modules \
--with-parallelism=${_MAKEFLAGS/-j/} \
--with-external-tar="${srcdir}/ext_sources" \
--disable-fetch-external \
--disable-verbose \
--enable-release-build \
--prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
--libdir=/usr/lib --mandir=/usr/share/man \
@ -218,13 +221,9 @@ build() {
--enable-dbus \
--enable-evolution2\
--enable-gio\
--disable-gnome-vfs\
--disable-kde\
--enable-kde4\
--disable-gtk3 \
--enable-gtk3 \
--disable-gstreamer-0-10 \
--disable-gconf \
--disable-lockdown \
--enable-openssl \
--enable-odk\
--enable-orcus \
@ -237,14 +236,14 @@ build() {
--without-fonts\
--with-system-apr \
--with-system-libcdr \
--without-system-mdds\
--with-system-mdds\
--without-myspell-dicts \
--with-system-libvisio \
--without-system-libcmis \
--with-system-libcmis \
--with-system-libmspub \
--without-system-libexttextcat \
--without-system-orcus \
--without-system-liblangtag \
--with-system-libexttextcat \
--with-system-orcus \
--with-system-liblangtag \
--without-system-jfreereport \
--without-system-apache-commons \
--with-system-libodfgen \
@ -282,13 +281,13 @@ build() {
--without-system-hsqldb \
--with-alloc=system \
--with-system-clucene \
--with-gdrive-client-id=${_google_default_client_id} \
--with-gdrive-client-secret=${_google_default_client_secret} \
--disable-dependency-tracking \
--enable-hardlink-deliver
touch src.downloaded
make build-nocheck
# use this if i686 fails
#make || make CppunitTest_sw_ooxmlsdrexport VALGRIND=memcheck
mkdir ${srcdir}/fakeinstall
make DESTDIR=${srcdir}/fakeinstall distro-pack-install
@ -303,7 +302,7 @@ package_libreoffice-still-sdk() {
pkgdesc="Software Development Kit for LibreOffice maintenance branch"
depends=('libreoffice-still' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment')
provides=('libreoffice-sdk')
conflicts=('libreoffice-still-sdk')
conflicts=('libreoffice-fresh-sdk')
for dir in $(grep -h ^%dir libreoffice-$_LOver/file-lists/sdk{,_doc}_list.txt); do
install -dm755 ${pkgdir}/${dir/\%dir/}
@ -335,7 +334,8 @@ package_libreoffice-still() {
'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr'
'libmspub' 'harfbuzz-icu' 'glew' 'nss' 'clucene' 'hicolor-icon-theme'
'desktop-file-utils' 'shared-mime-info' 'glu' 'libpagemaker'
'libxinerama' 'libabw' 'libmwaw' 'libe-book' 'libcups' 'gtk2' 'libfbclient')
'libxinerama' 'libabw' 'libmwaw' 'libe-book' 'libcups' 'gtk2'
'liborcus' 'liblangtag' 'libexttextcat' 'libfbclient' 'libcmis')
optdepends=('java-runtime: adds java support'
'java-environment: required by extension-wiki-publisher and extension-nlpsolver'
'pstoedit: translates PostScript and PDF graphics into other vector formats'
@ -350,7 +350,7 @@ package_libreoffice-still() {
'libpaper: takes care of papersize'
'postgresql-libs: for postgresql-connector'
'coin-or-mp: required by the Calc solver'
#'gtk3: for GTK3 integration'
'gtk3: for GTK3 integration'
'kdelibs: for KDE desktop integration')
backup=(etc/libreoffice/sofficerc
etc/libreoffice/bootstraprc

27
extra/libreoffice-still/buildfix.diff Normal file
View file

@ -0,0 +1,27 @@
From e13db0f16c4ac5a243587e881d7b18979d07f478 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Mon, 25 Jul 2016 12:08:35 +0100
Subject: curl 7.50.0 has CURL as typedef struct Curl_easy
Change-Id: I22e5e2cdf78c38087579071c1b1570a8adc7d3c4
(cherry picked from commit 0b8e589875ffd84150470832de18ebd79989efc0)
Reviewed-on: https://gerrit.libreoffice.org/27513
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
diff --git a/ucb/source/ucp/ftp/ftploaderthread.cxx b/ucb/source/ucp/ftp/ftploaderthread.cxx
index 25bc26d..5d1cfb5 100644
--- a/ucb/source/ucp/ftp/ftploaderthread.cxx
+++ b/ucb/source/ucp/ftp/ftploaderthread.cxx
@@ -77,7 +77,7 @@ FTPLoaderThread::~FTPLoaderThread() {
CURL* FTPLoaderThread::handle() {
- CURL* ret = osl_getThreadKeyData(m_threadKey);
+ CURL* ret = static_cast<CURL*>(osl_getThreadKeyData(m_threadKey));
if(!ret) {
ret = curl_easy_init();
if (ret != nullptr) {
--
cgit v0.10.2

39
extra/libreoffice-still/fix_gcc_build_error.diff
View file

@ -1,39 +0,0 @@
From b9fa2963cf12e6987b3a0acc219c4fa591e41be8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Wed, 3 Feb 2016 10:30:43 +0000
Subject: fix gcc build error
error: invalid operands of types '__gnu_cxx::__enable_if<true, double>::__type
{aka double}' and 'int' to binary 'operator%'
apparently there's a template returning double for abs for the
non-int/long/float/double argument case. So promote earlier to int so the
abs<int> is called
Change-Id: I882a27c5ec349f894c1c9f4857687360a46b55ae
diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index 744415e..cf061c9 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -1250,7 +1250,7 @@ bool Converter::convertDuration(util::Duration& rDuration,
static void
-lcl_AppendTimezone(OUStringBuffer & i_rBuffer, sal_Int16 const nOffset)
+lcl_AppendTimezone(OUStringBuffer & i_rBuffer, int const nOffset)
{
if (0 == nOffset)
{
@@ -1435,7 +1435,7 @@ lcl_MaxDaysPerMonth(const sal_Int32 nMonth, const sal_Int32 nYear)
static void lcl_ConvertToUTC(
sal_Int16 & o_rYear, sal_uInt16 & o_rMonth, sal_uInt16 & o_rDay,
sal_uInt16 & o_rHours, sal_uInt16 & o_rMinutes,
- sal_Int16 const nSourceOffset)
+ int const nSourceOffset)
{
sal_Int16 nOffsetHours(abs(nSourceOffset) / 60);
sal_Int16 const nOffsetMinutes(abs(nSourceOffset) % 60);
--
cgit v0.10.2

14
extra/libreoffice-still/hunspell14_buildfix.diff
View file

@ -1,14 +0,0 @@
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index 6979a33..a9a1575 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -31,7 +31,6 @@
#include <lingutil.hxx>
#include <hunspell.hxx>
-#include <dictmgr.hxx>
#include <sspellimp.hxx>
#include <linguistic/lngprops.hxx>
--
cgit v0.10.2

118
extra/libreoffice-still/liborcus-0.11.2.diff Normal file
View file

@ -0,0 +1,118 @@
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/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_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<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

124
extra/libreoffice-still/remove_unnecessary_orcus_external_usage_from_makefiles.diff Normal file
View file

@ -0,0 +1,124 @@
From 07d4c443e21cd22545d4516515c50b1c8dd39a9b Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Tue, 8 Mar 2016 15:01:59 +0100
Subject: sc: remove unnecessary orcus external usage from makefiles
This caused incremental builds to fail after today's orcus upgrade.
The cxx files of these tests don't actually include orcus headers, so
the libraries were not re-linked in incremental builds.
Change-Id: Ibfcf216a7848f3c0adfae4ef59c4b756c290d6b2
diff --git a/sc/CppunitTest_sc_bugfix_test.mk b/sc/CppunitTest_sc_bugfix_test.mk
index 55311cd..712f444 100644
--- a/sc/CppunitTest_sc_bugfix_test.mk
+++ b/sc/CppunitTest_sc_bugfix_test.mk
@@ -16,8 +16,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_bugfix_test, \
$(eval $(call gb_CppunitTest_use_externals,sc_bugfix_test, \
boost_headers \
mdds_headers \
- orcus \
- orcus-parser \
libxml2 \
))
diff --git a/sc/CppunitTest_sc_copypaste.mk b/sc/CppunitTest_sc_copypaste.mk
index 7df4f51..641709c 100644
--- a/sc/CppunitTest_sc_copypaste.mk
+++ b/sc/CppunitTest_sc_copypaste.mk
@@ -16,8 +16,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_copypaste, \
$(eval $(call gb_CppunitTest_use_externals,sc_copypaste, \
boost_headers \
mdds_headers \
- orcus \
- orcus-parser \
libxml2 \
))
diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk
index 4fbf489..db445f53 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -22,8 +22,6 @@ endif
$(eval $(call gb_CppunitTest_use_externals,sc_filters_test, \
boost_headers \
mdds_headers \
- orcus \
- orcus-parser \
))
$(eval $(call gb_CppunitTest_use_libraries,sc_filters_test, \
diff --git a/sc/CppunitTest_sc_opencl_test.mk b/sc/CppunitTest_sc_opencl_test.mk
index 86605a2..ea93111 100644
--- a/sc/CppunitTest_sc_opencl_test.mk
+++ b/sc/CppunitTest_sc_opencl_test.mk
@@ -16,8 +16,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_opencl_test, \
$(eval $(call gb_CppunitTest_use_externals,sc_opencl_test, \
boost_headers \
mdds_headers \
- orcus \
- orcus-parser \
))
$(eval $(call gb_CppunitTest_use_libraries,sc_opencl_test, \
diff --git a/sc/CppunitTest_sc_rangelst_test.mk b/sc/CppunitTest_sc_rangelst_test.mk
index 2bf6f0f..fa6f690 100644
--- a/sc/CppunitTest_sc_rangelst_test.mk
+++ b/sc/CppunitTest_sc_rangelst_test.mk
@@ -16,18 +16,12 @@ $(eval $(call gb_CppunitTest_use_externals,sc_rangelst_test, \
icuuc \
libxml2 \
mdds_headers \
- orcus \
- orcus-parser \
))
$(eval $(call gb_CppunitTest_add_exception_objects,sc_rangelst_test, \
sc/qa/unit/rangelst_test \
))
-$(eval $(call gb_CppunitTest_use_library_objects,sc_rangelst_test, \
- scqahelper \
-))
-
$(eval $(call gb_CppunitTest_use_libraries,sc_rangelst_test, \
basegfx \
comphelper \
@@ -45,6 +39,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_rangelst_test, \
sax \
sb \
sc \
+ scqahelper \
sfx \
sot \
svl \
diff --git a/sc/CppunitTest_sc_subsequent_export_test.mk b/sc/CppunitTest_sc_subsequent_export_test.mk
index 1cfaf69..6c2c9e5 100644
--- a/sc/CppunitTest_sc_subsequent_export_test.mk
+++ b/sc/CppunitTest_sc_subsequent_export_test.mk
@@ -16,8 +16,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_subsequent_export_test, \
$(eval $(call gb_CppunitTest_use_externals,sc_subsequent_export_test, \
boost_headers \
mdds_headers \
- orcus \
- orcus-parser \
libxml2 \
))
diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk
index 08dedbb..845206b 100644
--- a/sc/CppunitTest_sc_subsequent_filters_test.mk
+++ b/sc/CppunitTest_sc_subsequent_filters_test.mk
@@ -16,8 +16,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_subsequent_filters_test, \
$(eval $(call gb_CppunitTest_use_externals,sc_subsequent_filters_test, \
boost_headers \
mdds_headers \
- orcus \
- orcus-parser \
libxml2 \
))
--
cgit v0.10.2

1983
extra/libreoffice-still/update_liborcus_to_0.11.0.diff Normal file
View file

File diff suppressed because it is too large Load diff