diff --git a/extra/libreoffice-still/PKGBUILD b/extra/libreoffice-still/PKGBUILD index f2605c50a..d01f37083 100644 --- a/extra/libreoffice-still/PKGBUILD +++ b/extra/libreoffice-still/PKGBUILD @@ -21,11 +21,11 @@ pkgbase=libreoffice-still pkgname=('libreoffice-still-sdk' 'libreoffice-still') _LOver=5.4.7.2 pkgver=5.4.7 -pkgrel=2 +pkgrel=3 arch=('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' +makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.7' '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' 'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr' @@ -66,6 +66,7 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc} ${_additional_source_url2}/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar # for test suite ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll make-pyuno-work-with-system-wide-module-install.diff + pyuno-python37.patch poppler-0.62.patch poppler-0.64.patch libreoffice-still.sh libreoffice-still.csh) @@ -115,6 +116,7 @@ sha256sums=('db81b4d32fb313d96e68019db44aa2d75ede82cb7d495274ec1c7271a1253a69' '702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769' 'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6' 'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563' + '5d874bfa2ef7340615dfd34dc17e9e72bfc8587dce7864b949cfcde7fcbabb52' '344f88086b947d53550ef5492e4d61b1e1594067a34c6c4d8ae801ddd0a2fadb' '944064e8f8fa18beeb348468348d910d365d8a3e36ddb76076a368bd9bd6f894' '76f62957d0058092b11316357d9d716a62b48a53e5277426ffa87429ab5510e4' @@ -133,6 +135,7 @@ prepare() { # don't run broken tests sed -i "/CppunitTest_sw_ooxmlexport9/d" sw/Module_sw.mk + sed -i "/CppunitTest_xmlsecurity_signing/d" xmlsecurity/Module_xmlsecurity.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 @@ -148,6 +151,9 @@ prepare() { # fix not upstreamable pyuno paths - FS#54250 patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff + # const fixes for Python 3.7 + patch -Np1 -i ${srcdir}/pyuno-python37.patch + #use the CFLAGS but remove the LibO overridden ones for i in $CFLAGS; do case "$i" in @@ -291,7 +297,7 @@ package_libreoffice-still-sdk() { package_libreoffice-still() { pkgdesc="LibreOffice maintenance branch" - depends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.6' 'libwpd>=0.9.2' 'libwps' + depends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.7' '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' 'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr' @@ -344,11 +350,11 @@ package_libreoffice-still() { install -m755 ${srcdir}/libreoffice-still.{sh,csh} ${pkgdir}/etc/profile.d/ # make pyuno find its modules - install -dm755 ${pkgdir}/usr/lib/python3.6/site-packages + install -dm755 ${pkgdir}/usr/lib/python3.7/site-packages ln -svf /usr/lib/libreoffice/program/uno.py \ - ${pkgdir}/usr/lib/python3.6/site-packages/uno.py + ${pkgdir}/usr/lib/python3.7/site-packages/uno.py ln -svf /usr/lib/libreoffice/program/unohelper.py \ - ${pkgdir}/usr/lib/python3.6/site-packages/unohelper.py + ${pkgdir}/usr/lib/python3.7/site-packages/unohelper.py # add a symlink required for gnome-documents; FS#51887 # https://lists.freedesktop.org/archives/libreoffice/2016-March/073787.html diff --git a/extra/libreoffice-still/pyuno-python37.patch b/extra/libreoffice-still/pyuno-python37.patch new file mode 100644 index 000000000..07588bf6f --- /dev/null +++ b/extra/libreoffice-still/pyuno-python37.patch @@ -0,0 +1,54 @@ +From 76a29148be63cb006a7e25e312dc93acc93e071f Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann +Date: Tue, 3 Jul 2018 08:33:34 +0200 +Subject: [PATCH] const fixes for python3-devel-3.7.0-1.fc29.x86_64 + +Change-Id: Ia16a8b828e11ce36e9bb77ecf9e8a1179bd9b90c +Reviewed-on: https://gerrit.libreoffice.org/56841 +Tested-by: Jenkins +Reviewed-by: Stephan Bergmann +--- + pyuno/source/module/pyuno_impl.hxx | 2 +- + pyuno/source/module/pyuno_type.cxx | 2 +- + pyuno/source/module/pyuno_util.cxx | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/pyuno/source/module/pyuno_impl.hxx b/pyuno/source/module/pyuno_impl.hxx +index ea0e419ffb1b..73acabdf4a16 100644 +--- a/pyuno/source/module/pyuno_impl.hxx ++++ b/pyuno/source/module/pyuno_impl.hxx +@@ -80,7 +80,7 @@ inline PyObject* PyStr_FromString(const char *string) + return PyUnicode_FromString(string); + } + +-inline char * PyStr_AsString(PyObject *object) ++inline char const * PyStr_AsString(PyObject *object) + { + return PyUnicode_AsUTF8(object); + } +diff --git a/pyuno/source/module/pyuno_type.cxx b/pyuno/source/module/pyuno_type.cxx +index c6fc1351436b..80505d85bbd1 100644 +--- a/pyuno/source/module/pyuno_type.cxx ++++ b/pyuno/source/module/pyuno_type.cxx +@@ -157,7 +157,7 @@ Any PyEnum2Enum( PyObject *obj ) + } + + OUString strTypeName( OUString::createFromAscii( PyStr_AsString( typeName.get() ) ) ); +- char *stringValue = PyStr_AsString( value.get() ); ++ char const *stringValue = PyStr_AsString( value.get() ); + + TypeDescription desc( strTypeName ); + if( !desc.is() ) +diff --git a/pyuno/source/module/pyuno_util.cxx b/pyuno/source/module/pyuno_util.cxx +index 45ee5a38e40b..f9714fb270f0 100644 +--- a/pyuno/source/module/pyuno_util.cxx ++++ b/pyuno/source/module/pyuno_util.cxx +@@ -69,7 +69,7 @@ OUString pyString2ustring( PyObject *pystr ) + #else + #if PY_MAJOR_VERSION >= 3 + Py_ssize_t size(0); +- char *pUtf8(PyUnicode_AsUTF8AndSize(pystr, &size)); ++ char const *pUtf8(PyUnicode_AsUTF8AndSize(pystr, &size)); + ret = OUString(pUtf8, size, RTL_TEXTENCODING_UTF8); + #else + PyObject* pUtf8 = PyUnicode_AsUTF8String(pystr);