extra/libreoffice-still to 5.4.4-1

This commit is contained in:
Kevin Mihelich 2018-02-02 13:50:04 +00:00
parent 51abf053e3
commit f9a04871b8
3 changed files with 38 additions and 2179 deletions

View file

@ -5,8 +5,9 @@
# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
# - disable firebird until libfbclient is updated
# - specify a US mirror
# - make build-nocheck
buildarch=28
buildarch=12
highmem=1
# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@ -18,9 +19,9 @@ _google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4
pkgbase=libreoffice-still
pkgname=('libreoffice-still-sdk' 'libreoffice-still')
_LOver=5.3.7.2
pkgver=5.3.7
pkgrel=6
_LOver=5.4.4.2
pkgver=5.4.4
pkgrel=1
arch=('x86_64')
license=('LGPL3')
url="http://www.libreoffice.org/"
@ -34,10 +35,11 @@ makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.6' 'libwpd>=0.9.2' 'lib
'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' 'liblangtag' 'liborcus'
'libexttextcat' 'libcmis' 'gobject-introspection' #'libfbclient'
'libtommath' 'libzmf')
'apr' 'serf' 'ttf-liberation' 'ttf-dejavu' 'glm' 'libxinerama' 'libpagemaker'
'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'liblangtag'
'libexttextcat' 'libcmis' 'gobject-introspection'
'libtommath' 'libzmf' 'gpgme' 'xmlsec' 'rxvt-unicode'
'libfreehand' 'libstaroffice')
_mirror="http://mirror.sjc02.svwh.net/tdf/libreoffice/src/${pkgver}"
#_mirror="https://download.documentfoundation.org/libreoffice/src/${pkgver}"
@ -45,102 +47,65 @@ _mirror="http://mirror.sjc02.svwh.net/tdf/libreoffice/src/${pkgver}"
_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_60_0.tar.bz2
${_additional_source_url}/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz
${_additional_source_url}/boost_1_63_0.tar.bz2
${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip # keep old bundled version, new system version ftbs
${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
${_additional_source_url}/commons-logging-1.2-src.tar.gz
${_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
${_additional_source_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
${_additional_source_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
${_additional_source_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
${_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}/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
${_additional_source_url}/OpenCOLLADA-master-6509aa13af.tar.bz2
${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
${_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}/libfreehand-0.1.1.tar.bz2
${_additional_source_url}/libgltf/libgltf-0.1.0.tar.gz
${_additional_source_url}/1901302aaff1c1633ef81862663d2917-icu4c-58_1-src.tgz
${_additional_source_url}/libstaroffice-0.0.2.tar.bz2
${_additional_source_url}/Firebird-3.0.0.32483-0.tar.bz2
${_additional_source_url}/pdfium-3064.tar.bz2
${_additional_source_url}/liborcus-0.12.1.tar.gz
${_additional_source_url2}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar # for test suite
${_additional_source_url2}/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar # for test suite
${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
make-pyuno-work-with-system-wide-module-install.diff
libreoffice-still.sh libreoffice-still.csh)
noextract=(boost_1_60_0.tar.bz2
86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz
noextract=(boost_1_63_0.tar.bz2
35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
commons-logging-1.2-src.tar.gz
eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
language-subtag-registry-2015-08-04.tar.bz2
4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
OpenCOLLADA-master-6509aa13af.tar.bz2
17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
libgltf-0.0.2.tar.bz2
libgltf-0.1.0.tar.gz
d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
libfreehand-0.1.1.tar.bz2
libstaroffice-0.0.2.tar.bz2
Firebird-3.0.0.32483-0.tar.bz2
pdfium-3064.tar.bz2
liborcus-0.12.1.tar.gz
8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar
1901302aaff1c1633ef81862663d2917-icu4c-58_1-src.tgz
185d60944ea767075d27247c3162b3bc-unowinreg.dll)
validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build@documentfoundation.org>
sha256sums=('c3d7ceecdf4d97dfd2ed748c4479152a1c9b8c879587a63a4f403209aed6ee7c'
sha256sums=('6826751b4cd7076e0c7adfe6eee025cde7253c502ba51ab7072aec6070557e03'
'SKIP'
'f65e68322c50c52382093153ef0753852dde97962e63c1426256a05ce007ae2c'
'280495861fc789868db62c4b19ef361eede9299a93003e0efd58499dcf862509'
'SKIP'
'8d699ac0369cbf2ca975f0341202ff7ea637bf18a729bd77fc440452d8e6dab8'
'2be3a5867f720f7298aad3d67b5d11bab2253af5be970a30ca4c7b2d8de902c5'
'SKIP'
'686affff989ac2488f79a97b9479efb9f2abae035b5ed4d8226de6857933fd3b'
'41d463d16c9894cd3317098d027c038039c6d896b9cbb9bad9c4e29959e10e9f'
'beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0'
'64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1'
'1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753'
'75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870'
'49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81'
'75c80359c9ce343c20aab8a36a45cb3b9ee7c61cf92c13ae45399d854423a9ba'
'085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045'
'5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b'
'3d853b19b1d94a6efa69e7af90f7f2b09ecf302913bee3da796c15ecfebcfac8'
'05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343'
'abe2c57ac12ba45d83563b02e240fa95d973376de2f720aab8fe11f2e621c095'
'e0531091787c0f16c83965fdcbc49162c059d7f0c64669e7f119699321549743'
'7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66'
'e1fb87f3f7b980d33414473279615c4644027e013012d156efa538bc2b031772'
'983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776'
'cfd066b327c2308b3d019f0fe124c02d9acfafdd4aa2af0feadb6e0384027cf9'
'b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb'
'8f25d429237cde289a448c82a0a830791354ccce5ee40d77535642e46367d6c4'
'd30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370'
'd1cc7297ed1921aa969e26413b4c4e18afc882ce4d2f5a2aa2a2905706f7206b'
'1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133'
'233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd'
'45dab0e5d632eb51eeb00847972ca03835d6791149e9e714f093a9df2b445877'
'119e730fbf002dd0eaafa4930167267d7d910aa17f29979ca9ca8b66625fd2da'
'0eb46ba3746a9c2092c8ad347a29b1a1b4941144772d13a88667a7b11ea30309'
'f06eb29d13357f1aa1944de0be1162de05d9f9333b5f54e9bf762415029a8899'
'6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860'
'ded806dc9e2a4005d8c0a6b7fcb232ab36221d72d9ff5b815e8244987299d883'
'676b1fedd721f64489650f5e76d7f98b750439914d87cae505b8163d08447908'
'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770'
'a0bd3e0186e043223bfb231a888e2bfb06c78ee2e07c2f0eca434236d173cf34'
'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6'
@ -159,6 +124,9 @@ prepare() {
done
popd
# don't run broken tests
sed -i "/CppunitTest_sw_ooxmlexport9/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
@ -203,12 +171,11 @@ build() {
--disable-gstreamer-0-10 \
--enable-openssl \
--enable-odk\
--enable-orcus \
--enable-python=system \
--enable-scripting-beanshell \
--enable-scripting-javascript \
--disable-telepathy \
--disable-dconf \
--disable-dconf \
--disable-report-builder \
--enable-ext-wiki-publisher \
--enable-ext-nlpsolver \
--without-fonts\
@ -220,14 +187,12 @@ build() {
--with-system-libcmis \
--with-system-libmspub \
--with-system-libexttextcat \
--with-system-orcus \
--without-system-orcus \
--with-system-liblangtag \
--without-system-jfreereport \
--without-system-apache-commons \
--with-system-libodfgen \
--with-system-libmwaw \
--with-system-libetonyek \
--without-system-libfreehand \
--with-system-libfreehand \
--disable-firebird-sdbc \
--with-system-libtommath \
--with-system-libatomic-ops \
@ -242,13 +207,13 @@ build() {
--with-system-beanshell \
--with-system-cppunit\
--with-system-graphite\
--with-system-glew \
--with-system-glm \
--with-system-libwpg \
--with-system-libwps \
--with-system-redland\
--with-system-libzmf \
--without-system-libstaroffice \
--with-system-gpgmepp \
--with-system-libstaroffice \
--with-system-serf \
--with-jdk-home="/usr/lib/jvm/default" \
--with-ant-home="/usr/share/apache-ant"\
@ -320,8 +285,9 @@ package_libreoffice-still() {
'libmspub' 'harfbuzz-icu' 'glew' 'nss' 'clucene' 'hicolor-icon-theme'
'desktop-file-utils' 'shared-mime-info' 'glu' 'libpagemaker'
'libxinerama' 'libabw' 'libmwaw' 'libe-book' 'libcups'
'liblangtag' 'libexttextcat' 'libfbclient' 'libcmis' 'liborcus'
'libtommath' 'libzmf' 'libatomic_ops')
'liblangtag' 'libexttextcat' 'libcmis'
'libtommath' 'libzmf' 'libatomic_ops' 'xmlsec'
'libfreehand' 'libstaroffice')
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'

View file

@ -1,124 +0,0 @@
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

File diff suppressed because it is too large Load diff