Date: Thursday, August 4, 2016 @ 03:36:22
Author: andyrtr
Revision: 273000
upgpkg: libreoffice-fresh 5.2.0-1
upstream update 5.2.0
Modified:
libreoffice-fresh/trunk/PKGBUILD
Deleted:
libreoffice-fresh/trunk/PKGBUILD.52
libreoffice-fresh/trunk/gcc6_buildfix.diff
libreoffice-fresh/trunk/liborcus-0.11.2.diff
----------------------+
PKGBUILD | 69 ++-------
PKGBUILD.52 | 371 -------------------------------------------------
gcc6_buildfix.diff | 12 -
liborcus-0.11.2.diff | 118 ---------------
4 files changed, 18 insertions(+), 552 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-08-03 22:39:25 UTC (rev 272999)
+++ PKGBUILD 2016-08-04 03:36:22 UTC (rev 273000)
@@ -11,9 +11,9 @@
pkgbase=libreoffice-fresh
pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
-_LOver=5.1.4.2
-pkgver=5.1.4
-pkgrel=2
+_LOver=5.2.0.4
+pkgver=5.2.0
+pkgrel=1
arch=('i686' 'x86_64')
license=('LGPL3')
url="http://www.libreoffice.org/";
@@ -24,8 +24,8 @@
'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' 'beanshell2' 'vigra' 'clucene'
- 'junit' 'libmythes' 'libwpg' 'mesa' 'java-environment'
'postgresql-libs'
+ 'gperf' 'kdelibs' 'gtk3' 'cppunit' 'beanshell2' 'clucene' #'vigra'
+ 'junit' 'libmythes' 'libwpg' 'java-environment' 'postgresql-libs'
'libgl'
'bluez-libs' 'harfbuzz-icu' 'gdb' 'doxygen' 'libatomic_ops' 'mdds'
'glew'
'apr' 'serf' 'ttf-liberation' 'glm' 'libxinerama' 'libpagemaker'
'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'liborcus' 'liblangtag'
@@ -36,15 +36,12 @@
_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
@@ -68,18 +65,13 @@
libreoffice-fresh.sh libreoffice-fresh.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
+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
@@ -100,21 +92,18 @@
libfreehand-0.1.1.tar.bz2
185d60944ea767075d27247c3162b3bc-unowinreg.dll)
validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build
Team (CODE SIGNING KEY) <[email protected]>
-md5sums=('cbeb42aecb280824045b4b43a2666923'
+md5sums=('40ee24812d171238981599843ca9f5b6'
'SKIP'
- 'bdc0d7339445abee73af326d9409b4b9'
+ 'c3f98b287d1464b4b7b410833a2d79a9'
'SKIP'
- 'c71242e41debd8d57c5ae8b74a26d005'
+ '584877f514a723403c0344cc84a0bc59'
'SKIP'
- '6aa9a5c6a4ca1016edd0ed1178e3cb87'
- '1f24ab1d39f4a51faf22244c94a6203f'
+ '65a840e1a0b13a558ff19eeb2c4f0cbe'
+ 'ce12af00283eb90d9281956524250d6e'
'35c94d2df8893241173de1d16b6034c0'
'798b2ffdc8bcfe7bca2cf92b62caf685'
'a7983f859eafb2677d7ff386a023bc40'
'ce977548f1cbf46918e93cd38ac35163'
- '8ab049135b2d15313da5d9f0656894a1'
- '2c9b0f83ed5890af02c0df1c1776f39b'
- '048751f3271906db5126ab76870444c4'
'eeb2c7ddf0d302fba4bfc6e97eac9624'
'39bb3fcea1514f1369fcfc87542390fd'
'3404ab6b1792ae5f16bbd603bd1e1d03'
@@ -139,8 +128,6 @@
'e7e4b3e70e99e5cba8f8dfcacf3b0d87'
'3f526b966a672d1237cfcbadae0e3f95'
'ac71e21ecc0976b2ea6e233854963d4b'
- '58616b84405f0a610a713bbd060d3214'
- '6752d22fc5bcbdbef0640c6aca163e50'
'd386f3a0b484cd3929329a294159f5bc')
prepare() {
@@ -175,23 +162,10 @@
# i686 build broken
- [ "$CARCH" = "i686" ] && sed -i '/CppunitTest_sw_ooxmlimport/d'
sw/Module_sw.mk
+# [ "$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
+# [ "$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() {
@@ -200,7 +174,8 @@
# 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" \
@@ -263,7 +238,6 @@
--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\
@@ -335,7 +309,6 @@
'pstoedit: translates PostScript and PDF graphics into
other vector formats'
'libmythes: for use in thesaurus'
'beanshell2: 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'
@@ -373,12 +346,6 @@
install -dm755 ${pkgdir}/etc/profile.d
install -m755 ${srcdir}/libreoffice-fresh.{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.5/site-packages
ln -svf /usr/lib/libreoffice/program/uno.py \
Deleted: PKGBUILD.52
===================================================================
--- PKGBUILD.52 2016-08-03 22:39:25 UTC (rev 272999)
+++ PKGBUILD.52 2016-08-04 03:36:22 UTC (rev 273000)
@@ -1,371 +0,0 @@
-# $Id: PKGBUILD 267924 2016-05-13 16:01:40Z andyrtr $
-# Maintainer: AndyRTR <[email protected]>
-# Maintainer: Bartłomiej Piotrowski <[email protected]>
-
-# 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 [email protected] for
-# more information.
-_google_default_client_id=413772536636.apps.googleusercontent.com
-_google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4
-
-pkgbase=libreoffice-fresh
-pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
-_LOver=5.2.0.3 # =RC3
-pkgver=5.2.0
-pkgrel=0.3
-arch=('i686' 'x86_64')
-license=('LGPL3')
-url="http://www.libreoffice.org/";
-makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.5' 'libwpd>=0.9.2'
'libwps'
- 'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib'
- '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' 'gst-plugins-base-libs'
- 'glu' 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'apache-ant'
- 'gperf' 'kdelibs' 'gtk3' 'cppunit' 'beanshell2' 'vigra' 'clucene'
- 'junit' 'libmythes' 'libwpg' 'mesa' 'java-environment'
'postgresql-libs'
- 'bluez-libs' 'harfbuzz-icu' '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')
-
-#_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}/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
-
${_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_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
- buildfix.diff)
-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
- 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
- d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- libfreehand-0.1.1.tar.bz2
- 185d60944ea767075d27247c3162b3bc-unowinreg.dll)
-validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build
Team (CODE SIGNING KEY) <[email protected]>
-md5sums=('281164e403d93fdbfbacd7c3d5afd310'
- 'SKIP'
- 'bd178f898741e0b159d01e53535a75d9'
- 'SKIP'
- '3c706c76e39e4990834560f60df043e2'
- 'SKIP'
- '65a840e1a0b13a558ff19eeb2c4f0cbe'
- 'ce12af00283eb90d9281956524250d6e'
- '35c94d2df8893241173de1d16b6034c0'
- '798b2ffdc8bcfe7bca2cf92b62caf685'
- 'a7983f859eafb2677d7ff386a023bc40'
- 'ce977548f1cbf46918e93cd38ac35163'
- '8ab049135b2d15313da5d9f0656894a1'
- '2c9b0f83ed5890af02c0df1c1776f39b'
- '048751f3271906db5126ab76870444c4'
- 'eeb2c7ddf0d302fba4bfc6e97eac9624'
- '39bb3fcea1514f1369fcfc87542390fd'
- '3404ab6b1792ae5f16bbd603bd1e1d03'
- '97b2d4dba862397f446b217e2b623e71'
- 'f94d9870737518e3b597f9265f4e9803'
- '8ce2fcd72becf06c41f7201d15373ed9'
- '3bdf40c0d199af31923e900d082ca2dd'
- 'ace6ab49184e329db254e454a010f56d'
- 'db60e4fde8dd6d6807523deb71ee34dc'
- '0168229624cfac409e766913506961a8'
- 'bf5986dbfa1c9a0f26cf1b00ed369484'
- '4b87018f7fff1d054939d19920b751a0'
- '4ca8a6ef0afeefc864e9ef21b9f14bd6'
- '17410483b5b5f267aa18b7e00b65e6e0'
- 'd63a9f47ab048f5009d90693d6aa6424'
- 'd8bd5eed178db6e2b18eeed243f85aa8'
- 'ba2930200c9f019c2d93a8c88c651a0f'
- '8cf70c5dc4d24d2dc4a107f509d2d6d7'
- '185d60944ea767075d27247c3162b3bc'
- 'dcb5ad3e5f7139227677ea064b075422'
- '4195735a80876ae812fca5736b50192a'
- 'e7e4b3e70e99e5cba8f8dfcacf3b0d87'
- '3f526b966a672d1237cfcbadae0e3f95'
- 'ac71e21ecc0976b2ea6e233854963d4b'
- 'd386f3a0b484cd3929329a294159f5bc')
-
-prepare() {
-
- cd libreoffice-$_LOver
-
- # move external sources into place
- mkdir ${srcdir}/ext_sources && pushd ${srcdir}/ext_sources
- for source in "${noextract[@]}"; do
- 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
- rm ${srcdir}/ext_sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll
- 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
-
- #use the CFLAGS but remove the LibO overridden ones
- for i in $CFLAGS; do
- case "$i" in
- -O?|-pipe|-Wall|-g|-fexceptions) continue;;
- 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
-
-}
-
-build() {
- cd libreoffice-$_LOver
-
- # 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 \
- --enable-release-build \
- --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
- --libdir=/usr/lib --mandir=/usr/share/man \
- --with-lang="" \
- --with-help \
- --enable-crashdump \
- --disable-avahi \
- --enable-dbus \
- --enable-evolution2\
- --enable-gio\
- --enable-kde4\
- --enable-gtk3 \
- --disable-gstreamer-0-10 \
- --enable-openssl \
- --enable-odk\
- --enable-orcus \
- --enable-python=system \
- --enable-scripting-beanshell \
- --enable-scripting-javascript \
- --disable-telepathy \
- --enable-ext-wiki-publisher \
- --enable-ext-nlpsolver \
- --without-fonts\
- --with-system-apr \
- --with-system-libcdr \
- --with-system-mdds\
- --without-myspell-dicts \
- --with-system-libvisio \
- --with-system-libcmis \
- --with-system-libmspub \
- --with-system-libexttextcat \
- --with-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-firebird \
- --with-system-libatomic-ops \
- --with-system-libebook \
- --with-system-libabw \
- --with-system-coinmp \
- --without-system-libgltf \
- --with-system-dicts \
- --with-external-dict-dir=/usr/share/hunspell \
- --with-external-hyph-dir=/usr/share/hyphen \
- --with-external-thes-dir=/usr/share/mythes \
- --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-serf \
- --with-jdk-home="/usr/lib/jvm/default" \
- --with-ant-home="/usr/share/apache-ant"\
- --without-system-boost\
- --with-system-icu \
- --with-system-cairo \
- --with-system-libs \
- --with-system-mythes \
- --with-system-headers \
- --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
-
- mkdir ${srcdir}/fakeinstall
- make DESTDIR=${srcdir}/fakeinstall distro-pack-install
-}
-
-#check() {
-# cd ${srcdir}/build
-# make check
-#}
-
-package_libreoffice-fresh-sdk() {
- pkgdesc="Software Development Kit for LibreOffice Fresh"
- depends=('libreoffice-fresh' 'gcc-libs' 'sh' 'make' 'zip' 'gcc'
'java-environment')
- provides=('libreoffice-sdk')
- conflicts=('libreoffice-still-sdk')
-
- for dir in $(grep -h ^%dir
libreoffice-$_LOver/file-lists/sdk{,_doc}_list.txt); do
- install -dm755 ${pkgdir}/${dir/\%dir/}
- done
-
- for file in $(grep -h -v ^%dir
libreoffice-$_LOver/file-lists/sdk{,_doc}_list.txt); do
- dirname=$(dirname $file)
- [[ -d ${pkgdir}/$dirname ]] || install -dm755 ${pkgdir}/$dirname
- mv ${srcdir}/fakeinstall/${file} ${pkgdir}/$file
- done
-
- # fix environment path to keep compatibility with other
java-environments
- sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" \
- ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.sh
-
- # fix permissions
- find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x
{} +
-
- # add LibreOfficeKit headers; FS#48066
- install -dm755 ${pkgdir}/usr/include/LibreOfficeKit
- install -v -m644 ${srcdir}/libreoffice-$_LOver/include/LibreOfficeKit/*
${pkgdir}/usr/include/LibreOfficeKit
-}
-
-package_libreoffice-fresh() {
- pkgdesc="LibreOffice branch which contains new features and program
enhancements"
- depends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.5' 'libwpd>=0.9.2'
'libwps'
- 'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl'
'dbus-glib'
- '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' 'glu' 'libpagemaker'
- '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'
- 'libmythes: for use in thesaurus'
- 'beanshell2: 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'
- 'unixodbc: adds ODBC database support'
- 'gst-plugins-base-libs: for multimedia content, e.g. in Impress'
- 'libpaper: takes care of papersize'
- 'postgresql-libs: for postgresql-connector'
- 'coin-or-mp: required by the Calc solver'
- 'gtk3: for GTK3 integration'
- 'kdelibs: for KDE desktop integration')
- backup=(etc/libreoffice/sofficerc
- etc/libreoffice/bootstraprc
- etc/libreoffice/psprint.conf
- etc/profile.d/libreoffice-fresh.sh
- etc/profile.d/libreoffice-fresh.csh)
- provides=('libreoffice' 'libreoffice-en-US')
- conflicts=('libreoffice-still')
-
- mv fakeinstall/* ${pkgdir}/
-
- # put configuration files into place
- install -dm755 ${pkgdir}/etc/libreoffice
- install -m644
${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} \
- ${pkgdir}/etc/libreoffice/
- install -m644 ${pkgdir}/usr/lib/libreoffice/share/psprint/psprint.conf \
- ${pkgdir}/etc/libreoffice/
-
- # install dummy links to make them found by LibO
- cd ${pkgdir}/usr/lib/libreoffice/program/
- ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} .
- cd ${pkgdir}/usr/lib/libreoffice/share/psprint/
- ln -vsf /etc/libreoffice/psprint.conf .
-
- # allow to preset desired VLC
- install -dm755 ${pkgdir}/etc/profile.d
- install -m755 ${srcdir}/libreoffice-fresh.{sh,csh}
${pkgdir}/etc/profile.d/
-
- # make pyuno find its modules
- install -dm755 ${pkgdir}/usr/lib/python3.5/site-packages
- ln -svf /usr/lib/libreoffice/program/uno.py \
- ${pkgdir}/usr/lib/python3.5/site-packages/uno.py
- ln -svf /usr/lib/libreoffice/program/unohelper.py \
- ${pkgdir}/usr/lib/python3.5/site-packages/unohelper.py
-
- # cleanup
- rm -rf ${pkgdir}/usr/share/libreoffice/sdk
-
- # add application descriptions
- install -v -m644
${srcdir}/libreoffice-$_LOver/sysui/desktop/appstream-appdata/*.xml \
- ${pkgdir}/usr/share/appdata
-}
Deleted: gcc6_buildfix.diff
===================================================================
--- gcc6_buildfix.diff 2016-08-03 22:39:25 UTC (rev 272999)
+++ gcc6_buildfix.diff 2016-08-04 03:36:22 UTC (rev 273000)
@@ -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])
Deleted: liborcus-0.11.2.diff
===================================================================
--- liborcus-0.11.2.diff 2016-08-03 22:39:25 UTC (rev 272999)
+++ liborcus-0.11.2.diff 2016-08-04 03:36:22 UTC (rev 273000)
@@ -1,118 +0,0 @@
-From db729f3b685fd832a3ec7387b339cf2bbeb4bd4d Mon Sep 17 00:00:00 2001
-From: Kohei Yoshida <[email protected]>
-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 <[email protected]>
-Reviewed-by: Kohei Yoshida <[email protected]>
-
-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
-
