| author | Andreas Radke
<andyrtr@archlinux.org> 2017-07-29 16:03:06 UTC |
| committer | Andreas Radke
<andyrtr@archlinux.org> 2017-07-29 16:03:06 UTC |
| parent | e0057ae1a9c643eedf0663f302fa92f0d5d547c1 |
| PKGBUILD | +36 | -29 |
| make-pyuno-work-with-system-wide-module-install.diff | +12 | -38 |
diff --git a/PKGBUILD b/PKGBUILD index 1020947..79dcbea 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -10,15 +10,15 @@ _google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4 pkgbase=libreoffice-still pkgname=('libreoffice-still-sdk' 'libreoffice-still') -_LOver=5.2.7.2 -pkgver=5.2.7 +_LOver=5.3.4.2 +pkgver=5.3.4 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' + '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' @@ -27,8 +27,9 @@ makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.6' 'libwpd>=0.9.2' 'lib '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' - '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" @@ -36,7 +37,7 @@ _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 @@ -59,13 +60,15 @@ 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}/liborcus-0.11.2.tar.gz + ${_additional_source_url}/libstaroffice-0.0.2.tar.bz2 + ${_additional_source_url}/Firebird-3.0.0.32483-0.tar.bz2 + ${_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 - 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 @@ -88,18 +91,21 @@ 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 + 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar + a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar 976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz - liborcus-0.11.2.tar.gz 185d60944ea767075d27247c3162b3bc-unowinreg.dll) validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build@documentfoundation.org> -sha256sums=('106154a72a329605166a49bfa31c6d1cc03133d600ad0ef340b45e4e2a92891d' +sha256sums=('1d75393fd8b02b1e2e2e001bc0262359c7452e29a0fff35cb152717246f02379' 'SKIP' - 'f7d35c460da96ed2d52cf97baef159382b38e5ce4579c34e65480ff2911cac4b' + 'ab8600dc99e09d90fec83bcc505c42556156730f78973cecd74fa377fe8de91a' 'SKIP' - '89744dc0f0924a2f9c96d8d3e4ae44e7c3770c30d8d4ba35a7ae5ac5b28bf7aa' + '0f5acb29e93ab8a75a216e82c87192aabcf29fe8bada8e968cc7b255fcdf81af' 'SKIP' '686affff989ac2488f79a97b9479efb9f2abae035b5ed4d8226de6857933fd3b' - '3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305' + '41d463d16c9894cd3317098d027c038039c6d896b9cbb9bad9c4e29959e10e9f' '64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1' '1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753' '75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870' @@ -122,10 +128,12 @@ sha256sums=('106154a72a329605166a49bfa31c6d1cc03133d600ad0ef340b45e4e2a92891d' '1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133' '233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd' '45dab0e5d632eb51eeb00847972ca03835d6791149e9e714f093a9df2b445877' - 'ff8c67cb65949b1e7808f2359f2b80f722697048e90e7cfc382ec1fe229e9581' - '10afc617fd7600fa02bd4467d2e3c7bd058f84e4d672d558e1db90e82dafd256' + 'f06eb29d13357f1aa1944de0be1162de05d9f9333b5f54e9bf762415029a8899' + '6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860' + 'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770' + 'a0bd3e0186e043223bfb231a888e2bfb06c78ee2e07c2f0eca434236d173cf34' 'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6' - 'ad028513c29691b3ec3a35de21af2f224b48015afe0fbcc6fb834fdf7f613165' + 'ff546050a1789b0cf62369524fe939526541e32a74bdd0c9137bbe0d40d7f533' '76f62957d0058092b11316357d9d716a62b48a53e5277426ffa87429ab5510e4' 'd24cfcb556ae1db02087c49012bbc4621f9ef7e3465ca832e1410326d260f283') @@ -139,16 +147,13 @@ prepare() { ln -s ${srcdir}/$source . done popd - - # 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 cp -f ${srcdir}/185d60944ea767075d27247c3162b3bc-unowinreg.dll ${srcdir}/ext_sources - # fix not upstreamable pyuno paths - patch taken from Debian + # fix not upstreamable pyuno paths - FS#54250 patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff #use the CFLAGS but remove the LibO overridden ones @@ -177,7 +182,6 @@ build() { --libdir=/usr/lib --mandir=/usr/share/man \ --with-lang="" \ --with-help \ - --enable-crashdump \ --disable-avahi \ --enable-dbus \ --enable-evolution2\ @@ -205,7 +209,7 @@ build() { --with-system-libcmis \ --with-system-libmspub \ --with-system-libexttextcat \ - --without-system-orcus \ + --with-system-orcus \ --with-system-liblangtag \ --without-system-jfreereport \ --without-system-apache-commons \ @@ -213,7 +217,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 \ @@ -231,11 +236,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 \ @@ -245,8 +252,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 @@ -298,12 +304,13 @@ package_libreoffice-still() { pkgdesc="LibreOffice maintenance branch" 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' - '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' diff --git a/make-pyuno-work-with-system-wide-module-install.diff b/make-pyuno-work-with-system-wide-module-install.diff index 881ff51..6daeecc 100644 --- a/make-pyuno-work-with-system-wide-module-install.diff +++ b/make-pyuno-work-with-system-wide-module-install.diff @@ -1,44 +1,18 @@ -diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh -index defd7b2..ea2a809 100755 ---- a/desktop/scripts/soffice.sh -+++ b/desktop/scripts/soffice.sh -@@ -128,6 +128,9 @@ if echo "$checks" | grep -q "cc" ; then - exit 1; - fi - -+PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH} -+export PYTHONPATH -+ - case "`uname -s`" in - NetBSD|OpenBSD|FreeBSD|DragonFly) - # this is a temporary hack until we can live with the default search paths -diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py -index f93ac5e..92a2891 100644 ---- a/pyuno/source/module/uno.py -+++ b/pyuno/source/module/uno.py -@@ -26,8 +26,12 @@ +--- a/pyuno/source/module/uno.py 2017-05-03 18:46:29.000000000 +0200 ++++ b/pyuno/source/module/uno.py.new 2017-06-06 17:11:27.585959637 +0200 +@@ -16,8 +16,14 @@ # except in compliance with the License. You may obtain a copy of # the License at http://www.apache.org/licenses/LICENSE-2.0 . # +-import pyuno ++ ++# Special modification to make uno load on Arch +import os import sys ++sys.path.append("/usr/lib/libreoffice/program/") ++os.putenv("URE_BOOTSTRAP", "vnd.sun.start.pathname:/usr/lib/libreoffice/program/fundamentalrc") ++ ++import pyuno + import traceback + import warnings -+sys.path.append('/usr/lib/libreoffice/program') -+if getattr(os.environ, 'URE_BOOTSTRAP', None) is None: -+ os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:/usr/lib/libreoffice/program/fundamentalrc" - import pyuno - - try: -diff --git a/pyuno/source/officehelper.py b/pyuno/source/officehelper.py -index 610ac5f..df243d0 100755 ---- a/pyuno/source/officehelper.py -+++ b/pyuno/source/officehelper.py -@@ -44,7 +44,7 @@ def bootstrap(): - if "UNO_PATH" in os.environ: - sOffice = os.environ["UNO_PATH"] - else: -- sOffice = "" # lets hope for the best -+ sOffice = "/usr/lib/libreoffice/program" - sOffice = os.path.join(sOffice, "soffice") - if platform.startswith("win"): - sOffice += ".exe"