mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2025-01-27 23:44:04 +00:00
extra/libreoffice-still to 5.2.5-1
This commit is contained in:
Kevin Mihelich
parent
07204d91ee
commit
c459c1a494
6 changed files with 32 additions and 233 deletions
|
|
@ -17,40 +17,37 @@ _google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4
|
|||
|
||||
pkgbase=libreoffice-still
|
||||
pkgname=('libreoffice-still-sdk' 'libreoffice-still')
|
||||
_LOver=5.1.6.2
|
||||
pkgver=5.1.6
|
||||
pkgrel=5
|
||||
_LOver=5.2.5.1
|
||||
pkgver=5.2.5
|
||||
pkgrel=1
|
||||
arch=('i686' 'x86_64')
|
||||
license=('LGPL3')
|
||||
url="http://www.libreoffice.org/"
|
||||
makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.6' 'libwpd>=0.9.2' 'libwps'
|
||||
'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib'
|
||||
'libxslt' 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' #'icu'
|
||||
'libxslt' 'redland' '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' 'gst-plugins-base-libs'
|
||||
'glu' 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'apache-ant'
|
||||
'gperf' 'kdelibs' 'gtk3' 'cppunit' 'beanshell' 'vigra' 'clucene'
|
||||
'junit' 'libmythes' 'libwpg' 'mesa' 'java-environment' 'postgresql-libs'
|
||||
'gperf' 'kdelibs' 'gtk3' 'cppunit' 'beanshell' 'clucene'
|
||||
'junit' 'libmythes' 'libwpg' 'java-environment' 'postgresql-libs' 'libgl'
|
||||
'bluez-libs' 'gdb' 'doxygen' 'libatomic_ops' 'mdds' 'glew'
|
||||
'apr' 'serf' 'ttf-liberation' 'glm' 'libxinerama' 'libpagemaker'
|
||||
'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'liborcus' 'liblangtag'
|
||||
'libexttextcat' 'libfbclient' 'libcmis')
|
||||
'libexttextcat' 'libfbclient' 'libcmis' 'gobject-introspection')
|
||||
|
||||
_mirror="https://download.documentfoundation.org/libreoffice/src/${pkgver}"
|
||||
#_mirror="https://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}/boost_1_59_0.tar.bz2
|
||||
${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
|
||||
${_additional_source_url}/boost_1_60_0.tar.bz2
|
||||
${_additional_source_url}/ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz
|
||||
${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
|
||||
${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
|
||||
${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
|
||||
${_additional_source_url}/commons-logging-1.2-src.tar.gz
|
||||
${_additional_source_url}/8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz
|
||||
${_additional_source_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
|
||||
${_additional_source_url}/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip
|
||||
${_additional_source_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
|
||||
${_additional_source_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
|
||||
${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
|
||||
|
|
@ -69,24 +66,16 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
|
|||
${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
|
||||
${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
|
||||
${_additional_source_url}/libfreehand-0.1.1.tar.bz2
|
||||
${_additional_source_url}/c4a2d71ff56aec5ebfab2a3f059be99d-icu4c-56_1-src.tgz
|
||||
${_additional_source_url}/976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz
|
||||
${_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
|
||||
buildfix.diff)
|
||||
noextract=(boost_1_59_0.tar.bz2
|
||||
1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
|
||||
libreoffice-still.sh libreoffice-still.csh)
|
||||
noextract=(boost_1_60_0.tar.bz2
|
||||
ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz
|
||||
35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
|
||||
798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
|
||||
a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
|
||||
commons-logging-1.2-src.tar.gz
|
||||
8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz
|
||||
2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
|
||||
048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip
|
||||
eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
|
||||
39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
|
||||
3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
|
||||
|
|
@ -105,24 +94,21 @@ noextract=(boost_1_59_0.tar.bz2
|
|||
d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
|
||||
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
|
||||
libfreehand-0.1.1.tar.bz2
|
||||
c4a2d71ff56aec5ebfab2a3f059be99d-icu4c-56_1-src.tgz
|
||||
976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz
|
||||
185d60944ea767075d27247c3162b3bc-unowinreg.dll)
|
||||
validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build@documentfoundation.org>
|
||||
sha256sums=('04a01b7f28beb9b090ffb7d409a30ab5fa1635c2364be2dd4b080d76cd591d94'
|
||||
sha256sums=('9756a322a497aa83d096fa0ac5541622d9a8f5038ce9c0ded48199566ab0d300'
|
||||
'SKIP'
|
||||
'afe486145733405eecaafbad95db2f3b303b528ef21fa8548ad471ac09ff0dab'
|
||||
'11199cca59748dc9cade4f5cbb0478f600d3c54114b09819eac54338dbbd49b4'
|
||||
'SKIP'
|
||||
'229b05c712defeb481fb532db07f77aaee9c250093fc4f4fd8b0c7da986e083d'
|
||||
'abf6e962aa2042bab4f2e6c3ba9eddbda64a56aa3251bde3b227cfffed926353'
|
||||
'SKIP'
|
||||
'727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca'
|
||||
'390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a'
|
||||
'686affff989ac2488f79a97b9479efb9f2abae035b5ed4d8226de6857933fd3b'
|
||||
'3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305'
|
||||
'64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1'
|
||||
'1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753'
|
||||
'75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870'
|
||||
'49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81'
|
||||
'97ca24c80d416f651dcd3513611d5ea855be21a994e3d48563c837a599618908'
|
||||
'f9a496d3418b0e15894fb351652cd4fa5ca434ebfc3ce3bb8da40defd8b097f2'
|
||||
'a751a036a3488e2519bc105dcf80df9c004ab1a982d1dd96bbfbf07802df8831'
|
||||
'75c80359c9ce343c20aab8a36a45cb3b9ee7c61cf92c13ae45399d854423a9ba'
|
||||
'085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045'
|
||||
'5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b'
|
||||
|
|
@ -141,16 +127,11 @@ sha256sums=('04a01b7f28beb9b090ffb7d409a30ab5fa1635c2364be2dd4b080d76cd591d94'
|
|||
'1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133'
|
||||
'233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd'
|
||||
'45dab0e5d632eb51eeb00847972ca03835d6791149e9e714f093a9df2b445877'
|
||||
'3a64e9105c734dcf631c0b3ed60404531bce6c0f5a64bfe1a6402a4cc2314816'
|
||||
'ff8c67cb65949b1e7808f2359f2b80f722697048e90e7cfc382ec1fe229e9581'
|
||||
'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6'
|
||||
'ad028513c29691b3ec3a35de21af2f224b48015afe0fbcc6fb834fdf7f613165'
|
||||
'1daf3a7a37627d3ef706d320f25d2ead3c40aa4b0f3ae200090b6931356ab93f'
|
||||
'ea20581a93ed0221dbc3f75400adc3b4692d56c46063deeb14082241206d5485'
|
||||
'4fc7b046fe96464a576d897330d1caa14998ab767002f84edf11a63b9ec35a7f'
|
||||
'f6df5179582803bd71211a392218e9f7c062dc183832d6823cc7a13021e3e543'
|
||||
'aad7b3bb44f295611cc3372c2076f079b9dafe13b8c1978489a72a34dcbca8c9'
|
||||
'e6d204f52eab3e2f606f7f4ab6d1129288bcdf228f1f14bcea375b3a46052076'
|
||||
'02d67462bd1fbfcaee4bf877238740e7971aa2e1fb8f41634ab7e37116d74c1b')
|
||||
'76f62957d0058092b11316357d9d716a62b48a53e5277426ffa87429ab5510e4'
|
||||
'd24cfcb556ae1db02087c49012bbc4621f9ef7e3465ca832e1410326d260f283')
|
||||
|
||||
prepare() {
|
||||
|
||||
|
|
@ -162,10 +143,10 @@ 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
|
||||
|
||||
# don't run broken tests on i686
|
||||
[ "$CARCH" = "i686" ] && sed -i "/CppunitTest_sw_ooxmlexport7/d" sw/Module_sw.mk
|
||||
|
||||
# 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
|
||||
rm ${srcdir}/ext_sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll
|
||||
|
|
@ -181,26 +162,6 @@ prepare() {
|
|||
esac
|
||||
ARCH_FLAGS="$ARCH_FLAGS $i"
|
||||
done
|
||||
|
||||
|
||||
# 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
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
@ -209,7 +170,8 @@ 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" \
|
||||
./autogen.sh --with-build-version="${pkgver}-${pkgrel}" \
|
||||
--with-vendor="Arch Linux" \
|
||||
--enable-split-app-modules \
|
||||
--with-parallelism=${_MAKEFLAGS/-j/} \
|
||||
--with-external-tar="${srcdir}/ext_sources" \
|
||||
|
|
@ -226,6 +188,7 @@ build() {
|
|||
--enable-gio\
|
||||
--enable-kde4\
|
||||
--enable-gtk3 \
|
||||
--enable-introspection \
|
||||
--disable-gstreamer-0-10 \
|
||||
--enable-openssl \
|
||||
--enable-odk\
|
||||
|
|
@ -273,7 +236,6 @@ build() {
|
|||
--with-system-libwps \
|
||||
--with-system-redland\
|
||||
--with-system-serf \
|
||||
--without-system-npapi-headers \
|
||||
--with-jdk-home="/usr/lib/jvm/default" \
|
||||
--with-ant-home="/usr/share/apache-ant"\
|
||||
--without-system-boost\
|
||||
|
|
@ -338,14 +300,13 @@ 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'
|
||||
'libxinerama' 'libabw' 'libmwaw' 'libe-book' 'libcups'
|
||||
'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'
|
||||
'libmythes: for use in thesaurus'
|
||||
'beanshell: interactive java -- good for prototyping/macros'
|
||||
'vigra: C++ computer vision library, usable in Basebmp'
|
||||
'libmspack: library for Microsoft compression formats for use in FontOOo'
|
||||
'libwpg: library for importing and converting WordPerfect Graphics format'
|
||||
'sane: for scanner access'
|
||||
|
|
@ -354,6 +315,7 @@ package_libreoffice-still() {
|
|||
'libpaper: takes care of papersize'
|
||||
'postgresql-libs: for postgresql-connector'
|
||||
'coin-or-mp: required by the Calc solver'
|
||||
'gtk2: for GTK2 integration'
|
||||
'gtk3: for GTK3 integration'
|
||||
'kdelibs: for KDE desktop integration')
|
||||
backup=(etc/libreoffice/sofficerc
|
||||
|
|
@ -383,12 +345,6 @@ package_libreoffice-still() {
|
|||
install -dm755 ${pkgdir}/etc/profile.d
|
||||
install -m755 ${srcdir}/libreoffice-still.{sh,csh} ${pkgdir}/etc/profile.d/
|
||||
|
||||
# move bash-completion files to its new place
|
||||
install -dm755 ${pkgdir}/usr/share/bash-completion/completions
|
||||
mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh \
|
||||
${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh # fails
|
||||
rm -rf ${pkgdir}/etc/bash_completion.d
|
||||
|
||||
# make pyuno find its modules
|
||||
install -dm755 ${pkgdir}/usr/lib/python3.6/site-packages
|
||||
ln -svf /usr/lib/libreoffice/program/uno.py \
|
||||
|
|
|
|||
|
|
@ -1,27 +0,0 @@
|
|||
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
|
||||
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
--- libreoffice-5.1.3.2/configure.ac 2016-05-12 21:26:13.099948527 +0200
|
||||
+++ libreoffice-5.1.3.2/configure.ac.new 2016-05-12 21:46:50.613664941 +0200
|
||||
@@ -11169,6 +11169,9 @@
|
||||
if test "x$kde_incdir" = "xno"; then
|
||||
AC_MSG_ERROR([KDE4 headers not found. Please specify the root of your KDE4 installation by exporting KDE4DIR before running "configure".])
|
||||
fi
|
||||
+ # see http://bugs.debian.org/823145. -isystem /usr/include fails with
|
||||
+ # gcc6
|
||||
+ if test "$kde_incdir" = "/usr/include"; then kde_incdir=; fi
|
||||
|
||||
dnl Check for KDE4 libraries
|
||||
AC_MSG_CHECKING([for KDE4 libraries])
|
||||
|
|
@ -1,118 +0,0 @@
|
|||
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
|
||||
|
||||
|
|
@ -3,4 +3,4 @@
|
|||
#setenv SAL_USE_VCLPLUGIN gen
|
||||
#setenv SAL_USE_VCLPLUGIN kde4
|
||||
#setenv SAL_USE_VCLPLUGIN gtk
|
||||
#setenv SAL_USE_VCLPLUGIN gtk3 # currently broken and not available
|
||||
#setenv SAL_USE_VCLPLUGIN gtk3
|
||||
|
|
|
|||
|
|
@ -3,4 +3,4 @@
|
|||
#export SAL_USE_VCLPLUGIN=gen
|
||||
#export SAL_USE_VCLPLUGIN=kde4
|
||||
#export SAL_USE_VCLPLUGIN=gtk
|
||||
#export SAL_USE_VCLPLUGIN=gtk3 # currently broken and not available
|
||||
#export SAL_USE_VCLPLUGIN=gtk3
|
||||
|
|
|
|||
Loading…
Reference in a new issue