Date: Friday, October 8, 2021 @ 23:17:41 Author: foutrelis Revision: 425498
archrelease: copy trunk to staging-x86_64 Added: libreoffice-fresh/repos/staging-x86_64/ libreoffice-fresh/repos/staging-x86_64/PKGBUILD (from rev 425497, libreoffice-fresh/trunk/PKGBUILD) libreoffice-fresh/repos/staging-x86_64/bison-3.8.patch (from rev 425497, libreoffice-fresh/trunk/bison-3.8.patch) libreoffice-fresh/repos/staging-x86_64/kf5_fix.patch (from rev 425497, libreoffice-fresh/trunk/kf5_fix.patch) libreoffice-fresh/repos/staging-x86_64/libreoffice-fresh.csh (from rev 425497, libreoffice-fresh/trunk/libreoffice-fresh.csh) libreoffice-fresh/repos/staging-x86_64/libreoffice-fresh.sh (from rev 425497, libreoffice-fresh/trunk/libreoffice-fresh.sh) libreoffice-fresh/repos/staging-x86_64/make-pyuno-work-with-system-wide-module-install.diff (from rev 425497, libreoffice-fresh/trunk/make-pyuno-work-with-system-wide-module-install.diff) libreoffice-fresh/repos/staging-x86_64/pld-skia-patches.patch (from rev 425497, libreoffice-fresh/trunk/pld-skia-patches.patch) libreoffice-fresh/repos/staging-x86_64/skia-freetype2.11.patch (from rev 425497, libreoffice-fresh/trunk/skia-freetype2.11.patch) libreoffice-fresh/repos/staging-x86_64/soffice-template.desktop.in (from rev 425497, libreoffice-fresh/trunk/soffice-template.desktop.in) ------------------------------------------------------+ PKGBUILD | 404 +++++++++++++++++ bison-3.8.patch | 50 ++ kf5_fix.patch | 39 + libreoffice-fresh.csh | 7 libreoffice-fresh.sh | 7 make-pyuno-work-with-system-wide-module-install.diff | 18 pld-skia-patches.patch | 10 skia-freetype2.11.patch | 37 + soffice-template.desktop.in | 7 9 files changed, 579 insertions(+) Copied: libreoffice-fresh/repos/staging-x86_64/PKGBUILD (from rev 425497, libreoffice-fresh/trunk/PKGBUILD) =================================================================== --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2021-10-08 23:17:41 UTC (rev 425498) @@ -0,0 +1,404 @@ +# 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-fresh +pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh') +_LOver=7.2.1.2 +pkgver=7.2.1 +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' '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=11' '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' + 'libexttextcat' 'gobject-introspection' # 'libfbclient' + 'libtommath' 'libzmf' 'gpgme' 'xmlsec' 'rxvt-unicode' + 'libepubgen' 'libfreehand' 'libqxp' 'libstaroffice' 'boost' 'libnumbertext' + 'libffi' 'box2d' 'git' +) + +_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-2021-03-05.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-4500.tar.bz2 + ${_additional_source_url}/dtoa-20180411.tgz + ${_additional_source_url}/lxml-4.1.1.tgz + ${_additional_source_url}/Firebird-3.0.7.33374-0.tar.bz2 + ${_additional_source_url}/zxing-cpp-1.1.1.tar.gz + ${_additional_source_url}/skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz + ${_additional_source_url}/libcmis-0.5.2.tar.xz + ${_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}/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf + ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll + make-pyuno-work-with-system-wide-module-install.diff + skia-freetype2.11.patch + pld-skia-patches.patch + bison-3.8.patch + kf5_fix.patch + soffice-template.desktop.in + libreoffice-fresh.sh libreoffice-fresh.csh) +noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip + 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip + a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip + 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz + language-subtag-registry-2021-03-05.tar.bz2 + 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip + d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip + ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip + pdfium-4500.tar.bz2 + dtoa-20180411.tgz + lxml-4.1.1.tgz + Firebird-3.0.7.33374-0.tar.bz2 + zxing-cpp-1.1.1.tar.gz + skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz + libcmis-0.5.2.tar.xz + 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar # for test suite + odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar # for test suite + f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf + 185d60944ea767075d27247c3162b3bc-unowinreg.dll +) +validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <bu...@documentfoundation.org> +sha256sums=('7a16b46fb397e72fce2d06b786025f321da12ccc39c9976510674ff9119b0a4d' + 'SKIP' + '804d75b09569bb4c3e2ab24ca070467f0fa7073e48208760c6d2d52411864c95' + 'SKIP' + '6da19cc6f5fa1b90b6602b5a5f47a12349cf98f26b69c9e2fbb360dce4a367d3' + 'SKIP' + '64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1' + '1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753' + '75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870' + '983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776' + 'ce80e8face06bf2ada363e0c159e3f990c4116fdae9232ca43e6369aa82bf16a' + 'd30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370' + '1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133' + '233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd' + '26a03dd60e5ed0979cdaba9cc848242895110ddfdf347d40989ce2f14020f304' + '0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4' + '940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e' + 'acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76' + 'e595b3fa2ec320beb0b28f6af56b1141853257c2611686685639cebb3b248c86' + 'abe0b94d54edb717c58d74263f4ed3d27824d2ce9e9f2ce85a21ab38d993f94d' + 'd7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2' + 'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770' + '984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504' + 'f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140' + 'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6' + 'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563' + '1f9506cff0c3f3638de6d1ff76f679c301f0e9aa2ab735b26274c42f16345e8e' + '55710ab0200784c69d49c38b9be6b447502c818ca828efc825355038c8980eea' + 'e1f46d84deb0c4e7ddbd1c5422e015940aa5ae43a5e2b8f10e88a0317aaa4ed0' + '89fb019756c1db7fa382d8ed325b36d1d02e525ccee77c59fb15abe2b61f1770' + 'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879' + 'cd1b25ff390e436c6bffa65c6e12382236e3ccbf8d3aae51b1b59bcaed79fd8a' + 'de20f36d45f0fecc2d94176dd3ec7226ab07fa8ffb9b0bc73c200349a9273de1') + +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 + + # fix build with FreeType 2.11 (patches from PLD Linux) + cp "${srcdir}"/skia-freetype2.11.patch external/skia + patch -Np1 -i "${srcdir}"/pld-skia-patches.patch + + # fix build with bison 3.8 + patch -Np1 -i "${srcdir}"/bison-3.8.patch + + # https://bugs.documentfoundation.org/show_bug.cgi?id=144037 + patch -Np1 -i "${srcdir}"/kf5_fix.patch + + #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 +} + +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-extra-buildid="${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-kf5 \ + --enable-qt5 \ + --enable-gtk3 \ + --enable-introspection \ + --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 \ + --without-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 \ + --without-system-zxing \ + --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-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.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' + 'liblangtag' 'libexttextcat' 'liborcus' # 'libfbclient' + 'libtommath' 'libzmf' 'libatomic_ops' 'xmlsec' 'gpgme' 'libnumbertext' + 'libfreehand' 'libstaroffice' 'libepubgen' 'libqxp' 'libepoxy' 'box2d' + 'xdg-utils') + 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' + '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-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 -m644 "${srcdir}"/libreoffice-fresh.{sh,csh} "${pkgdir}"/etc/profile.d/ + + # make pyuno find its modules + install -dm755 "${pkgdir}"/usr/lib/python3.9/site-packages + ln -svf /usr/lib/libreoffice/program/uno.py \ + "${pkgdir}"/usr/lib/python3.9/site-packages/uno.py + ln -svf /usr/lib/libreoffice/program/unohelper.py \ + "${pkgdir}"/usr/lib/python3.9/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 + + # add kde filemanager templates; FS#61662 - file taken from Debian + install -dm755 "${pkgdir}"/usr/share/templates/.source + install -v -m644 "${srcdir}"/libreoffice-$_LOver/extras/source/shellnew/soffice.* \ + "${pkgdir}"/usr/share/templates/.source + + cat "${srcdir}"/soffice-template.desktop.in \ + | sed -e "s/@APP@/Writer/" \ + | sed -e "s/@EXT@/odt/" \ + | sed -e "s/@TYPE@/text/" \ + > "${pkgdir}"/usr/share/templates/soffice.odt.desktop + cat "${srcdir}"/soffice-template.desktop.in \ + | sed -e "s/@APP@/Calc/" \ + | sed -e "s/@EXT@/ods/" \ + | sed -e "s/@TYPE@/spreadsheet/" \ + > "${pkgdir}"/usr/share/templates/soffice.ods.desktop + cat "${srcdir}"/soffice-template.desktop.in \ + | sed -e "s/@APP@/Impress/" \ + | sed -e "s/@EXT@/odp/" \ + | sed -e "s/@TYPE@/presentation/" \ + > "${pkgdir}"/usr/share/templates/soffice.odp.desktop + cat "${srcdir}"/soffice-template.desktop.in \ + | sed -e "s/@APP@/Draw/" \ + | sed -e "s/@EXT@/odg/" \ + | sed -e "s/@TYPE@/drawing/" \ + > "${pkgdir}"/usr/share/templates/soffice.odg.desktop + + # 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-fresh/repos/staging-x86_64/bison-3.8.patch (from rev 425497, libreoffice-fresh/trunk/bison-3.8.patch) =================================================================== --- staging-x86_64/bison-3.8.patch (rev 0) +++ staging-x86_64/bison-3.8.patch 2021-10-08 23:17:41 UTC (rev 425498) @@ -0,0 +1,50 @@ +From 45227d9b79dc4f2a2aa6874cd4e3c02b7934b197 Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann <sberg...@redhat.com> +Date: Tue, 14 Sep 2021 12:20:48 +0200 +Subject: [PATCH] Adapt to Bison 3.8 internal yyn -> yyrule rename + +see +<https://git.savannah.gnu.org/cgit/bison.git/commit/?id=f30067ed51f23802fc91761ede1506dfa72b2865> +"glr2.cc: log the execution of deferred actions" including "Rename argument yyn +as yyrule for clarity." + +YYBISON was defined as 1 rather than as a representation of the Bison version +prior to +<https://git.savannah.gnu.org/cgit/bison.git/commit/?id=21c147b6e5372563b7c4741deadaddb9354f4b09> +"yacc.c: provide the Bison version as an integral macro", which shouldn't be a +problem here. And YYBISON is apparently completely undefined with +/usr/bin/bison on macOS. + +(The preceding comment always mentioned "yyi" and "yyrmap" in apparent mismatch +with the actually used "yyn" and "yyr1" ever since +c25ec0608a167bcf1d891043f02273761c351701 "initial import", so just leave it +untouched.) + +Change-Id: I4f901407aa21ed4abec84e661d813ee7599f02f0 +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122082 +Tested-by: Jenkins +Reviewed-by: Stephan Bergmann <sberg...@redhat.com> +--- + connectivity/source/parse/sqlbison.y | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y +index d14f36e7794f0..c4be0bc00bd04 100644 +--- a/connectivity/source/parse/sqlbison.y ++++ b/connectivity/source/parse/sqlbison.y +@@ -74,9 +74,15 @@ inline connectivity::OSQLInternalNode* newNode(const OUString& _newValue, + + // yyi is the internal number of the rule that is currently being reduced + // This can be mapped to external rule number via the yyrmap. ++#if defined YYBISON && YYBISON >= 30800 ++#define SQL_NEW_RULE newNode("", SQLNodeType::Rule, yyr1[yyrule]) ++#define SQL_NEW_LISTRULE newNode("", SQLNodeType::ListRule, yyr1[yyrule]) ++#define SQL_NEW_COMMALISTRULE newNode("", SQLNodeType::CommaListRule, yyr1[yyrule]) ++#else + #define SQL_NEW_RULE newNode("", SQLNodeType::Rule, yyr1[yyn]) + #define SQL_NEW_LISTRULE newNode("", SQLNodeType::ListRule, yyr1[yyn]) + #define SQL_NEW_COMMALISTRULE newNode("", SQLNodeType::CommaListRule, yyr1[yyn]) ++#endif + + + extern connectivity::OSQLParser* xxx_pGLOBAL_SQLPARSER; Copied: libreoffice-fresh/repos/staging-x86_64/kf5_fix.patch (from rev 425497, libreoffice-fresh/trunk/kf5_fix.patch) =================================================================== --- staging-x86_64/kf5_fix.patch (rev 0) +++ staging-x86_64/kf5_fix.patch 2021-10-08 23:17:41 UTC (rev 425498) @@ -0,0 +1,39 @@ +From 7c1f4284562e905372b5c14b6017f1eb438f54b5 Mon Sep 17 00:00:00 2001 +From: Jan-Marek Glogowski <glo...@fbihome.de> +Date: Thu, 26 Aug 2021 14:23:29 +0200 +Subject: tdf#144037 Qt5 just close popup with mouse outside + +How hard could it be to close a popup window when losing focus or +clicking outside of it (AKA tdf#143114 problem 3)? At least with +Qt it feels like solving an NP problem... + +So don't always force-close the popup window if clicked anywhere +on it. Seems to be consistent with gen and gtk3. + +Change-Id: Ia1c231c0b51a55bec2c587feffcf14bb4b4cee55 +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121093 +Tested-by: Jenkins +Reviewed-by: Jan-Marek Glogowski <glo...@fbihome.de> +(cherry picked from commit a1a83b6b3b4459de353e0cdc8cdf402370c0a5c4) +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121064 +Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com> +--- + vcl/qt5/Qt5Widget.cxx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/vcl/qt5/Qt5Widget.cxx b/vcl/qt5/Qt5Widget.cxx +index 864701340ad3..64ad4f7539c4 100644 +--- a/vcl/qt5/Qt5Widget.cxx ++++ b/vcl/qt5/Qt5Widget.cxx +@@ -182,7 +182,7 @@ void Qt5Widget::mousePressEvent(QMouseEvent* pEvent) + { + handleMousePressEvent(m_rFrame, pEvent); + if (m_rFrame.isPopup() +- || !geometry().translated(geometry().topLeft() * -1).contains(pEvent->pos())) ++ && !geometry().translated(geometry().topLeft() * -1).contains(pEvent->pos())) + closePopup(); + } + +-- +cgit v1.2.1 + Copied: libreoffice-fresh/repos/staging-x86_64/libreoffice-fresh.csh (from rev 425497, libreoffice-fresh/trunk/libreoffice-fresh.csh) =================================================================== --- staging-x86_64/libreoffice-fresh.csh (rev 0) +++ staging-x86_64/libreoffice-fresh.csh 2021-10-08 23:17:41 UTC (rev 425498) @@ -0,0 +1,7 @@ +# to force a certain look'n feel + +#setenv SAL_USE_VCLPLUGIN gen +#setenv SAL_USE_VCLPLUGIN gtk3_kde5 +#setenv SAL_USE_VCLPLUGIN kf5 +#setenv SAL_USE_VCLPLUGIN qt5 +#setenv SAL_USE_VCLPLUGIN gtk3 Copied: libreoffice-fresh/repos/staging-x86_64/libreoffice-fresh.sh (from rev 425497, libreoffice-fresh/trunk/libreoffice-fresh.sh) =================================================================== --- staging-x86_64/libreoffice-fresh.sh (rev 0) +++ staging-x86_64/libreoffice-fresh.sh 2021-10-08 23:17:41 UTC (rev 425498) @@ -0,0 +1,7 @@ +# to force a certain look'n feel + +#export SAL_USE_VCLPLUGIN=gen +#export SAL_USE_VCLPLUGIN=gtk3_kde5 +#export SAL_USE_VCLPLUGIN=kf5 +#export SAL_USE_VCLPLUGIN=qt5 +#export SAL_USE_VCLPLUGIN=gtk3 Copied: libreoffice-fresh/repos/staging-x86_64/make-pyuno-work-with-system-wide-module-install.diff (from rev 425497, libreoffice-fresh/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 2021-10-08 23:17:41 UTC (rev 425498) @@ -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-fresh/repos/staging-x86_64/pld-skia-patches.patch (from rev 425497, libreoffice-fresh/trunk/pld-skia-patches.patch) =================================================================== --- staging-x86_64/pld-skia-patches.patch (rev 0) +++ staging-x86_64/pld-skia-patches.patch 2021-10-08 23:17:41 UTC (rev 425498) @@ -0,0 +1,10 @@ +--- libreoffice-7.2.0.3/external/skia/UnpackedTarball_skia.mk.orig 2021-08-10 19:27:48.000000000 +0200 ++++ libreoffice-7.2.0.3/external/skia/UnpackedTarball_skia.mk 2021-08-12 18:09:22.813517161 +0200 +@@ -39,6 +39,7 @@ + fast-png-write.patch.1 \ + skia_sk_cpu_sse_level_0_by_default.patch.1 \ + fix-warnings.patch.1 \ ++ skia-freetype2.11.patch \ + + $(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1)) + Copied: libreoffice-fresh/repos/staging-x86_64/skia-freetype2.11.patch (from rev 425497, libreoffice-fresh/trunk/skia-freetype2.11.patch) =================================================================== --- staging-x86_64/skia-freetype2.11.patch (rev 0) +++ staging-x86_64/skia-freetype2.11.patch 2021-10-08 23:17:41 UTC (rev 425498) @@ -0,0 +1,37 @@ +--- skia/src/ports/SkFontHost_FreeType_common.cpp.orig 2021-03-01 15:53:09.178606791 +0100 ++++ skia/src/ports/SkFontHost_FreeType_common.cpp 2021-08-12 17:48:32.358901987 +0200 +@@ -665,8 +665,13 @@ + canvas->drawPaint(paint); + break; + } ++#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11 ++ case FT_COLR_PAINTFORMAT_TRANSFORM: { ++ SkMatrix transform = ToSkMatrix(colrv1_paint.u.transform.affine); ++#else + case FT_COLR_PAINTFORMAT_TRANSFORMED: { + SkMatrix transform = ToSkMatrix(colrv1_paint.u.transformed.affine); ++#endif + + canvas->concat(transform); + break; +@@ -760,12 +765,20 @@ + traverse_result = colrv1_start_glyph(canvas, palette, face, paint.u.colr_glyph.glyphID, + FT_COLOR_NO_ROOT_TRANSFORM); + break; ++#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11 ++ case FT_COLR_PAINTFORMAT_TRANSFORM: ++#else + case FT_COLR_PAINTFORMAT_TRANSFORMED: ++#endif + canvas->saveLayer(nullptr, nullptr); + // Traverse / draw operation will apply transform. + colrv1_draw_paint(canvas, palette, face, paint); + traverse_result = ++#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11 ++ colrv1_traverse_paint(canvas, palette, face, paint.u.transform.paint); ++#else + colrv1_traverse_paint(canvas, palette, face, paint.u.transformed.paint); ++#endif + canvas->restore(); + break; + case FT_COLR_PAINTFORMAT_ROTATE: Copied: libreoffice-fresh/repos/staging-x86_64/soffice-template.desktop.in (from rev 425497, libreoffice-fresh/trunk/soffice-template.desktop.in) =================================================================== --- staging-x86_64/soffice-template.desktop.in (rev 0) +++ staging-x86_64/soffice-template.desktop.in 2021-10-08 23:17:41 UTC (rev 425498) @@ -0,0 +1,7 @@ +[Desktop Entry] +Name=LibreOffice @APP@ ... +Comment=Enter LibreOffice @APP@ filename: +Comment[de]=Name der LibreOffice @APP@-Datei eingeben: +Type=Link +URL=.source/soffice.@EXT@ +Icon=libreoffice-oasis-@TYPE@