extra/libreoffice-fresh to 5.3.0-1

This commit is contained in:
Kevin Mihelich 2017-02-04 18:32:04 +00:00
parent 34c11137d4
commit 07204d91ee
3 changed files with 43 additions and 2138 deletions

View file

@ -17,33 +17,34 @@ _google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4
pkgbase=libreoffice-fresh
pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
_LOver=5.2.5.1
pkgver=5.2.5
_LOver=5.3.0.3
pkgver=5.3.0
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' 'icu'
'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' 'clucene' #'vigra'
'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' 'gobject-introspection')
'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'liblangtag' #'liborcus'
'libexttextcat' 'libcmis' 'gobject-introspection' #'libfbclient'
'libtommath' 'libzmf')
_mirror="https://download.documentfoundation.org/libreoffice/src/${pkgver}"
#_mirror="https://dev-builds.libreoffice.org/pre-releases/src"
#_mirror="https://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}/boost_1_60_0.tar.bz2
${_additional_source_url}/ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz
${_additional_source_url}/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz
${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
@ -66,14 +67,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}/976734806026a4ef8bdd17937c8898b9-icu4c-57_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}/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-fresh.sh libreoffice-fresh.csh
update_liborcus_to_0.11.0.diff
remove_unnecessary_orcus_external_usage_from_makefiles.diff)
libreoffice-fresh.sh libreoffice-fresh.csh)
noextract=(boost_1_60_0.tar.bz2
ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz
86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz
35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
@ -96,17 +99,22 @@ noextract=(boost_1_60_0.tar.bz2
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
liborcus-0.12.1.tar.gz
8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar
976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz
185d60944ea767075d27247c3162b3bc-unowinreg.dll)
validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build@documentfoundation.org>
sha256sums=('9756a322a497aa83d096fa0ac5541622d9a8f5038ce9c0ded48199566ab0d300'
sha256sums=('04b9215e1c4b8c7ce2d79b8e322bff8d097426a2d103476cf237cfd42262556e'
'SKIP'
'11199cca59748dc9cade4f5cbb0478f600d3c54114b09819eac54338dbbd49b4'
'df58d501b9514160767810df0b0e4b44a01262244f81f83df8654b0ccd4b1a7f'
'SKIP'
'abf6e962aa2042bab4f2e6c3ba9eddbda64a56aa3251bde3b227cfffed926353'
'4321a57fba1012b30eae6e629f18d4139395fd5751af381dc87e31e084fca1d1'
'SKIP'
'686affff989ac2488f79a97b9479efb9f2abae035b5ed4d8226de6857933fd3b'
'3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305'
'41d463d16c9894cd3317098d027c038039c6d896b9cbb9bad9c4e29959e10e9f'
'64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1'
'1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753'
'75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870'
@ -129,13 +137,15 @@ sha256sums=('9756a322a497aa83d096fa0ac5541622d9a8f5038ce9c0ded48199566ab0d300'
'1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133'
'233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd'
'45dab0e5d632eb51eeb00847972ca03835d6791149e9e714f093a9df2b445877'
'ff8c67cb65949b1e7808f2359f2b80f722697048e90e7cfc382ec1fe229e9581'
'f06eb29d13357f1aa1944de0be1162de05d9f9333b5f54e9bf762415029a8899'
'6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860'
'676b1fedd721f64489650f5e76d7f98b750439914d87cae505b8163d08447908'
'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770'
'a0bd3e0186e043223bfb231a888e2bfb06c78ee2e07c2f0eca434236d173cf34'
'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6'
'ad028513c29691b3ec3a35de21af2f224b48015afe0fbcc6fb834fdf7f613165'
'76f62957d0058092b11316357d9d716a62b48a53e5277426ffa87429ab5510e4'
'd24cfcb556ae1db02087c49012bbc4621f9ef7e3465ca832e1410326d260f283'
'4fc7b046fe96464a576d897330d1caa14998ab767002f84edf11a63b9ec35a7f'
'f6df5179582803bd71211a392218e9f7c062dc183832d6823cc7a13021e3e543')
'd24cfcb556ae1db02087c49012bbc4621f9ef7e3465ca832e1410326d260f283')
prepare() {
@ -157,7 +167,7 @@ prepare() {
cp -f ${srcdir}/185d60944ea767075d27247c3162b3bc-unowinreg.dll ${srcdir}/ext_sources
# fix not upstreamable pyuno paths - patch taken from Debian
patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff
# patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff
#use the CFLAGS but remove the LibO overridden ones
for i in $CFLAGS; do
@ -185,7 +195,6 @@ build() {
--libdir=/usr/lib --mandir=/usr/share/man \
--with-lang="" \
--with-help \
--enable-crashdump \
--disable-avahi \
--enable-dbus \
--enable-evolution2\
@ -213,7 +222,7 @@ 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 \
@ -221,7 +230,8 @@ build() {
--with-system-libmwaw \
--with-system-libetonyek \
--without-system-libfreehand \
--with-system-firebird \
--without-system-firebird \
--with-system-libtommath \
--with-system-libatomic-ops \
--with-system-libebook \
--with-system-libabw \
@ -239,11 +249,13 @@ build() {
--with-system-libwpg \
--with-system-libwps \
--with-system-redland\
--with-system-libzmf \
--without-system-libstaroffice \
--with-system-serf \
--with-jdk-home="/usr/lib/jvm/default" \
--with-ant-home="/usr/share/apache-ant"\
--without-system-boost\
--without-system-icu \
--with-system-icu \
--with-system-cairo \
--with-system-libs \
--with-system-mythes \
@ -253,8 +265,7 @@ build() {
--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
--disable-dependency-tracking
touch src.downloaded
make build-nocheck
@ -300,12 +311,13 @@ package_libreoffice-fresh() {
pkgdesc="LibreOffice branch which contains new features and program enhancements"
depends=('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' 'icu'
'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'
'liborcus' 'liblangtag' 'libexttextcat' 'libfbclient' 'libcmis')
'liblangtag' 'libexttextcat' 'libfbclient' 'libcmis' #'liborcus'
'libtommath' 'libzmf' 'libatomic_ops')
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