diff --git a/extra/libreoffice-still/PKGBUILD b/extra/libreoffice-still/PKGBUILD index d01f37083..11507043f 100644 --- a/extra/libreoffice-still/PKGBUILD +++ b/extra/libreoffice-still/PKGBUILD @@ -19,27 +19,28 @@ _google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4 pkgbase=libreoffice-still pkgname=('libreoffice-still-sdk' 'libreoffice-still') -_LOver=5.4.7.2 -pkgver=5.4.7 -pkgrel=3 +_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' + '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=8' 'postgresql-libs' 'libgl' + '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' - 'libexttextcat' 'libcmis' 'gobject-introspection' - 'libtommath' 'libzmf' 'gpgme' 'xmlsec' 'rxvt-unicode' - 'libfreehand' 'libstaroffice') + '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="http://mirror.sjc02.svwh.net/tdf/libreoffice/src/${pkgver}" #_mirror="https://download.documentfoundation.org/libreoffice/src/${pkgver}" @@ -47,78 +48,64 @@ _mirror="http://mirror.sjc02.svwh.net/tdf/libreoffice/src/${pkgver}" _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_63_0.tar.bz2 + ${_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-2015-08-04.tar.bz2 - ${_additional_source_url}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 - ${_additional_source_url}/OpenCOLLADA-master-6509aa13af.tar.bz2 + ${_additional_source_url}/language-subtag-registry-2017-08-15.tar.bz2 ${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip - ${_additional_source_url}/libgltf/libgltf-0.1.0.tar.gz - ${_additional_source_url}/1901302aaff1c1633ef81862663d2917-icu4c-58_1-src.tgz + ${_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-3064.tar.bz2 - ${_additional_source_url}/liborcus-0.12.1.tar.gz - ${_additional_source_url}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip + ${_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}/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar # for test suite ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll make-pyuno-work-with-system-wide-module-install.diff - pyuno-python37.patch - poppler-0.62.patch - poppler-0.64.patch + emfio.patch libreoffice-still.sh libreoffice-still.csh) -noextract=(boost_1_63_0.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-2015-08-04.tar.bz2 - 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 - OpenCOLLADA-master-6509aa13af.tar.bz2 - 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip - libgltf-0.1.0.tar.gz - d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip - ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip - Firebird-3.0.0.32483-0.tar.bz2 - pdfium-3064.tar.bz2 - liborcus-0.12.1.tar.gz - bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip - 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar - odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar - 1901302aaff1c1633ef81862663d2917-icu4c-58_1-src.tgz - 185d60944ea767075d27247c3162b3bc-unowinreg.dll) +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) -sha256sums=('db81b4d32fb313d96e68019db44aa2d75ede82cb7d495274ec1c7271a1253a69' +sha256sums=('f1666430abf616a3813e4c886b51f157366f592102ae0e874abc17f3d58c6a8e' 'SKIP' - '74c54f950dfd3272bf6cf768a2495e1e0b2de68e0321f34c58f3f28a2a81de45' + '7e49f0dc0e7fd8e2628939833063d60e6c92bdec019226037446595c87eee85e' 'SKIP' - 'd3b3ec06e3e1fce397abb99caa6bdc279dc7474cbf29ceb0bf6ddea117ae3d16' + 'ab55fcc7e6103e541288a369236c5fe2c7b6c3f7d86b2b62b198f7977ca92742' 'SKIP' - 'beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0' + '9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81' '64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1' '1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753' '75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870' '983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776' - 'cfd066b327c2308b3d019f0fe124c02d9acfafdd4aa2af0feadb6e0384027cf9' - 'b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb' - '8f25d429237cde289a448c82a0a830791354ccce5ee40d77535642e46367d6c4' + 'd6a97fc8da5ae54d867e7f1b65ffb51e816cadd11714e45fc23ee0abf81a51ab' 'd30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370' - '119e730fbf002dd0eaafa4930167267d7d910aa17f29979ca9ca8b66625fd2da' - '0eb46ba3746a9c2092c8ad347a29b1a1b4941144772d13a88667a7b11ea30309' + '1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133' + '233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd' '6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860' - 'ded806dc9e2a4005d8c0a6b7fcb232ab36221d72d9ff5b815e8244987299d883' - '676b1fedd721f64489650f5e76d7f98b750439914d87cae505b8163d08447908' + '7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f' 'd0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a' 'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770' '702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769' 'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6' 'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563' - '5d874bfa2ef7340615dfd34dc17e9e72bfc8587dce7864b949cfcde7fcbabb52' - '344f88086b947d53550ef5492e4d61b1e1594067a34c6c4d8ae801ddd0a2fadb' - '944064e8f8fa18beeb348468348d910d365d8a3e36ddb76076a368bd9bd6f894' + '8b4815788be087940750b775690b5890c4cf9e121f11006a72ccab834f212abb' '76f62957d0058092b11316357d9d716a62b48a53e5277426ffa87429ab5510e4' 'd24cfcb556ae1db02087c49012bbc4621f9ef7e3465ca832e1410326d260f283') @@ -135,25 +122,26 @@ prepare() { # 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 - # upstream fix to build with poppler 0.62 and later - patch -Np0 -i ${srcdir}/poppler-0.62.patch - - # fix build with poppler 0.64 - patch -Np1 -i ${srcdir}/poppler-0.64.patch - # fix not upstreamable pyuno paths - FS#54250 patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff - # const fixes for Python 3.7 - patch -Np1 -i ${srcdir}/pyuno-python37.patch - #use the CFLAGS but remove the LibO overridden ones for i in $CFLAGS; do case "$i" in @@ -168,7 +156,10 @@ build() { # 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 \ @@ -206,7 +197,7 @@ build() { --with-system-libcmis \ --with-system-libmspub \ --with-system-libexttextcat \ - --without-system-orcus \ + --with-system-orcus \ --with-system-liblangtag \ --with-system-libodfgen \ --with-system-libmwaw \ @@ -218,7 +209,6 @@ build() { --with-system-libebook \ --with-system-libabw \ --with-system-coinmp \ - --without-system-libgltf \ --with-system-dicts \ --with-external-dict-dir=/usr/share/hunspell \ --with-external-hyph-dir=/usr/share/hyphen \ @@ -237,7 +227,7 @@ build() { --with-jdk-home="/usr/lib/jvm/default" \ --with-ant-home="/usr/share/apache-ant"\ --without-system-boost\ - --without-system-icu \ + --with-system-icu \ --with-system-cairo \ --with-system-libs \ --with-system-mythes \ @@ -250,13 +240,7 @@ build() { --disable-dependency-tracking touch src.downloaded - - make build-nocheck || { - # https://ssl.icu-project.org/trac/ticket/13329 - sed -i 's/xlocale/locale/' \ - workdir/UnpackedTarball/icu/source/i18n/digitlst.cpp - make build-nocheck - } + make build-nocheck mkdir ${srcdir}/fakeinstall make DESTDIR=${srcdir}/fakeinstall distro-pack-install @@ -299,14 +283,14 @@ 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' + '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' + 'liblangtag' 'libexttextcat' 'libcmis' 'liborcus' # 'libfbclient' 'libtommath' 'libzmf' 'libatomic_ops' 'xmlsec' - 'libfreehand' 'libstaroffice' 'libepoxy') + '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' @@ -347,7 +331,7 @@ package_libreoffice-still() { # allow to preset desired VLC install -dm755 ${pkgdir}/etc/profile.d - install -m755 ${srcdir}/libreoffice-still.{sh,csh} ${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 @@ -355,11 +339,11 @@ package_libreoffice-still() { ${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 + ${pkgdir}/usr/lib/liblibreofficekitgtk.so # cleanup rm -rf ${pkgdir}/usr/share/libreoffice/sdk diff --git a/extra/libreoffice-still/emfio.patch b/extra/libreoffice-still/emfio.patch new file mode 100644 index 000000000..87dbde1f3 --- /dev/null +++ b/extra/libreoffice-still/emfio.patch @@ -0,0 +1,292 @@ +From 126f10840b0e5930be57cb55262789e85bff9b21 Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann +Date: Fri, 12 Jan 2018 20:24:43 +0100 +Subject: More loplugin:cstylecast: emfio + +auto-rewrite with "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(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(aSequence.getLength())); + Primitive2dXmlDump dumper; + xmlDocPtr pDocument = dumper.dumpAndParse(comphelper::sequenceToContainer(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(aSequence.getLength())); + Primitive2dXmlDump dumper; + xmlDocPtr pDocument = dumper.dumpAndParse(comphelper::sequenceToContainer(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(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(nCommentId & 0xff) << static_cast((nCommentId & 0xff00) >> 8) << static_cast((nCommentId & 0xff0000) >> 16) << static_cast((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(nNom1) / nDen1, static_cast(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(nNom1) / nDen1, static_cast(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(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(aFontSize.Height()) * rFont.lfHeight ) / nHeight; ++ aFontSize.Height() = static_cast( 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(nColor), static_cast( nColor >> 8 ), static_cast( 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(mnMillX) * 100.0 / static_cast(mnPixX); ++ fY2 *= static_cast(mnMillY) * 100.0 / static_cast(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(mnMillX) * 100.0 / static_cast(mnPixX); ++ fHeight *= static_cast(mnMillY) * 100.0 / static_cast(mnPixY); + } + } + break; +@@ -558,7 +558,7 @@ namespace emfio + { + if ( nIndex & ENHMETA_STOCK_OBJECT ) + { +- sal_uInt16 nStockId = (sal_uInt8)nIndex; ++ sal_uInt16 nStockId = static_cast(nIndex); + switch( nStockId ) + { + case WHITE_BRUSH : +@@ -617,7 +617,7 @@ namespace emfio + + GDIObj *pGDIObj = nullptr; + +- if ( (sal_uInt32)nIndex < mvGDIObj.size() ) ++ if ( static_cast(nIndex) < mvGDIObj.size() ) + pGDIObj = mvGDIObj[ nIndex ].get(); + + if ( pGDIObj ) +@@ -760,7 +760,7 @@ namespace emfio + } + } + } +- if ( (sal_uInt32)nIndex >= mvGDIObj.size() ) ++ if ( static_cast(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(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( 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(nXNum) / nXDenom, static_cast(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(nXNum) / nXDenom, static_cast(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( nRed / nCount ), static_cast( nGreen / nCount ), static_cast( nBlue / nCount ) ); + CreateObject(o3tl::make_unique( 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(nLen + 10) <= static_cast(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(mpExternalHeader->xExt) * 567 * mnUnitsPerInch / 1440000, ++ static_cast(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 +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(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(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(nROP) ); + DrawRect( tools::Rectangle( ReadYX(), aSize ), false ); + SetRasterOp( nOldROP ); + } +-- +cgit v1.1 + + diff --git a/extra/libreoffice-still/poppler-0.62.patch b/extra/libreoffice-still/poppler-0.62.patch deleted file mode 100644 index 5dfced18d..000000000 --- a/extra/libreoffice-still/poppler-0.62.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2018-01-30 18:22:07.000000000 +0100 -+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.new 2018-03-20 11:38:16.558290319 +0100 -@@ -32,10 +32,12 @@ - #pragma warning(push, 1) - #endif - --// sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1 -+// sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1, then renamed to UnicodeMapFuncs.h in 0.62.0 - // FIXME: we can't use #if POPPLER_CHECK_VERSION(0, 21, 0) && !POPPLER_CHECK_VERSION(0, 21, 1) - // because the internal poppler does not provide poppler-version.h and the macro always returns 0 --#if POPPLER_CHECK_VERSION(0, 21, 1) -+#if POPPLER_CHECK_VERSION(0, 62, 0) -+#include -+#elif POPPLER_CHECK_VERSION(0, 21, 1) - #include "UTF8.h" - #elif POPPLER_CHECK_VERSION(0, 21, 0) - #include "UTF.h" -@@ -918,7 +920,11 @@ - ); - - // silence spurious warning -+#if POPPLER_CHECK_VERSION(0, 62, 0) -+ (void)&mapUTF16; -+#else - (void)&mapUCS2; -+#endif - - char buf[9]; - for( int i=0; i -Date: Tue, 24 Apr 2018 15:56:23 +0200 -Subject: [PATCH] fix build with poppler 0.64 - -GooString became const... - -Change-Id: Icc95be2e8603a4e22c6a9ac2008986bacd0bfba5 ---- - sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 10 ++++++++++ - sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 4 ++++ - 2 files changed, 14 insertions(+) - -diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -index 48a735ba54a5..06e4faead383 100644 ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -@@ -432,6 +432,9 @@ int PDFOutDev::parseFont( long long nNewId, GfxFont* gfxFont, GfxState* state ) - FontAttributes aNewFont; - int nSize = 0; - -+#if POPPLER_CHECK_VERSION(0, 64, 0) -+ const -+#endif - GooString* pFamily = gfxFont->getName(); - if( pFamily ) - { -@@ -728,6 +731,9 @@ void PDFOutDev::updateFont(GfxState *state) - FontAttributes aFont; - int nEmbedSize=0; - -+#if POPPLER_CHECK_VERSION(0, 64, 0) -+ const -+#endif - Ref* pID = gfxFont->getID(); - // TODO(Q3): Portability problem - long long fontID = static_cast(pID->gen) << 32 | static_cast(pID->num); -@@ -918,7 +924,11 @@ void PDFOutDev::drawChar(GfxState *state, double x, double y, - printf( "\n" ); - } - -+#if POPPLER_CHECK_VERSION(0, 64, 0) -+void PDFOutDev::drawString(GfxState*, const GooString* /*s*/) -+#else - void PDFOutDev::drawString(GfxState*, GooString* /*s*/) -+#endif - { - // TODO(F3): NYI - } -diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -index c3367aa6ddf2..7e65f085d288 100644 ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -@@ -224,7 +224,11 @@ namespace pdfi - double dx, double dy, - double originX, double originY, - CharCode code, int nBytes, Unicode *u, int uLen) override; -+#if POPPLER_CHECK_VERSION(0, 64, 0) -+ virtual void drawString(GfxState *state, const GooString *s) override; -+#else - virtual void drawString(GfxState *state, GooString *s) override; -+#endif - virtual void endTextObject(GfxState *state) override; - - //----- image drawing