[arch-commits] Commit in libreoffice-still/repos/extra-x86_64 (12 files)
Andreas Radke
andyrtr at archlinux.org
Sat Aug 18 19:37:11 UTC 2018
Date: Saturday, August 18, 2018 @ 19:37:11
Author: andyrtr
Revision: 332509
archrelease: copy trunk to extra-x86_64
Added:
libreoffice-still/repos/extra-x86_64/PKGBUILD
(from rev 332508, libreoffice-still/trunk/PKGBUILD)
libreoffice-still/repos/extra-x86_64/emfio.patch
(from rev 332508, libreoffice-still/trunk/emfio.patch)
libreoffice-still/repos/extra-x86_64/libreoffice-still.csh
(from rev 332508, libreoffice-still/trunk/libreoffice-still.csh)
libreoffice-still/repos/extra-x86_64/libreoffice-still.sh
(from rev 332508, libreoffice-still/trunk/libreoffice-still.sh)
libreoffice-still/repos/extra-x86_64/make-pyuno-work-with-system-wide-module-install.diff
(from rev 332508, libreoffice-still/trunk/make-pyuno-work-with-system-wide-module-install.diff)
libreoffice-still/repos/extra-x86_64/pyuno-python37.patch
(from rev 332508, libreoffice-still/trunk/pyuno-python37.patch)
Deleted:
libreoffice-still/repos/extra-x86_64/PKGBUILD
libreoffice-still/repos/extra-x86_64/emfio.patch
libreoffice-still/repos/extra-x86_64/libreoffice-still.csh
libreoffice-still/repos/extra-x86_64/libreoffice-still.sh
libreoffice-still/repos/extra-x86_64/make-pyuno-work-with-system-wide-module-install.diff
libreoffice-still/repos/extra-x86_64/pyuno-python37.patch
------------------------------------------------------+
PKGBUILD | 689 ++++++++---------
emfio.patch | 584 +++++++-------
libreoffice-still.csh | 11
libreoffice-still.sh | 11
make-pyuno-work-with-system-wide-module-install.diff | 36
pyuno-python37.patch | 108 +-
6 files changed, 718 insertions(+), 721 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-08-18 19:36:52 UTC (rev 332508)
+++ PKGBUILD 2018-08-18 19:37:11 UTC (rev 332509)
@@ -1,345 +0,0 @@
-# $Id$
-# Maintainer: AndyRTR <andyrtr at archlinux.org>
-# Maintainer: Bartłomiej Piotrowski <bpiotrowski at 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 foutrelis at 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.0.6.2
-pkgver=6.0.6
-pkgrel=1
-arch=('x86_64')
-license=('LGPL3')
-url="http://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' 'glew' 'nss' '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' 'beanshell' 'clucene'
- 'junit' 'libmythes' 'libwpg' 'java-environment' 'postgresql-libs' 'libgl'
- 'bluez-libs' 'gdb' 'doxygen' 'libatomic_ops' 'mdds' 'glew'
- 'apr' 'serf' 'ttf-liberation' 'ttf-dejavu' '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'
-)
-
-_mirror="https://download.documentfoundation.org/libreoffice/src/${pkgver}"
-#_mirror="https://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_65_1.tar.bz2
- ${_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-2017-08-15.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}/Firebird-3.0.0.32483-0.tar.bz2
- ${_additional_source_url}/pdfium-3235.tar.bz2
- ${_additional_source_url}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
- ${_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+ODFTOOLKIT-460+ODFTOOLKIT-475.jar # for test suite
- ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
- make-pyuno-work-with-system-wide-module-install.diff
- emfio.patch
- libreoffice-still.sh libreoffice-still.csh)
-noextract=(boost_1_65_1.tar.bz2
- 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
- 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
- a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
- 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
- language-subtag-registry-2017-08-15.tar.bz2
- 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
- d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- Firebird-3.0.0.32483-0.tar.bz2
- pdfium-3235.tar.bz2
- bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
- 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar # for test suite
- odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar # for test suite
- 185d60944ea767075d27247c3162b3bc-unowinreg.dll
-)
-validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build at documentfoundation.org>
-sha256sums=('f1666430abf616a3813e4c886b51f157366f592102ae0e874abc17f3d58c6a8e'
- 'SKIP'
- '7e49f0dc0e7fd8e2628939833063d60e6c92bdec019226037446595c87eee85e'
- 'SKIP'
- 'ab55fcc7e6103e541288a369236c5fe2c7b6c3f7d86b2b62b198f7977ca92742'
- 'SKIP'
- '9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81'
- '64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1'
- '1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753'
- '75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870'
- '983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776'
- 'd6a97fc8da5ae54d867e7f1b65ffb51e816cadd11714e45fc23ee0abf81a51ab'
- 'd30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370'
- '1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133'
- '233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd'
- '6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860'
- '7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f'
- 'd0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a'
- 'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770'
- '702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769'
- 'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6'
- 'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563'
- '8b4815788be087940750b775690b5890c4cf9e121f11006a72ccab834f212abb'
- '76f62957d0058092b11316357d9d716a62b48a53e5277426ffa87429ab5510e4'
- 'd24cfcb556ae1db02087c49012bbc4621f9ef7e3465ca832e1410326d260f283')
-
-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
-
- # don't run broken tests
- sed -i "/CppunitTest_sw_ooxmlexport9/d" sw/Module_sw.mk
- sed -i "/CppunitTest_sw_uiwriter/d" sw/Module_sw.mk
- sed -i "/CppunitTest_sw_ww8export2/d" sw/Module_sw.mk
- sed -i "/CppunitTest_xmlsecurity_signing/d" xmlsecurity/Module_xmlsecurity.mk
- sed -i "/CppunitTest_sc_subsequent_filters_test/d" sc/Module_sc.mk
- sed -i "/CppunitTest_sc_subsequent_export_test/d" sc/Module_sc.mk
- sed -i "/CppunitTest_chart2_export/d" chart2/Module_chart2.mk
- sed -i "/CppunitTest_dbaccess_RowSetClones/d" dbaccess/Module_dbaccess.mk
- sed -i "/CppunitTest_dbaccess_hsqldb/d" dbaccess/Module_dbaccess.mk
- # apply upstream fix for broken cppunit test
- patch -Np1 -i ../emfio.patch
- sed -i "/CppunitTest_emfio_emf_test/d" emfio/Module_emfio.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 - 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
-}
-
-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 \
- --disable-avahi \
- --enable-dbus \
- --enable-evolution2\
- --enable-gio\
- --enable-kde4\
- --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\
- --without-system-glm \
- --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/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
-
- touch src.downloaded
- make build
-
- 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' 'dbus-glib'
- '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' 'libcmis' 'liborcus' # 'libfbclient'
- 'libtommath' 'libzmf' 'libatomic_ops' 'xmlsec'
- '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'
- 'coin-or-mp: required by the Calc solver'
- 'gtk2: for GTK2 integration'
- 'gtk3: for GTK3 integration'
- 'kdelibs: for 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.7/site-packages
- ln -svf /usr/lib/libreoffice/program/uno.py \
- ${pkgdir}/usr/lib/python3.7/site-packages/uno.py
- ln -svf /usr/lib/libreoffice/program/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
- 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 -v -m644 ${srcdir}/libreoffice-$_LOver/sysui/desktop/appstream-appdata/*.xml \
- ${pkgdir}/usr/share/appdata
-}
Copied: libreoffice-still/repos/extra-x86_64/PKGBUILD (from rev 332508, libreoffice-still/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-08-18 19:37:11 UTC (rev 332509)
@@ -0,0 +1,344 @@
+# $Id$
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at 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 foutrelis at 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.0.6.2
+pkgver=6.0.6
+pkgrel=2
+arch=('x86_64')
+license=('LGPL3')
+url="http://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' 'glew' 'nss' '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' 'gtk3' 'cppunit' 'beanshell' 'clucene'
+ 'junit' 'libmythes' 'libwpg' 'java-environment' 'postgresql-libs' 'libgl'
+ 'bluez-libs' 'gdb' 'doxygen' 'libatomic_ops' 'mdds' 'glew'
+ 'apr' 'serf' 'ttf-liberation' 'ttf-dejavu' 'ttf-carlito' 'libxinerama' 'libpagemaker'
+ 'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'liblangtag' 'liborcus'
+ 'libexttextcat' 'libcmis' 'gobject-introspection'
+ 'libtommath' 'libzmf' 'gpgme' 'xmlsec' 'rxvt-unicode'
+ 'libepubgen' 'libfreehand' 'libqxp' 'libstaroffice'
+)
+
+_mirror="https://download.documentfoundation.org/libreoffice/src/${pkgver}"
+#_mirror="https://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_65_1.tar.bz2
+ ${_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-2017-08-15.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}/Firebird-3.0.0.32483-0.tar.bz2
+ ${_additional_source_url}/pdfium-3235.tar.bz2
+ ${_additional_source_url}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
+ ${_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+ODFTOOLKIT-460+ODFTOOLKIT-475.jar # for test suite
+ ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
+ make-pyuno-work-with-system-wide-module-install.diff
+ emfio.patch
+ libreoffice-still.sh libreoffice-still.csh)
+noextract=(boost_1_65_1.tar.bz2
+ 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
+ 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
+ a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
+ 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
+ language-subtag-registry-2017-08-15.tar.bz2
+ 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
+ d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ Firebird-3.0.0.32483-0.tar.bz2
+ pdfium-3235.tar.bz2
+ bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
+ 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar # for test suite
+ odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar # for test suite
+ 185d60944ea767075d27247c3162b3bc-unowinreg.dll
+)
+validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build at documentfoundation.org>
+sha256sums=('f1666430abf616a3813e4c886b51f157366f592102ae0e874abc17f3d58c6a8e'
+ 'SKIP'
+ '7e49f0dc0e7fd8e2628939833063d60e6c92bdec019226037446595c87eee85e'
+ 'SKIP'
+ 'ab55fcc7e6103e541288a369236c5fe2c7b6c3f7d86b2b62b198f7977ca92742'
+ 'SKIP'
+ '9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81'
+ '64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1'
+ '1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753'
+ '75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870'
+ '983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776'
+ 'd6a97fc8da5ae54d867e7f1b65ffb51e816cadd11714e45fc23ee0abf81a51ab'
+ 'd30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370'
+ '1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133'
+ '233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd'
+ '6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860'
+ '7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f'
+ 'd0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a'
+ 'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770'
+ '702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769'
+ 'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6'
+ 'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563'
+ '8b4815788be087940750b775690b5890c4cf9e121f11006a72ccab834f212abb'
+ '52e90a5a3d8d5b626caa51675b601aba508463c2b9caa98d07cfa35220fc0b22'
+ '531de4133cb6ff5c841e4251fdafe69521ccd195f5933eb8c113291d3eff183a')
+
+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
+
+ # don't run broken tests
+ sed -i "/CppunitTest_sw_ooxmlexport9/d" sw/Module_sw.mk
+ sed -i "/CppunitTest_sw_uiwriter/d" sw/Module_sw.mk
+ sed -i "/CppunitTest_sw_ww8export2/d" sw/Module_sw.mk
+ sed -i "/CppunitTest_xmlsecurity_signing/d" xmlsecurity/Module_xmlsecurity.mk
+ sed -i "/CppunitTest_sc_subsequent_filters_test/d" sc/Module_sc.mk
+ sed -i "/CppunitTest_sc_subsequent_export_test/d" sc/Module_sc.mk
+ sed -i "/CppunitTest_chart2_export/d" chart2/Module_chart2.mk
+ sed -i "/CppunitTest_dbaccess_RowSetClones/d" dbaccess/Module_dbaccess.mk
+ sed -i "/CppunitTest_dbaccess_hsqldb/d" dbaccess/Module_dbaccess.mk
+ # apply upstream fix for broken cppunit test
+ patch -Np1 -i ../emfio.patch
+ sed -i "/CppunitTest_emfio_emf_test/d" emfio/Module_emfio.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 - 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
+}
+
+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 \
+ --disable-avahi \
+ --enable-dbus \
+ --enable-evolution2\
+ --enable-gio\
+ --disable-kde4\
+ --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\
+ --without-system-glm \
+ --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/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
+
+ touch src.downloaded
+ make build
+
+ 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' 'dbus-glib'
+ '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' 'libcmis' 'liborcus' # 'libfbclient'
+ 'libtommath' 'libzmf' 'libatomic_ops' 'xmlsec' 'gpgme'
+ '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'
+ 'coin-or-mp: required by the Calc solver'
+ 'gtk2: for GTK2 integration'
+ 'gtk3: for GTK3 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.7/site-packages
+ ln -svf /usr/lib/libreoffice/program/uno.py \
+ ${pkgdir}/usr/lib/python3.7/site-packages/uno.py
+ ln -svf /usr/lib/libreoffice/program/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
+ 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 -v -m644 ${srcdir}/libreoffice-$_LOver/sysui/desktop/appstream-appdata/*.xml \
+ ${pkgdir}/usr/share/appdata
+}
Deleted: emfio.patch
===================================================================
--- emfio.patch 2018-08-18 19:36:52 UTC (rev 332508)
+++ emfio.patch 2018-08-18 19:37:11 UTC (rev 332509)
@@ -1,292 +0,0 @@
-From 126f10840b0e5930be57cb55262789e85bff9b21 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman at redhat.com>
-Date: Fri, 12 Jan 2018 20:24:43 +0100
-Subject: More loplugin:cstylecast: emfio
-
-auto-rewrite with <https://gerrit.libreoffice.org/#/c/47798/> "Enable
-loplugin:cstylecast for some more cases" plus
-solenv/clang-format/reformat-formatted-files
-
-Change-Id: Idffd3ef04b007f04b7022e54881254da9b2aa4a0
----
- emfio/qa/cppunit/emf/EmfImportTest.cxx | 6 +++---
- emfio/source/reader/emfreader.cxx | 8 ++++----
- emfio/source/reader/mtftools.cxx | 26 +++++++++++++-------------
- emfio/source/reader/wmfreader.cxx | 12 ++++++------
- 4 files changed, 26 insertions(+), 26 deletions(-)
-
-diff --git a/emfio/qa/cppunit/emf/EmfImportTest.cxx b/emfio/qa/cppunit/emf/EmfImportTest.cxx
-index bc14c4b..9611db6 100644
---- a/emfio/qa/cppunit/emf/EmfImportTest.cxx
-+++ b/emfio/qa/cppunit/emf/EmfImportTest.cxx
-@@ -88,7 +88,7 @@ void Test::checkRectPrimitive(Primitive2DSequence const & rPrimitive)
- void Test::testWorking()
- {
- Primitive2DSequence aSequenceRect = parseEmf("/emfio/qa/cppunit/emf/data/fdo79679-2.emf");
-- CPPUNIT_ASSERT_EQUAL(1, (int) aSequenceRect.getLength());
-+ CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(aSequenceRect.getLength()));
- checkRectPrimitive(aSequenceRect);
- }
-
-@@ -99,7 +99,7 @@ void Test::TestDrawString()
-
- // first, get the sequence of primitives and dump it
- Primitive2DSequence aSequence = parseEmf("/emfio/qa/cppunit/emf/data/TestDrawString.emf");
-- CPPUNIT_ASSERT_EQUAL(1, (int) aSequence.getLength());
-+ CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(aSequence.getLength()));
- Primitive2dXmlDump dumper;
- xmlDocPtr pDocument = dumper.dumpAndParse(comphelper::sequenceToContainer<Primitive2DContainer>(aSequence));
- CPPUNIT_ASSERT (pDocument);
-@@ -120,7 +120,7 @@ void Test::TestDrawLine()
-
- // first, get the sequence of primitives and dump it
- Primitive2DSequence aSequence = parseEmf("/emfio/qa/cppunit/emf/data/TestDrawLine.emf");
-- CPPUNIT_ASSERT_EQUAL(1, (int) aSequence.getLength());
-+ CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(aSequence.getLength()));
- Primitive2dXmlDump dumper;
- xmlDocPtr pDocument = dumper.dumpAndParse(comphelper::sequenceToContainer<Primitive2DContainer>(aSequence));
- CPPUNIT_ASSERT (pDocument);
-diff --git a/emfio/source/reader/emfreader.cxx b/emfio/source/reader/emfreader.cxx
-index 52e8661..ea557ea 100644
---- a/emfio/source/reader/emfreader.cxx
-+++ b/emfio/source/reader/emfreader.cxx
-@@ -590,7 +590,7 @@ namespace emfio
- {
- sal_uInt32 nPoints(0);
- mpInputStream->ReadUInt32( nPoints );
-- aPoints[i] = (sal_uInt16)nPoints;
-+ aPoints[i] = static_cast<sal_uInt16>(nPoints);
- }
- if ( mpInputStream->good() && ( nGesPoints * (sizeof(T)+sizeof(T)) ) <= ( nEndPos - mpInputStream->Tell() ) )
- {
-@@ -681,7 +681,7 @@ namespace emfio
-
- mpInputStream->ReadUInt32( nCommentId );
-
-- SAL_INFO ("emfio", "\t\tbegin " << (char)(nCommentId & 0xff) << (char)((nCommentId & 0xff00) >> 8) << (char)((nCommentId & 0xff0000) >> 16) << (char)((nCommentId & 0xff000000) >> 24) << " id: 0x" << std::hex << nCommentId << std::dec);
-+ SAL_INFO ("emfio", "\t\tbegin " << static_cast<char>(nCommentId & 0xff) << static_cast<char>((nCommentId & 0xff00) >> 8) << static_cast<char>((nCommentId & 0xff0000) >> 16) << static_cast<char>((nCommentId & 0xff000000) >> 24) << " id: 0x" << std::hex << nCommentId << std::dec);
-
- if( nCommentId == EMR_COMMENT_EMFPLUS && nRecSize >= 12 )
- {
-@@ -761,7 +761,7 @@ namespace emfio
- {
- mpInputStream->ReadUInt32( nNom1 ).ReadUInt32( nDen1 ).ReadUInt32( nNom2 ).ReadUInt32( nDen2 );
- if (nDen1 != 0 && nDen2 != 0)
-- ScaleWinExt( (double)nNom1 / nDen1, (double)nNom2 / nDen2 );
-+ ScaleWinExt( static_cast<double>(nNom1) / nDen1, static_cast<double>(nNom2) / nDen2 );
- else
- SAL_WARN("vcl.emf", "ignoring bogus divide by zero");
- }
-@@ -778,7 +778,7 @@ namespace emfio
- {
- mpInputStream->ReadUInt32( nNom1 ).ReadUInt32( nDen1 ).ReadUInt32( nNom2 ).ReadUInt32( nDen2 );
- if (nDen1 != 0 && nDen2 != 0)
-- ScaleDevExt( (double)nNom1 / nDen1, (double)nNom2 / nDen2 );
-+ ScaleDevExt( static_cast<double>(nNom1) / nDen1, static_cast<double>(nNom2) / nDen2 );
- else
- SAL_WARN("vcl.emf", "ignoring bogus divide by zero");
- }
-diff --git a/emfio/source/reader/mtftools.cxx b/emfio/source/reader/mtftools.cxx
-index 55fd4dd..e3bbb5f 100644
---- a/emfio/source/reader/mtftools.cxx
-+++ b/emfio/source/reader/mtftools.cxx
-@@ -272,7 +272,7 @@ namespace emfio
- if( rFont.lfStrikeOut )
- aFont.SetStrikeout( STRIKEOUT_SINGLE );
-
-- aFont.SetOrientation( (short)rFont.lfEscapement );
-+ aFont.SetOrientation( static_cast<short>(rFont.lfEscapement) );
-
- Size aFontSize( Size( rFont.lfWidth, rFont.lfHeight ) );
- if ( rFont.lfHeight > 0 )
-@@ -287,8 +287,8 @@ namespace emfio
- long nHeight = aMetric.GetAscent() + aMetric.GetDescent();
- if (nHeight)
- {
-- double fHeight = ((double)aFontSize.Height() * rFont.lfHeight ) / nHeight;
-- aFontSize.Height() = (sal_Int32)( fHeight + 0.5 );
-+ double fHeight = (static_cast<double>(aFontSize.Height()) * rFont.lfHeight ) / nHeight;
-+ aFontSize.Height() = static_cast<sal_Int32>( fHeight + 0.5 );
- }
- }
-
-@@ -303,7 +303,7 @@ namespace emfio
- sal_uInt32 nColor;
-
- mpInputStream->ReadUInt32( nColor );
-- return Color( (sal_uInt8)nColor, (sal_uInt8)( nColor >> 8 ), (sal_uInt8)( nColor >> 16 ) );
-+ return Color( static_cast<sal_uInt8>(nColor), static_cast<sal_uInt8>( nColor >> 8 ), static_cast<sal_uInt8>( nColor >> 16 ) );
- };
-
- Point MtfTools::ImplScale(const Point& rPoint) // Hack to set varying defaults for incompletely defined files.
-@@ -394,8 +394,8 @@ namespace emfio
- fY2 *= mnDevHeight;
- fX2 += mnDevOrgX;
- fY2 += mnDevOrgY; // fX2, fY2 now in device units
-- fX2 *= (double)mnMillX * 100.0 / (double)mnPixX;
-- fY2 *= (double)mnMillY * 100.0 / (double)mnPixY;
-+ fX2 *= static_cast<double>(mnMillX) * 100.0 / static_cast<double>(mnPixX);
-+ fY2 *= static_cast<double>(mnMillY) * 100.0 / static_cast<double>(mnPixY);
- }
- }
- break;
-@@ -482,8 +482,8 @@ namespace emfio
- fHeight /= mnWinExtY;
- fWidth *= mnDevWidth;
- fHeight *= mnDevHeight;
-- fWidth *= (double)mnMillX * 100.0 / (double)mnPixX;
-- fHeight *= (double)mnMillY * 100.0 / (double)mnPixY;
-+ fWidth *= static_cast<double>(mnMillX) * 100.0 / static_cast<double>(mnPixX);
-+ fHeight *= static_cast<double>(mnMillY) * 100.0 / static_cast<double>(mnPixY);
- }
- }
- break;
-@@ -558,7 +558,7 @@ namespace emfio
- {
- if ( nIndex & ENHMETA_STOCK_OBJECT )
- {
-- sal_uInt16 nStockId = (sal_uInt8)nIndex;
-+ sal_uInt16 nStockId = static_cast<sal_uInt8>(nIndex);
- switch( nStockId )
- {
- case WHITE_BRUSH :
-@@ -617,7 +617,7 @@ namespace emfio
-
- GDIObj *pGDIObj = nullptr;
-
-- if ( (sal_uInt32)nIndex < mvGDIObj.size() )
-+ if ( static_cast<sal_uInt32>(nIndex) < mvGDIObj.size() )
- pGDIObj = mvGDIObj[ nIndex ].get();
-
- if ( pGDIObj )
-@@ -760,7 +760,7 @@ namespace emfio
- }
- }
- }
-- if ( (sal_uInt32)nIndex >= mvGDIObj.size() )
-+ if ( static_cast<sal_uInt32>(nIndex) >= mvGDIObj.size() )
- ImplResizeObjectArry( nIndex + 16 );
-
- mvGDIObj[ nIndex ] = std::move(pObject);
-@@ -776,7 +776,7 @@ namespace emfio
- {
- if ( ( nIndex & ENHMETA_STOCK_OBJECT ) == 0 )
- {
-- if ( (sal_uInt32)nIndex < mvGDIObj.size() )
-+ if ( static_cast<sal_uInt32>(nIndex) < mvGDIObj.size() )
- {
- mvGDIObj[ nIndex ].reset();
- }
-@@ -1738,7 +1738,7 @@ namespace emfio
- pSave = rSaveList[i].get();
-
- sal_uInt32 nWinRop = pSave->nWinRop;
-- sal_uInt8 nRasterOperation = (sal_uInt8)( nWinRop >> 16 );
-+ sal_uInt8 nRasterOperation = static_cast<sal_uInt8>( nWinRop >> 16 );
-
- sal_uInt32 nUsed = 0;
- if ( ( nRasterOperation & 0xf ) != ( nRasterOperation >> 4 ) )
-diff --git a/emfio/source/reader/wmfreader.cxx b/emfio/source/reader/wmfreader.cxx
-index 7a925e7..e20576c 100644
---- a/emfio/source/reader/wmfreader.cxx
-+++ b/emfio/source/reader/wmfreader.cxx
-@@ -244,7 +244,7 @@ namespace emfio
- mpInputStream->SetError( SVSTREAM_FILEFORMAT_ERROR );
- break;
- }
-- ScaleWinExt( (double)nXNum / nXDenom, (double)nYNum / nYDenom );
-+ ScaleWinExt( static_cast<double>(nXNum) / nXDenom, static_cast<double>(nYNum) / nYDenom );
- }
- break;
-
-@@ -269,7 +269,7 @@ namespace emfio
- mpInputStream->SetError( SVSTREAM_FILEFORMAT_ERROR );
- break;
- }
-- ScaleDevExt( (double)nXNum / nXDenom, (double)nYNum / nYDenom );
-+ ScaleDevExt( static_cast<double>(nXNum) / nXDenom, static_cast<double>(nYNum) / nYDenom );
- }
- break;
-
-@@ -796,7 +796,7 @@ namespace emfio
- nCount++;
- pBmp.reset();
- }
-- Color aColor( (sal_uInt8)( nRed / nCount ), (sal_uInt8)( nGreen / nCount ), (sal_uInt8)( nBlue / nCount ) );
-+ Color aColor( static_cast<sal_uInt8>( nRed / nCount ), static_cast<sal_uInt8>( nGreen / nCount ), static_cast<sal_uInt8>( nBlue / nCount ) );
- CreateObject(o3tl::make_unique<WinMtfFillStyle>( aColor, false ));
- }
- break;
-@@ -1107,7 +1107,7 @@ namespace emfio
- }
- }
- }
-- else if ( (nNewMagic == static_cast< sal_uInt32 >(0x43464D57)) && (nLen >= 34) && ( (sal_Int32)(nLen + 10) <= (sal_Int32)(mnRecSize * 2) ))
-+ else if ( (nNewMagic == static_cast< sal_uInt32 >(0x43464D57)) && (nLen >= 34) && ( static_cast<sal_Int32>(nLen + 10) <= static_cast<sal_Int32>(mnRecSize * 2) ))
- {
- sal_uInt32 nComType = 0, nVersion = 0, nFlags = 0, nComRecCount = 0,
- nCurRecSize = 0, nRemainingSize = 0, nEMFTotalSize = 0;
-@@ -1252,8 +1252,8 @@ namespace emfio
- {
- // #n417818#: If we have an external header then overwrite the bounds!
- tools::Rectangle aExtRect(0, 0,
-- (double)mpExternalHeader->xExt * 567 * mnUnitsPerInch / 1440000,
-- (double)mpExternalHeader->yExt * 567 * mnUnitsPerInch / 1440000);
-+ static_cast<double>(mpExternalHeader->xExt) * 567 * mnUnitsPerInch / 1440000,
-+ static_cast<double>(mpExternalHeader->yExt) * 567 * mnUnitsPerInch / 1440000);
- aPlaceableBound = aExtRect;
-
- SAL_INFO("vcl.wmf", "External header size "
---
-cgit v1.1
-
-From 769ad348b0008d2879333a29a5570e185a9b5937 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman at redhat.com>
-Date: Mon, 15 Jan 2018 09:05:51 +0100
-Subject: More loplugin:cstylecast: emfio
-
-Change-Id: I52e540bdd8ba0090dec752deb7b1fa5c67ae3c85
----
- emfio/source/reader/emfreader.cxx | 2 +-
- emfio/source/reader/wmfreader.cxx | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/emfio/source/reader/emfreader.cxx b/emfio/source/reader/emfreader.cxx
-index 8e9b6b5..d1873c7 100644
---- a/emfio/source/reader/emfreader.cxx
-+++ b/emfio/source/reader/emfreader.cxx
-@@ -823,7 +823,7 @@ namespace emfio
- case EMR_SETROP2 :
- {
- mpInputStream->ReadUInt32( nDat32 );
-- SetRasterOp( (WMFRasterOp)nDat32 );
-+ SetRasterOp( static_cast<WMFRasterOp>(nDat32) );
- }
- break;
-
-diff --git a/emfio/source/reader/wmfreader.cxx b/emfio/source/reader/wmfreader.cxx
-index 21f0bd2..5b4353f 100644
---- a/emfio/source/reader/wmfreader.cxx
-+++ b/emfio/source/reader/wmfreader.cxx
-@@ -203,7 +203,7 @@ namespace emfio
- {
- sal_uInt16 nROP2 = 0;
- mpInputStream->ReadUInt16( nROP2 );
-- SetRasterOp( (WMFRasterOp)nROP2 );
-+ SetRasterOp( static_cast<WMFRasterOp>(nROP2) );
- }
- break;
-
-@@ -986,7 +986,7 @@ namespace emfio
- WMFRasterOp nOldROP = WMFRasterOp::NONE;
- mpInputStream->ReadUInt32( nROP );
- Size aSize = ReadYXExt();
-- nOldROP = SetRasterOp( (WMFRasterOp)nROP );
-+ nOldROP = SetRasterOp( static_cast<WMFRasterOp>(nROP) );
- DrawRect( tools::Rectangle( ReadYX(), aSize ), false );
- SetRasterOp( nOldROP );
- }
---
-cgit v1.1
-
-
Copied: libreoffice-still/repos/extra-x86_64/emfio.patch (from rev 332508, libreoffice-still/trunk/emfio.patch)
===================================================================
--- emfio.patch (rev 0)
+++ emfio.patch 2018-08-18 19:37:11 UTC (rev 332509)
@@ -0,0 +1,292 @@
+From 126f10840b0e5930be57cb55262789e85bff9b21 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman at redhat.com>
+Date: Fri, 12 Jan 2018 20:24:43 +0100
+Subject: More loplugin:cstylecast: emfio
+
+auto-rewrite with <https://gerrit.libreoffice.org/#/c/47798/> "Enable
+loplugin:cstylecast for some more cases" plus
+solenv/clang-format/reformat-formatted-files
+
+Change-Id: Idffd3ef04b007f04b7022e54881254da9b2aa4a0
+---
+ emfio/qa/cppunit/emf/EmfImportTest.cxx | 6 +++---
+ emfio/source/reader/emfreader.cxx | 8 ++++----
+ emfio/source/reader/mtftools.cxx | 26 +++++++++++++-------------
+ emfio/source/reader/wmfreader.cxx | 12 ++++++------
+ 4 files changed, 26 insertions(+), 26 deletions(-)
+
+diff --git a/emfio/qa/cppunit/emf/EmfImportTest.cxx b/emfio/qa/cppunit/emf/EmfImportTest.cxx
+index bc14c4b..9611db6 100644
+--- a/emfio/qa/cppunit/emf/EmfImportTest.cxx
++++ b/emfio/qa/cppunit/emf/EmfImportTest.cxx
+@@ -88,7 +88,7 @@ void Test::checkRectPrimitive(Primitive2DSequence const & rPrimitive)
+ void Test::testWorking()
+ {
+ Primitive2DSequence aSequenceRect = parseEmf("/emfio/qa/cppunit/emf/data/fdo79679-2.emf");
+- CPPUNIT_ASSERT_EQUAL(1, (int) aSequenceRect.getLength());
++ CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(aSequenceRect.getLength()));
+ checkRectPrimitive(aSequenceRect);
+ }
+
+@@ -99,7 +99,7 @@ void Test::TestDrawString()
+
+ // first, get the sequence of primitives and dump it
+ Primitive2DSequence aSequence = parseEmf("/emfio/qa/cppunit/emf/data/TestDrawString.emf");
+- CPPUNIT_ASSERT_EQUAL(1, (int) aSequence.getLength());
++ CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(aSequence.getLength()));
+ Primitive2dXmlDump dumper;
+ xmlDocPtr pDocument = dumper.dumpAndParse(comphelper::sequenceToContainer<Primitive2DContainer>(aSequence));
+ CPPUNIT_ASSERT (pDocument);
+@@ -120,7 +120,7 @@ void Test::TestDrawLine()
+
+ // first, get the sequence of primitives and dump it
+ Primitive2DSequence aSequence = parseEmf("/emfio/qa/cppunit/emf/data/TestDrawLine.emf");
+- CPPUNIT_ASSERT_EQUAL(1, (int) aSequence.getLength());
++ CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(aSequence.getLength()));
+ Primitive2dXmlDump dumper;
+ xmlDocPtr pDocument = dumper.dumpAndParse(comphelper::sequenceToContainer<Primitive2DContainer>(aSequence));
+ CPPUNIT_ASSERT (pDocument);
+diff --git a/emfio/source/reader/emfreader.cxx b/emfio/source/reader/emfreader.cxx
+index 52e8661..ea557ea 100644
+--- a/emfio/source/reader/emfreader.cxx
++++ b/emfio/source/reader/emfreader.cxx
+@@ -590,7 +590,7 @@ namespace emfio
+ {
+ sal_uInt32 nPoints(0);
+ mpInputStream->ReadUInt32( nPoints );
+- aPoints[i] = (sal_uInt16)nPoints;
++ aPoints[i] = static_cast<sal_uInt16>(nPoints);
+ }
+ if ( mpInputStream->good() && ( nGesPoints * (sizeof(T)+sizeof(T)) ) <= ( nEndPos - mpInputStream->Tell() ) )
+ {
+@@ -681,7 +681,7 @@ namespace emfio
+
+ mpInputStream->ReadUInt32( nCommentId );
+
+- SAL_INFO ("emfio", "\t\tbegin " << (char)(nCommentId & 0xff) << (char)((nCommentId & 0xff00) >> 8) << (char)((nCommentId & 0xff0000) >> 16) << (char)((nCommentId & 0xff000000) >> 24) << " id: 0x" << std::hex << nCommentId << std::dec);
++ SAL_INFO ("emfio", "\t\tbegin " << static_cast<char>(nCommentId & 0xff) << static_cast<char>((nCommentId & 0xff00) >> 8) << static_cast<char>((nCommentId & 0xff0000) >> 16) << static_cast<char>((nCommentId & 0xff000000) >> 24) << " id: 0x" << std::hex << nCommentId << std::dec);
+
+ if( nCommentId == EMR_COMMENT_EMFPLUS && nRecSize >= 12 )
+ {
+@@ -761,7 +761,7 @@ namespace emfio
+ {
+ mpInputStream->ReadUInt32( nNom1 ).ReadUInt32( nDen1 ).ReadUInt32( nNom2 ).ReadUInt32( nDen2 );
+ if (nDen1 != 0 && nDen2 != 0)
+- ScaleWinExt( (double)nNom1 / nDen1, (double)nNom2 / nDen2 );
++ ScaleWinExt( static_cast<double>(nNom1) / nDen1, static_cast<double>(nNom2) / nDen2 );
+ else
+ SAL_WARN("vcl.emf", "ignoring bogus divide by zero");
+ }
+@@ -778,7 +778,7 @@ namespace emfio
+ {
+ mpInputStream->ReadUInt32( nNom1 ).ReadUInt32( nDen1 ).ReadUInt32( nNom2 ).ReadUInt32( nDen2 );
+ if (nDen1 != 0 && nDen2 != 0)
+- ScaleDevExt( (double)nNom1 / nDen1, (double)nNom2 / nDen2 );
++ ScaleDevExt( static_cast<double>(nNom1) / nDen1, static_cast<double>(nNom2) / nDen2 );
+ else
+ SAL_WARN("vcl.emf", "ignoring bogus divide by zero");
+ }
+diff --git a/emfio/source/reader/mtftools.cxx b/emfio/source/reader/mtftools.cxx
+index 55fd4dd..e3bbb5f 100644
+--- a/emfio/source/reader/mtftools.cxx
++++ b/emfio/source/reader/mtftools.cxx
+@@ -272,7 +272,7 @@ namespace emfio
+ if( rFont.lfStrikeOut )
+ aFont.SetStrikeout( STRIKEOUT_SINGLE );
+
+- aFont.SetOrientation( (short)rFont.lfEscapement );
++ aFont.SetOrientation( static_cast<short>(rFont.lfEscapement) );
+
+ Size aFontSize( Size( rFont.lfWidth, rFont.lfHeight ) );
+ if ( rFont.lfHeight > 0 )
+@@ -287,8 +287,8 @@ namespace emfio
+ long nHeight = aMetric.GetAscent() + aMetric.GetDescent();
+ if (nHeight)
+ {
+- double fHeight = ((double)aFontSize.Height() * rFont.lfHeight ) / nHeight;
+- aFontSize.Height() = (sal_Int32)( fHeight + 0.5 );
++ double fHeight = (static_cast<double>(aFontSize.Height()) * rFont.lfHeight ) / nHeight;
++ aFontSize.Height() = static_cast<sal_Int32>( fHeight + 0.5 );
+ }
+ }
+
+@@ -303,7 +303,7 @@ namespace emfio
+ sal_uInt32 nColor;
+
+ mpInputStream->ReadUInt32( nColor );
+- return Color( (sal_uInt8)nColor, (sal_uInt8)( nColor >> 8 ), (sal_uInt8)( nColor >> 16 ) );
++ return Color( static_cast<sal_uInt8>(nColor), static_cast<sal_uInt8>( nColor >> 8 ), static_cast<sal_uInt8>( nColor >> 16 ) );
+ };
+
+ Point MtfTools::ImplScale(const Point& rPoint) // Hack to set varying defaults for incompletely defined files.
+@@ -394,8 +394,8 @@ namespace emfio
+ fY2 *= mnDevHeight;
+ fX2 += mnDevOrgX;
+ fY2 += mnDevOrgY; // fX2, fY2 now in device units
+- fX2 *= (double)mnMillX * 100.0 / (double)mnPixX;
+- fY2 *= (double)mnMillY * 100.0 / (double)mnPixY;
++ fX2 *= static_cast<double>(mnMillX) * 100.0 / static_cast<double>(mnPixX);
++ fY2 *= static_cast<double>(mnMillY) * 100.0 / static_cast<double>(mnPixY);
+ }
+ }
+ break;
+@@ -482,8 +482,8 @@ namespace emfio
+ fHeight /= mnWinExtY;
+ fWidth *= mnDevWidth;
+ fHeight *= mnDevHeight;
+- fWidth *= (double)mnMillX * 100.0 / (double)mnPixX;
+- fHeight *= (double)mnMillY * 100.0 / (double)mnPixY;
++ fWidth *= static_cast<double>(mnMillX) * 100.0 / static_cast<double>(mnPixX);
++ fHeight *= static_cast<double>(mnMillY) * 100.0 / static_cast<double>(mnPixY);
+ }
+ }
+ break;
+@@ -558,7 +558,7 @@ namespace emfio
+ {
+ if ( nIndex & ENHMETA_STOCK_OBJECT )
+ {
+- sal_uInt16 nStockId = (sal_uInt8)nIndex;
++ sal_uInt16 nStockId = static_cast<sal_uInt8>(nIndex);
+ switch( nStockId )
+ {
+ case WHITE_BRUSH :
+@@ -617,7 +617,7 @@ namespace emfio
+
+ GDIObj *pGDIObj = nullptr;
+
+- if ( (sal_uInt32)nIndex < mvGDIObj.size() )
++ if ( static_cast<sal_uInt32>(nIndex) < mvGDIObj.size() )
+ pGDIObj = mvGDIObj[ nIndex ].get();
+
+ if ( pGDIObj )
+@@ -760,7 +760,7 @@ namespace emfio
+ }
+ }
+ }
+- if ( (sal_uInt32)nIndex >= mvGDIObj.size() )
++ if ( static_cast<sal_uInt32>(nIndex) >= mvGDIObj.size() )
+ ImplResizeObjectArry( nIndex + 16 );
+
+ mvGDIObj[ nIndex ] = std::move(pObject);
+@@ -776,7 +776,7 @@ namespace emfio
+ {
+ if ( ( nIndex & ENHMETA_STOCK_OBJECT ) == 0 )
+ {
+- if ( (sal_uInt32)nIndex < mvGDIObj.size() )
++ if ( static_cast<sal_uInt32>(nIndex) < mvGDIObj.size() )
+ {
+ mvGDIObj[ nIndex ].reset();
+ }
+@@ -1738,7 +1738,7 @@ namespace emfio
+ pSave = rSaveList[i].get();
+
+ sal_uInt32 nWinRop = pSave->nWinRop;
+- sal_uInt8 nRasterOperation = (sal_uInt8)( nWinRop >> 16 );
++ sal_uInt8 nRasterOperation = static_cast<sal_uInt8>( nWinRop >> 16 );
+
+ sal_uInt32 nUsed = 0;
+ if ( ( nRasterOperation & 0xf ) != ( nRasterOperation >> 4 ) )
+diff --git a/emfio/source/reader/wmfreader.cxx b/emfio/source/reader/wmfreader.cxx
+index 7a925e7..e20576c 100644
+--- a/emfio/source/reader/wmfreader.cxx
++++ b/emfio/source/reader/wmfreader.cxx
+@@ -244,7 +244,7 @@ namespace emfio
+ mpInputStream->SetError( SVSTREAM_FILEFORMAT_ERROR );
+ break;
+ }
+- ScaleWinExt( (double)nXNum / nXDenom, (double)nYNum / nYDenom );
++ ScaleWinExt( static_cast<double>(nXNum) / nXDenom, static_cast<double>(nYNum) / nYDenom );
+ }
+ break;
+
+@@ -269,7 +269,7 @@ namespace emfio
+ mpInputStream->SetError( SVSTREAM_FILEFORMAT_ERROR );
+ break;
+ }
+- ScaleDevExt( (double)nXNum / nXDenom, (double)nYNum / nYDenom );
++ ScaleDevExt( static_cast<double>(nXNum) / nXDenom, static_cast<double>(nYNum) / nYDenom );
+ }
+ break;
+
+@@ -796,7 +796,7 @@ namespace emfio
+ nCount++;
+ pBmp.reset();
+ }
+- Color aColor( (sal_uInt8)( nRed / nCount ), (sal_uInt8)( nGreen / nCount ), (sal_uInt8)( nBlue / nCount ) );
++ Color aColor( static_cast<sal_uInt8>( nRed / nCount ), static_cast<sal_uInt8>( nGreen / nCount ), static_cast<sal_uInt8>( nBlue / nCount ) );
+ CreateObject(o3tl::make_unique<WinMtfFillStyle>( aColor, false ));
+ }
+ break;
+@@ -1107,7 +1107,7 @@ namespace emfio
+ }
+ }
+ }
+- else if ( (nNewMagic == static_cast< sal_uInt32 >(0x43464D57)) && (nLen >= 34) && ( (sal_Int32)(nLen + 10) <= (sal_Int32)(mnRecSize * 2) ))
++ else if ( (nNewMagic == static_cast< sal_uInt32 >(0x43464D57)) && (nLen >= 34) && ( static_cast<sal_Int32>(nLen + 10) <= static_cast<sal_Int32>(mnRecSize * 2) ))
+ {
+ sal_uInt32 nComType = 0, nVersion = 0, nFlags = 0, nComRecCount = 0,
+ nCurRecSize = 0, nRemainingSize = 0, nEMFTotalSize = 0;
+@@ -1252,8 +1252,8 @@ namespace emfio
+ {
+ // #n417818#: If we have an external header then overwrite the bounds!
+ tools::Rectangle aExtRect(0, 0,
+- (double)mpExternalHeader->xExt * 567 * mnUnitsPerInch / 1440000,
+- (double)mpExternalHeader->yExt * 567 * mnUnitsPerInch / 1440000);
++ static_cast<double>(mpExternalHeader->xExt) * 567 * mnUnitsPerInch / 1440000,
++ static_cast<double>(mpExternalHeader->yExt) * 567 * mnUnitsPerInch / 1440000);
+ aPlaceableBound = aExtRect;
+
+ SAL_INFO("vcl.wmf", "External header size "
+--
+cgit v1.1
+
+From 769ad348b0008d2879333a29a5570e185a9b5937 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman at redhat.com>
+Date: Mon, 15 Jan 2018 09:05:51 +0100
+Subject: More loplugin:cstylecast: emfio
+
+Change-Id: I52e540bdd8ba0090dec752deb7b1fa5c67ae3c85
+---
+ emfio/source/reader/emfreader.cxx | 2 +-
+ emfio/source/reader/wmfreader.cxx | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/emfio/source/reader/emfreader.cxx b/emfio/source/reader/emfreader.cxx
+index 8e9b6b5..d1873c7 100644
+--- a/emfio/source/reader/emfreader.cxx
++++ b/emfio/source/reader/emfreader.cxx
+@@ -823,7 +823,7 @@ namespace emfio
+ case EMR_SETROP2 :
+ {
+ mpInputStream->ReadUInt32( nDat32 );
+- SetRasterOp( (WMFRasterOp)nDat32 );
++ SetRasterOp( static_cast<WMFRasterOp>(nDat32) );
+ }
+ break;
+
+diff --git a/emfio/source/reader/wmfreader.cxx b/emfio/source/reader/wmfreader.cxx
+index 21f0bd2..5b4353f 100644
+--- a/emfio/source/reader/wmfreader.cxx
++++ b/emfio/source/reader/wmfreader.cxx
+@@ -203,7 +203,7 @@ namespace emfio
+ {
+ sal_uInt16 nROP2 = 0;
+ mpInputStream->ReadUInt16( nROP2 );
+- SetRasterOp( (WMFRasterOp)nROP2 );
++ SetRasterOp( static_cast<WMFRasterOp>(nROP2) );
+ }
+ break;
+
+@@ -986,7 +986,7 @@ namespace emfio
+ WMFRasterOp nOldROP = WMFRasterOp::NONE;
+ mpInputStream->ReadUInt32( nROP );
+ Size aSize = ReadYXExt();
+- nOldROP = SetRasterOp( (WMFRasterOp)nROP );
++ nOldROP = SetRasterOp( static_cast<WMFRasterOp>(nROP) );
+ DrawRect( tools::Rectangle( ReadYX(), aSize ), false );
+ SetRasterOp( nOldROP );
+ }
+--
+cgit v1.1
+
+
Deleted: libreoffice-still.csh
===================================================================
--- libreoffice-still.csh 2018-08-18 19:36:52 UTC (rev 332508)
+++ libreoffice-still.csh 2018-08-18 19:37:11 UTC (rev 332509)
@@ -1,6 +0,0 @@
-# to force a certain look'n feel
-
-#setenv SAL_USE_VCLPLUGIN gen
-#setenv SAL_USE_VCLPLUGIN kde4
-#setenv SAL_USE_VCLPLUGIN gtk
-#setenv SAL_USE_VCLPLUGIN gtk3
Copied: libreoffice-still/repos/extra-x86_64/libreoffice-still.csh (from rev 332508, libreoffice-still/trunk/libreoffice-still.csh)
===================================================================
--- libreoffice-still.csh (rev 0)
+++ libreoffice-still.csh 2018-08-18 19:37:11 UTC (rev 332509)
@@ -0,0 +1,5 @@
+# to force a certain look'n feel
+
+#setenv SAL_USE_VCLPLUGIN gen
+#setenv SAL_USE_VCLPLUGIN gtk
+#setenv SAL_USE_VCLPLUGIN gtk3
Deleted: libreoffice-still.sh
===================================================================
--- libreoffice-still.sh 2018-08-18 19:36:52 UTC (rev 332508)
+++ libreoffice-still.sh 2018-08-18 19:37:11 UTC (rev 332509)
@@ -1,6 +0,0 @@
-# to force a certain look'n feel
-
-#export SAL_USE_VCLPLUGIN=gen
-#export SAL_USE_VCLPLUGIN=kde4
-#export SAL_USE_VCLPLUGIN=gtk
-#export SAL_USE_VCLPLUGIN=gtk3
Copied: libreoffice-still/repos/extra-x86_64/libreoffice-still.sh (from rev 332508, libreoffice-still/trunk/libreoffice-still.sh)
===================================================================
--- libreoffice-still.sh (rev 0)
+++ libreoffice-still.sh 2018-08-18 19:37:11 UTC (rev 332509)
@@ -0,0 +1,5 @@
+# to force a certain look'n feel
+
+#export SAL_USE_VCLPLUGIN=gen
+#export SAL_USE_VCLPLUGIN=gtk
+#export SAL_USE_VCLPLUGIN=gtk3
Deleted: make-pyuno-work-with-system-wide-module-install.diff
===================================================================
--- make-pyuno-work-with-system-wide-module-install.diff 2018-08-18 19:36:52 UTC (rev 332508)
+++ make-pyuno-work-with-system-wide-module-install.diff 2018-08-18 19:37:11 UTC (rev 332509)
@@ -1,18 +0,0 @@
---- 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/extra-x86_64/make-pyuno-work-with-system-wide-module-install.diff (from rev 332508, libreoffice-still/trunk/make-pyuno-work-with-system-wide-module-install.diff)
===================================================================
--- make-pyuno-work-with-system-wide-module-install.diff (rev 0)
+++ make-pyuno-work-with-system-wide-module-install.diff 2018-08-18 19:37:11 UTC (rev 332509)
@@ -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
+
Deleted: pyuno-python37.patch
===================================================================
--- pyuno-python37.patch 2018-08-18 19:36:52 UTC (rev 332508)
+++ pyuno-python37.patch 2018-08-18 19:37:11 UTC (rev 332509)
@@ -1,54 +0,0 @@
-From 76a29148be63cb006a7e25e312dc93acc93e071f Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman at redhat.com>
-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 <sbergman at redhat.com>
----
- 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);
Copied: libreoffice-still/repos/extra-x86_64/pyuno-python37.patch (from rev 332508, libreoffice-still/trunk/pyuno-python37.patch)
===================================================================
--- pyuno-python37.patch (rev 0)
+++ pyuno-python37.patch 2018-08-18 19:37:11 UTC (rev 332509)
@@ -0,0 +1,54 @@
+From 76a29148be63cb006a7e25e312dc93acc93e071f Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman at redhat.com>
+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 <sbergman at redhat.com>
+---
+ 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);
More information about the arch-commits
mailing list