Date: Tuesday, November 12, 2019 @ 11:49:35
Author: felixonmars
Revision: 367873
archrelease: copy trunk to staging-x86_64
Added:
libreoffice-still/repos/staging-x86_64/
libreoffice-still/repos/staging-x86_64/PKGBUILD
(from rev 367872, libreoffice-still/trunk/PKGBUILD)
libreoffice-still/repos/staging-x86_64/libreoffice-still.csh
(from rev 367872, libreoffice-still/trunk/libreoffice-still.csh)
libreoffice-still/repos/staging-x86_64/libreoffice-still.sh
(from rev 367872, libreoffice-still/trunk/libreoffice-still.sh)
libreoffice-still/repos/staging-x86_64/make-pyuno-work-with-system-wide-module-install.diff
(from rev 367872,
libreoffice-still/trunk/make-pyuno-work-with-system-wide-module-install.diff)
libreoffice-still/repos/staging-x86_64/python-3.8.patch
(from rev 367872, libreoffice-still/trunk/python-3.8.patch)
------------------------------------------------------+
PKGBUILD | 351 +++++++++++++++++
libreoffice-still.csh | 8
libreoffice-still.sh | 8
make-pyuno-work-with-system-wide-module-install.diff | 18
python-3.8.patch | 199 +++++++++
5 files changed, 584 insertions(+)
Copied: libreoffice-still/repos/staging-x86_64/PKGBUILD (from rev 367872,
libreoffice-still/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-11-12 11:49:35 UTC (rev 367873)
@@ -0,0 +1,351 @@
+# Maintainer: AndyRTR <andy...@archlinux.org>
+# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org>
+
+# 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 foutre...@archlinux.org for
+# more information.
+_google_default_client_id=413772536636.apps.googleusercontent.com
+_google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4
+
+pkgbase=libreoffice-still
+pkgname=('libreoffice-still-sdk' 'libreoffice-still')
+_LOver=6.2.8.2
+pkgver=6.2.8
+pkgrel=3
+arch=('x86_64')
+license=('LGPL3')
+url="https://www.libreoffice.org/";
+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'
+ 'libmspub' 'harfbuzz-icu' 'nss' 'hicolor-icon-theme'
+ 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'gst-plugins-base-libs'
+ 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'ant'
+ 'gperf' 'gtk3' 'qt5-base' 'plasma-framework' 'cppunit' 'beanshell'
'clucene'
+ 'junit' 'libmythes' 'libwpg' 'java-environment=8' 'postgresql-libs'
'mariadb-libs' 'libgl'
+ 'bluez-libs' 'gdb' 'doxygen' 'libatomic_ops' 'mdds'
+ 'apr' 'serf' 'ttf-liberation' 'ttf-dejavu' 'ttf-carlito' 'libxinerama'
'libpagemaker' 'glm'
+ 'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'liblangtag' 'liborcus'
+ 'libexttextcat' 'libcmis' 'gobject-introspection' # 'libfbclient'
+ 'libtommath' 'libzmf' 'gpgme' 'xmlsec' 'rxvt-unicode'
+ 'libepubgen' 'libfreehand' 'libqxp' 'libstaroffice' 'boost'
'libnumbertext'
+)
+
+_mirror="https://download.documentfoundation.org/libreoffice/src/${pkgver}";
+#_mirror="https://dev-builds.libreoffice.org/pre-releases/src";
+_additional_source_url="https://dev-www.libreoffice.org/src";
+_additional_source_url2="https://dev-www.libreoffice.org/extern";
+source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
+
${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.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}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
+ ${_additional_source_url}/language-subtag-registry-2018-04-23.tar.bz2
+
${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
+
${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+
${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${_additional_source_url}/pdfium-3550.tar.bz2
+ ${_additional_source_url}/lxml-4.1.1.tgz
+ ${_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}/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar
# for test suite
+
${_additional_source_url2}/49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf
+
${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
+ make-pyuno-work-with-system-wide-module-install.diff
+ python-3.8.patch
+ libreoffice-still.sh libreoffice-still.csh
+
libreoffice-poppler-0.82.patch::"https://github.com/LibreOffice/core/commit/2eadd46a.patch";)
+noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
+ 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
+ a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
+ 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
+ language-subtag-registry-2018-04-23.tar.bz2
+ 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
+ d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ pdfium-3550.tar.bz2
+ lxml-4.1.1.tgz
+ Firebird-3.0.0.32483-0.tar.bz2
+ 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar #
for test suite
+
odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar
# for test suite
+
49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf
+ 185d60944ea767075d27247c3162b3bc-unowinreg.dll
+)
+validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build
Team (CODE SIGNING KEY) <bu...@documentfoundation.org>
+sha256sums=('3996f54d44187e600bf04c59f3577ecdbf65f29033f5aeac1c9ad20981f4fdda'
+ 'SKIP'
+ '4cf965787ef6689daffa8f4b620888b5e7033debfe8afecd2b2ff73b0795fd51'
+ 'SKIP'
+ 'ed0f6568ee88c2d51b7d4ca127f36bedbcf4214aeabdb957e1b928c93cd2839f'
+ 'SKIP'
+ '64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1'
+ '1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753'
+ '75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870'
+ '983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776'
+ '14c21f4533ca74e3af9e09184d6756a750d0cd46099015ba8c595e48499aa878'
+ 'd30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370'
+ '1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133'
+ '233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd'
+ '572460f7f9e2f86d022a9c6a82f1e2ded6c3c29ba352d4b9fac60b87e2159679'
+ '940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e'
+ '6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860'
+ 'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770'
+ '984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504'
+ '49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63'
+ 'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6'
+ 'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563'
+ '98f8ab4fba7b6a1c64f7e3cfe597083cafdd60e31bfd6b2da20456a2089d8581'
+ 'c1e199f7767a4f42d9a95fc942cda4cf47737c7d67e6f334679c9b2e3e271dc2'
+ '07c28ff8f5258abfe4338efccbdfb1dd35892bd00a2ed7f53b1fc2263f71a8b6'
+ 'd649a07b38af95e9012633e71829fef3001e8a5830544ce7e91856df27f69c4b')
+
+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
+
+ # 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 - FS#54250
+ 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
+
+ patch -p1 -i "$srcdir"/python-3.8.patch # Fix build with python 3.8
+ # fix build with poppler 0.82
+ patch -p1 -i ../libreoffice-poppler-0.82.patch
+}
+
+build() {
+ cd libreoffice-$_LOver
+
+ # strip -s from Makeflags in case you use it to shorten build logs
+ _MAKEFLAGS=${MAKEFLAGS/-s/}
+
+ # http://site.icu-project.org/download/61#TOC-Migration-Issues
+ CPPFLAGS+=' -DU_USING_ICU_NAMESPACE=1'
+
+ ./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" \
+ --disable-fetch-external \
+ --enable-release-build \
+ --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
+ --libdir=/usr/lib --mandir=/usr/share/man \
+ --with-lang="" \
+ --with-help=html \
+ --disable-avahi \
+ --enable-dbus \
+ --enable-evolution2\
+ --enable-gio\
+ --enable-gtk3-kde5 \
+ --enable-kde5 \
+ --enable-qt5 \
+ --enable-gtk3 \
+ --enable-introspection \
+ --disable-gstreamer-0-10 \
+ --enable-openssl \
+ --enable-odk\
+ --enable-python=system \
+ --enable-scripting-beanshell \
+ --enable-scripting-javascript \
+ --disable-dconf \
+ --disable-report-builder \
+ --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 \
+ --with-system-libodfgen \
+ --with-system-libmwaw \
+ --with-system-libetonyek \
+ --with-system-libfreehand \
+ --without-system-firebird \
+ --with-system-libtommath \
+ --with-system-libatomic-ops \
+ --with-system-libebook \
+ --with-system-libabw \
+ --with-system-coinmp \
+ --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-glm \
+ --with-system-libnumbertext \
+ --with-system-libwpg \
+ --with-system-libwps \
+ --with-system-redland\
+ --with-system-libzmf \
+ --with-system-gpgmepp \
+ --with-system-libstaroffice \
+ --with-system-serf \
+ --with-jdk-home="/usr/lib/jvm/default" \
+ --with-ant-home="/usr/share/ant"\
+ --with-system-boost\
+ --with-system-icu \
+ --with-system-cairo \
+ --with-system-libs \
+ --with-system-mythes \
+ --with-system-headers \
+ --without-system-hsqldb \
+ --with-system-clucene \
+ --with-gdrive-client-id=${_google_default_client_id} \
+ --with-gdrive-client-secret=${_google_default_client_secret} \
+ --disable-dependency-tracking
+
+ touch src.downloaded
+ make build-nocheck
+
+ mkdir "${srcdir}"/fakeinstall
+ make DESTDIR="${srcdir}"/fakeinstall distro-pack-install
+}
+
+#check() {
+# cd "${srcdir}"/build
+# make check
+#}
+
+package_libreoffice-still-sdk() {
+ pkgdesc="Software Development Kit for LibreOffice maintenance branch"
+ depends=('libreoffice-still' 'gcc-libs' 'sh' 'make' 'zip' 'gcc'
'java-environment')
+ provides=('libreoffice-sdk')
+ conflicts=('libreoffice-fresh-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-still() {
+ pkgdesc="LibreOffice maintenance branch"
+ 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'
+ 'libxslt' 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'
'graphite' 'icu'
+ 'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen'
'libcdr'
+ 'libmspub' 'harfbuzz-icu' 'nss' 'clucene' 'hicolor-icon-theme'
+ 'desktop-file-utils' 'shared-mime-info' 'libpagemaker'
+ 'libxinerama' 'libabw' 'libmwaw' 'libe-book' 'libcups'
+ 'liblangtag' 'libexttextcat' 'libcmis' 'liborcus' #
'libfbclient'
+ 'libtommath' 'libzmf' 'libatomic_ops' 'xmlsec' 'gpgme'
'libnumbertext'
+ 'libfreehand' 'libstaroffice' 'libepubgen' 'libqxp' 'libepoxy')
+ 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'
+ 'beanshell: interactive java -- good for
prototyping/macros'
+ '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'
+ 'mariadb-libs: for mysql-connector'
+ 'coin-or-mp: required by the Calc solver'
+ 'gtk2: for GTK2 integration'
+ 'gtk3: for GTK3 integration'
+ 'kio: for KF5 KDE desktop integration')
+ backup=(etc/libreoffice/sofficerc
+ etc/libreoffice/bootstraprc
+ etc/libreoffice/psprint.conf
+ etc/profile.d/libreoffice-still.sh
+ etc/profile.d/libreoffice-still.csh)
+ provides=('libreoffice' 'libreoffice-en-US')
+ conflicts=('libreoffice-fresh')
+
+ 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 -m644 "${srcdir}"/libreoffice-still.{sh,csh}
"${pkgdir}"/etc/profile.d/
+
+ # make pyuno find its modules
+ install -dm755 "${pkgdir}"/usr/lib/python3.8/site-packages
+ ln -svf /usr/lib/libreoffice/program/uno.py \
+ "${pkgdir}"/usr/lib/python3.8/site-packages/uno.py
+ ln -svf /usr/lib/libreoffice/program/unohelper.py \
+ "${pkgdir}"/usr/lib/python3.8/site-packages/unohelper.py
+
+ # add a symlink required for gnome-documents; FS#51887
+ #
https://lists.freedesktop.org/archives/libreoffice/2016-March/073787.html
+ ln -svf /usr/lib/libreoffice/program/liblibreofficekitgtk.so \
+ "${pkgdir}"/usr/lib/liblibreofficekitgtk.so
+
+ # cleanup
+ rm -rf "${pkgdir}"/usr/share/libreoffice/sdk
+
+ # add application descriptions
+ install -dm755 "${pkgdir}"/usr/share/metainfo
+ install -v -m644
"${srcdir}"/libreoffice-$_LOver/sysui/desktop/appstream-appdata/*.xml \
+ "${pkgdir}"/usr/share/metainfo
+
+ # make all i18n lang packages with help section ('1') available to
+ # fix "F1" not opening translated offline help opening in browser
+ # see also /usr/lib/libreoffice/help/en-US/langnames.js
+ echo "var languagesSet = new Set(['en-US','am','ar','ast','bg','bn',\
+ 'bn-IN','bo','bs','ca','ca-valencia','cs','da','de','dz','el',\
+ 'en-GB','en-ZA','eo','es','et','eu','fi','fr','gl','gu','he',\
+ 'hi','hr','hu','id','is','it','ja','ka','km','ko','lo','lt','lv',\
+ 'mk','nb','ne','nl','nn','om','pl','pt','pt-BR','ro','ru','si',\
+
'sid','sk','sl','sq','sv','ta','tg','tr','ug','uk','vi','zh-CN','zh-TW'])" \
+ > "${pkgdir}"/usr/lib/libreoffice/help/languages.js
+}
Copied: libreoffice-still/repos/staging-x86_64/libreoffice-still.csh (from rev
367872, libreoffice-still/trunk/libreoffice-still.csh)
===================================================================
--- staging-x86_64/libreoffice-still.csh (rev 0)
+++ staging-x86_64/libreoffice-still.csh 2019-11-12 11:49:35 UTC (rev
367873)
@@ -0,0 +1,8 @@
+# to force a certain look'n feel
+
+#setenv SAL_USE_VCLPLUGIN gen
+#setenv SAL_USE_VCLPLUGIN gtk3_kde5
+#setenv SAL_USE_VCLPLUGIN kde5
+#setenv SAL_USE_VCLPLUGIN qt5
+#setenv SAL_USE_VCLPLUGIN gtk
+#setenv SAL_USE_VCLPLUGIN gtk3
Copied: libreoffice-still/repos/staging-x86_64/libreoffice-still.sh (from rev
367872, libreoffice-still/trunk/libreoffice-still.sh)
===================================================================
--- staging-x86_64/libreoffice-still.sh (rev 0)
+++ staging-x86_64/libreoffice-still.sh 2019-11-12 11:49:35 UTC (rev 367873)
@@ -0,0 +1,8 @@
+# to force a certain look'n feel
+
+#export SAL_USE_VCLPLUGIN=gen
+#export SAL_USE_VCLPLUGIN=gtk3_kde5
+#export SAL_USE_VCLPLUGIN=kde5
+#export SAL_USE_VCLPLUGIN=qt5
+#export SAL_USE_VCLPLUGIN=gtk
+#export SAL_USE_VCLPLUGIN=gtk3
Copied:
libreoffice-still/repos/staging-x86_64/make-pyuno-work-with-system-wide-module-install.diff
(from rev 367872,
libreoffice-still/trunk/make-pyuno-work-with-system-wide-module-install.diff)
===================================================================
--- staging-x86_64/make-pyuno-work-with-system-wide-module-install.diff
(rev 0)
+++ staging-x86_64/make-pyuno-work-with-system-wide-module-install.diff
2019-11-12 11:49:35 UTC (rev 367873)
@@ -0,0 +1,18 @@
+--- 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.star.pathname:/usr/lib/libreoffice/program/fundamentalrc")
++
++import pyuno
+ import traceback
+ import warnings
+
Copied: libreoffice-still/repos/staging-x86_64/python-3.8.patch (from rev
367872, libreoffice-still/trunk/python-3.8.patch)
===================================================================
--- staging-x86_64/python-3.8.patch (rev 0)
+++ staging-x86_64/python-3.8.patch 2019-11-12 11:49:35 UTC (rev 367873)
@@ -0,0 +1,199 @@
+From a62b45cf541cf47d136bdff87dff4c13fd4296c2 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sberg...@redhat.com>
+Date: Fri, 7 Jun 2019 15:57:13 +0200
+Subject: [PATCH] Adapt to upcoming Python 3.8
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+...which changed PyTypeObject in <https://github.com/python/cpython/commit/
+aacc77fbd77640a8f03638216fa09372cc21673d> "bpo-36974: implement PEP 590
+(GH-13185)".
+
+Change-Id: I687ec38aeda05d0747b9ed08221db75a758bed51
+Reviewed-on: https://gerrit.libreoffice.org/73664
+Tested-by: Jenkins
+Reviewed-by: Caolán McNamara <caol...@redhat.com>
+Tested-by: Caolán McNamara <caol...@redhat.com>
+(cherry picked from commit 2bd585f31d7abb066e3f53d9b29c822af20aea69)
+Reviewed-on: https://gerrit.libreoffice.org/73778
+---
+ pyuno/source/module/pyuno.cxx | 9 ++++++++-
+ pyuno/source/module/pyuno_callable.cxx | 9 ++++++++-
+ pyuno/source/module/pyuno_iterator.cxx | 18 ++++++++++++++++--
+ pyuno/source/module/pyuno_runtime.cxx | 9 ++++++++-
+ pyuno/source/module/pyuno_struct.cxx | 9 ++++++++-
+ 5 files changed, 48 insertions(+), 6 deletions(-)
+
+diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
+index f5f23bf058fa..e59319030eb8 100644
+--- a/pyuno/source/module/pyuno.cxx
++++ b/pyuno/source/module/pyuno.cxx
+@@ -1636,7 +1636,11 @@ static PyTypeObject PyUNOType =
+ sizeof (PyUNO),
+ 0,
+ PyUNO_del,
+- nullptr,
++#if PY_VERSION_HEX >= 0x03080000
++ 0, // Py_ssize_t tp_vectorcall_offset
++#else
++ nullptr, // printfunc tp_print
++#endif
+ PyUNO_getattr,
+ PyUNO_setattr,
+ /* this type does not exist in Python 3: (cmpfunc) */ nullptr,
+@@ -1680,6 +1684,9 @@ static PyTypeObject PyUNOType =
+ , 0
+ #if PY_VERSION_HEX >= 0x03040000
+ , nullptr
++#if PY_VERSION_HEX >= 0x03080000
++ , nullptr // vectorcallfunc tp_vectorcall
++#endif
+ #endif
+ };
+
+diff --git a/pyuno/source/module/pyuno_callable.cxx
b/pyuno/source/module/pyuno_callable.cxx
+index 6519d20734c9..656d1c84cb0e 100644
+--- a/pyuno/source/module/pyuno_callable.cxx
++++ b/pyuno/source/module/pyuno_callable.cxx
+@@ -181,7 +181,11 @@ static PyTypeObject PyUNO_callable_Type =
+ sizeof (PyUNO_callable),
+ 0,
+ ::pyuno::PyUNO_callable_del,
+- nullptr,
++#if PY_VERSION_HEX >= 0x03080000
++ 0, // Py_ssize_t tp_vectorcall_offset
++#else
++ nullptr, // printfunc tp_print
++#endif
+ nullptr,
+ nullptr,
+ nullptr,
+@@ -225,6 +229,9 @@ static PyTypeObject PyUNO_callable_Type =
+ , 0
+ #if PY_VERSION_HEX >= 0x03040000
+ , nullptr
++#if PY_VERSION_HEX >= 0x03080000
++ , nullptr // vectorcallfunc tp_vectorcall
++#endif
+ #endif
+ };
+
+diff --git a/pyuno/source/module/pyuno_iterator.cxx
b/pyuno/source/module/pyuno_iterator.cxx
+index 5f643c13b67e..a7862857d719 100644
+--- a/pyuno/source/module/pyuno_iterator.cxx
++++ b/pyuno/source/module/pyuno_iterator.cxx
+@@ -118,7 +118,11 @@ static PyTypeObject PyUNO_iterator_Type =
+ sizeof (PyUNO_iterator),
+ 0,
+ PyUNO_iterator_del,
+- nullptr,
++#if PY_VERSION_HEX >= 0x03080000
++ 0, // Py_ssize_t tp_vectorcall_offset
++#else
++ nullptr, // printfunc tp_print
++#endif
+ nullptr,
+ nullptr,
+ nullptr,
+@@ -162,6 +166,9 @@ static PyTypeObject PyUNO_iterator_Type =
+ 0
+ #if PY_VERSION_HEX >= 0x03040000
+ , nullptr
++#if PY_VERSION_HEX >= 0x03080000
++ , nullptr // vectorcallfunc tp_vectorcall
++#endif
+ #endif
+ };
+
+@@ -248,7 +255,11 @@ static PyTypeObject PyUNO_list_iterator_Type =
+ sizeof (PyUNO_list_iterator),
+ 0,
+ PyUNO_list_iterator_del,
+- nullptr,
++#if PY_VERSION_HEX >= 0x03080000
++ 0, // Py_ssize_t tp_vectorcall_offset
++#else
++ nullptr, // printfunc tp_print
++#endif
+ nullptr,
+ nullptr,
+ nullptr,
+@@ -292,6 +303,9 @@ static PyTypeObject PyUNO_list_iterator_Type =
+ 0
+ #if PY_VERSION_HEX >= 0x03040000
+ , nullptr
++#if PY_VERSION_HEX >= 0x03080000
++ , nullptr // vectorcallfunc tp_vectorcall
++#endif
+ #endif
+ };
+
+diff --git a/pyuno/source/module/pyuno_runtime.cxx
b/pyuno/source/module/pyuno_runtime.cxx
+index 9887c1fbc828..d307f9af363c 100644
+--- a/pyuno/source/module/pyuno_runtime.cxx
++++ b/pyuno/source/module/pyuno_runtime.cxx
+@@ -75,7 +75,11 @@ static PyTypeObject RuntimeImpl_Type =
+ sizeof (RuntimeImpl),
+ 0,
+ RuntimeImpl::del,
+- nullptr,
++#if PY_VERSION_HEX >= 0x03080000
++ 0, // Py_ssize_t tp_vectorcall_offset
++#else
++ nullptr, // printfunc tp_print
++#endif
+ nullptr,
+ nullptr,
+ nullptr,
+@@ -119,6 +123,9 @@ static PyTypeObject RuntimeImpl_Type =
+ , 0
+ #if PY_VERSION_HEX >= 0x03040000
+ , nullptr
++#if PY_VERSION_HEX >= 0x03080000
++ , nullptr // vectorcallfunc tp_vectorcall
++#endif
+ #endif
+ };
+
+diff --git a/pyuno/source/module/pyuno_struct.cxx
b/pyuno/source/module/pyuno_struct.cxx
+index 7088fc346145..9ad9439318ce 100644
+--- a/pyuno/source/module/pyuno_struct.cxx
++++ b/pyuno/source/module/pyuno_struct.cxx
+@@ -296,7 +296,11 @@ static PyTypeObject PyUNOStructType =
+ sizeof (PyUNO),
+ 0,
+ PyUNOStruct_del,
+- nullptr,
++#if PY_VERSION_HEX >= 0x03080000
++ 0, // Py_ssize_t tp_vectorcall_offset
++#else
++ nullptr, // printfunc tp_print
++#endif
+ PyUNOStruct_getattr,
+ PyUNOStruct_setattr,
+ /* this type does not exist in Python 3: (cmpfunc) */ nullptr,
+@@ -340,6 +344,9 @@ static PyTypeObject PyUNOStructType =
+ , 0
+ #if PY_VERSION_HEX >= 0x03040000
+ , nullptr
++#if PY_VERSION_HEX >= 0x03080000
++ , nullptr // vectorcallfunc tp_vectorcall
++#endif
+ #endif
+ };
+
+diff --git a/configure.ac b/configure.ac
+index 77cbacb109b6..39dd082b8366 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -8574,6 +8574,9 @@ if test $enable_python = system; then
+ if test -z "$PKG_CONFIG"; then
+ PYTHON_CFLAGS="-I$python_include"
+ PYTHON_LIBS="-L$python_libdir -lpython$python_version
$python_libs"
++ elif $PKG_CONFIG --exists python-$python_version-embed; then
++ PYTHON_CFLAGS="`$PKG_CONFIG --cflags
python-$python_version-embed`"
++ PYTHON_LIBS="`$PKG_CONFIG --libs python-$python_version-embed`
$python_libs"
+ elif $PKG_CONFIG --exists python-$python_version; then
+ PYTHON_CFLAGS="`$PKG_CONFIG --cflags python-$python_version`"
+ PYTHON_LIBS="`$PKG_CONFIG --libs python-$python_version`
$python_libs"
