[arch-commits] Commit in libreoffice-fresh/trunk (2 files)
Date: Sunday, March 1, 2020 @ 09:49:59 Author: arojas Revision: 376445 Fix build with poppler 0.86 Added: libreoffice-fresh/trunk/libreoffice-poppler-0.86.patch Modified: libreoffice-fresh/trunk/PKGBUILD + PKGBUILD |8 ++-- libreoffice-poppler-0.86.patch | 15 +++ 2 files changed, 21 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-03-01 09:21:26 UTC (rev 376444) +++ PKGBUILD2020-03-01 09:49:59 UTC (rev 376445) @@ -57,7 +57,8 @@ ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll make-pyuno-work-with-system-wide-module-install.diff soffice-template.desktop.in - libreoffice-fresh.sh libreoffice-fresh.csh) + libreoffice-fresh.sh libreoffice-fresh.csh +libreoffice-poppler-0.86.patch) noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip @@ -101,12 +102,15 @@ 'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563' 'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879' 'cd1b25ff390e436c6bffa65c6e12382236e3ccbf8d3aae51b1b59bcaed79fd8a' -'de20f36d45f0fecc2d94176dd3ec7226ab07fa8ffb9b0bc73c200349a9273de1') +'de20f36d45f0fecc2d94176dd3ec7226ab07fa8ffb9b0bc73c200349a9273de1' +'f52ef5d64d7a74ca90bc96614260566720130d91f3764874eac673f6b3336b5e') prepare() { cd libreoffice-$_LOver +patch -p1 -i ../libreoffice-poppler-0.86.patch # Fix build with poppler 0.86 + # move external sources into place mkdir "${srcdir}"/ext_sources && pushd "${srcdir}"/ext_sources for source in "${noextract[@]}"; do Added: libreoffice-poppler-0.86.patch === --- libreoffice-poppler-0.86.patch (rev 0) +++ libreoffice-poppler-0.86.patch 2020-03-01 09:49:59 UTC (rev 376445) @@ -0,0 +1,15 @@ +diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +index e9c2a407c279..16ad04bf660a 100644 +--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +@@ -563,7 +563,9 @@ void PDFOutDev::processLink(Link* link, Catalog*) + if (!(pAction && pAction->getKind() == actionURI)) + return; + +-#if POPPLER_CHECK_VERSION(0, 72, 0) ++#if POPPLER_CHECK_VERSION(0, 86, 0) ++const char* pURI = static_cast(pAction)->getURI().c_str(); ++#elif POPPLER_CHECK_VERSION(0, 72, 0) + const char* pURI = static_cast(pAction)->getURI()->c_str(); + #else + const char* pURI = static_cast(pAction)->getURI()->getCString();
[arch-commits] Commit in libreoffice-fresh/trunk (2 files)
Date: Wednesday, December 11, 2019 @ 21:51:37 Author: andyrtr Revision: 370688 upgpkg: libreoffice-fresh 6.3.3-2: add kde filemanager templates - FS#61662 Added: libreoffice-fresh/trunk/soffice-template.desktop.in Modified: libreoffice-fresh/trunk/PKGBUILD -+ PKGBUILD| 30 +- soffice-template.desktop.in |7 +++ 2 files changed, 36 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-12-11 21:11:07 UTC (rev 370687) +++ PKGBUILD2019-12-11 21:51:37 UTC (rev 370688) @@ -12,7 +12,7 @@ pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh') _LOver=6.3.3.2 pkgver=6.3.3 -pkgrel=1 +pkgrel=2 arch=('x86_64') license=('LGPL3') url="https://www.libreoffice.org/"; @@ -54,6 +54,7 @@ ${_additional_source_url2}/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll make-pyuno-work-with-system-wide-module-install.diff + soffice-template.desktop.in libreoffice-fresh.sh libreoffice-fresh.csh libreoffice-poppler-0.82.patch::"https://github.com/LibreOffice/core/commit/2eadd46a.patch";) noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip @@ -95,6 +96,7 @@ '884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc' 'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6' 'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563' +'d0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879' 'c1e199f7767a4f42d9a95fc942cda4cf47737c7d67e6f334679c9b2e3e271dc2' '07c28ff8f5258abfe4338efccbdfb1dd35892bd00a2ed7f53b1fc2263f71a8b6' 'd649a07b38af95e9012633e71829fef3001e8a5830544ce7e91856df27f69c4b') @@ -335,6 +337,32 @@ install -v -m644 "${srcdir}"/libreoffice-$_LOver/sysui/desktop/appstream-appdata/*.xml \ "${pkgdir}"/usr/share/metainfo + # add kde filemanager templates; FS#61662 - file taken from Debian + install -dm755 "${pkgdir}"/usr/share/templates/.source + install -v -m644 "${srcdir}"/libreoffice-$_LOver/extras/source/shellnew/soffice.* \ + "${pkgdir}"/usr/share/templates/.source + + cat "${srcdir}"/soffice-template.desktop.in \ +| sed -e "s/@APP@/Writer/" \ +| sed -e "s/@EXT@/odt/" \ +| sed -e "s/@TYPE@/text/" \ +> "${pkgdir}"/usr/share/templates/soffice.odt.desktop +cat "${srcdir}"/soffice-template.desktop.in \ +| sed -e "s/@APP@/Calc/" \ +| sed -e "s/@EXT@/ods/" \ +| sed -e "s/@TYPE@/spreadsheet/" \ +> "${pkgdir}"/usr/share/templates/soffice.ods.desktop +cat "${srcdir}"/soffice-template.desktop.in \ +| sed -e "s/@APP@/Impress/" \ +| sed -e "s/@EXT@/odp/" \ +| sed -e "s/@TYPE@/presentation/" \ +> "${pkgdir}"/usr/share/templates/soffice.odp.desktop +cat "${srcdir}"/soffice-template.desktop.in \ +| sed -e "s/@APP@/Draw/" \ +| sed -e "s/@EXT@/odg/" \ +| sed -e "s/@TYPE@/drawing/" \ +> "${pkgdir}"/usr/share/templates/soffice.odg.desktop + # make all i18n lang packages with help section ('1') available to # fix "F1" not opening translated offline help opening in browser # see also /usr/lib/libreoffice/help/en-US/langnames.js Added: soffice-template.desktop.in === --- soffice-template.desktop.in (rev 0) +++ soffice-template.desktop.in 2019-12-11 21:51:37 UTC (rev 370688) @@ -0,0 +1,7 @@ +[Desktop Entry] +Name=LibreOffice @APP@ ... +Comment=Enter LibreOffice @APP@ filename: +Comment[de]=Name der LibreOffice @APP@-Datei eingeben: +Type=Link +URL=.source/soffice.@EXT@ +Icon=libreoffice-oasis-@TYPE@
[arch-commits] Commit in libreoffice-fresh/trunk (2 files)
Date: Monday, April 22, 2019 @ 19:11:24 Author: andyrtr Revision: 351927 upgpkg: libreoffice-fresh 6.2.3-1 upstream update 6.2.3 Modified: libreoffice-fresh/trunk/PKGBUILD Deleted: libreoffice-fresh/trunk/libreoffice-boost-1.69.patch --+ PKGBUILD | 18 ++ libreoffice-boost-1.69.patch | 17 - 2 files changed, 6 insertions(+), 29 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-04-22 16:54:20 UTC (rev 351926) +++ PKGBUILD2019-04-22 19:11:24 UTC (rev 351927) @@ -10,9 +10,9 @@ pkgbase=libreoffice-fresh pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh') -_LOver=6.2.2.2 -pkgver=6.2.2 -pkgrel=4 +_LOver=6.2.3.2 +pkgver=6.2.3 +pkgrel=1 arch=('x86_64') license=('LGPL3') url="https://www.libreoffice.org/"; @@ -54,7 +54,6 @@ ${_additional_source_url2}/49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll make-pyuno-work-with-system-wide-module-install.diff - libreoffice-boost-1.69.patch libreoffice-fresh.sh libreoffice-fresh.csh) noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip @@ -73,11 +72,11 @@ 185d60944ea767075d27247c3162b3bc-unowinreg.dll ) validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) -sha256sums=('b83ad3a8aa7bebf34db9e984d518a8f2248ed685e04be8373cfa87bb04e31f69' +sha256sums=('f1ddb94fb2bab615ec446da83e62f2bcf963bddc7b9fe600e326701926dc6daf' 'SKIP' -'619f92db787dc8cb4aa81f203b3eefbd02a4affd382bf8d1b9268c846d360d92' +'c1b6923eb66610abeecde79fcc28c9c61353e5b1f2772a37c7aa7a018dbe1132' 'SKIP' -'37e86f2675003a43379658ca5ad65e9093df5353dc0e6dc0a2d34450dbab1745' +'77bfeac5cefb96210a09557ad7f5c40ae399b0658f879fddb02891ac4d2add3e' 'SKIP' '64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1' '1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753' @@ -95,7 +94,6 @@ '49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63' 'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6' 'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563' -'5099c5e7818a327b661c45c0bd218835c1e70b14861b5112525da1d48beebf8c' 'c1e199f7767a4f42d9a95fc942cda4cf47737c7d67e6f334679c9b2e3e271dc2' '07c28ff8f5258abfe4338efccbdfb1dd35892bd00a2ed7f53b1fc2263f71a8b6') @@ -118,10 +116,6 @@ # fix not upstreamable pyuno paths - FS#54250 patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff - - # fix build with boost 1.69 (freebsd) - patch -p0 -i ../libreoffice-boost-1.69.patch - #use the CFLAGS but remove the LibO overridden ones for i in $CFLAGS; do case "$i" in Deleted: libreoffice-boost-1.69.patch === --- libreoffice-boost-1.69.patch2019-04-22 16:54:20 UTC (rev 351926) +++ libreoffice-boost-1.69.patch2019-04-22 19:11:24 UTC (rev 351927) @@ -1,17 +0,0 @@ -After https://github.com/boostorg/logic/commit/23cd89d4c80f build fails: - -sfx2/source/appl/shutdownicon.cxx:170:12: error: no viable conversion from returned value of type 'boost::logic::tribool' to function return type 'bool' -return loaded; - ^~ - sfx2/source/appl/shutdownicon.cxx.orig 2018-06-19 22:27:30 UTC -+++ sfx2/source/appl/shutdownicon.cxx -@@ -167,7 +167,7 @@ bool LoadModule() - #endif // ENABLE_QUICKSTART_APPLET - } - assert(!boost::logic::indeterminate(loaded)); --return loaded; -+return bool{loaded}; - } - - }
[arch-commits] Commit in libreoffice-fresh/trunk (2 files)
Date: Saturday, January 19, 2019 @ 11:42:54 Author: foutrelis Revision: 344474 Attempt to fix build with poppler 0.73 Added: libreoffice-fresh/trunk/libreoffice-poppler-0.73.patch Modified: libreoffice-fresh/trunk/PKGBUILD + PKGBUILD |4 + libreoffice-poppler-0.73.patch | 89 +++ 2 files changed, 93 insertions(+) Modified: PKGBUILD === --- PKGBUILD2019-01-19 11:37:39 UTC (rev 344473) +++ PKGBUILD2019-01-19 11:42:54 UTC (rev 344474) @@ -57,6 +57,7 @@ poppler-0.70.patch libreoffice-poppler-0.71.patch libreoffice-poppler-0.72.patch +libreoffice-poppler-0.73.patch libreoffice-boost-1.69.patch 0001-Update-mdds-to-1.4.1.patch 0001-Update-orcus-to-0.14.0.patch @@ -102,6 +103,7 @@ '4cac21ffdb711803c0d5372c6b0ba04f1310afa7907081fdd01c11e68c1785bf' 'ffe1698d3db3320a9213a459e7619f4962c9792a8b256ea0fe2b7e0af1df430a' 'dc8b5b0d1a4a1fed4f5cab048cd7ecd78630725458311bcbfe0a660c82357b49' +'69337273a8a125be1c9e066b955306659b19066c3c82b61c62bcb62234e2e1ad' '5099c5e7818a327b661c45c0bd218835c1e70b14861b5112525da1d48beebf8c' '8e8460302a7febc9a29b32b98fb77c85910ccadc65c73e0e9997dc5aabaaeb2a' '60560283a5e22acad7f341b16dff4a654559b36db5d49b1e59f3bb9ae9b2336c' @@ -138,6 +140,8 @@ patch -p1 -i ../libreoffice-poppler-0.71.patch # fix build with poppler 0.72 patch -p1 -i ../libreoffice-poppler-0.72.patch +# fix build with poppler 0.73 +patch -p1 -i ../libreoffice-poppler-0.73.patch # fix build with boost 1.69 (freebsd) patch -p0 -i ../libreoffice-boost-1.69.patch Added: libreoffice-poppler-0.73.patch === --- libreoffice-poppler-0.73.patch (rev 0) +++ libreoffice-poppler-0.73.patch 2019-01-19 11:42:54 UTC (rev 344474) @@ -0,0 +1,89 @@ +From 50d371ae08c66648d9f32f633b2245e1746e2bb6 Mon Sep 17 00:00:00 2001 +From: Michael Stahl +Date: Mon, 14 Jan 2019 15:08:42 +0100 +Subject: [PATCH] sdext: fix build with poppler 0.73 + +... which has removed Guchar, Gushort, Guint, Gulong... + +Change-Id: Ia54ad378031f167f6779f6ffe574b85c1e72f26d +Reviewed-on: https://gerrit.libreoffice.org/66305 +Tested-by: Jenkins +Reviewed-by: Michael Stahl +--- + sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 4 ++-- + sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 6 +- + sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx | 6 +++--- + 3 files changed, 10 insertions(+), 6 deletions(-) + +diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +index dab405bc81a1..9842b9734e8d 100644 +--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +@@ -298,7 +298,7 @@ static void writePpm_( OutputBuffer& o_rOutputBuf, + o_rOutputBuf.resize(header_size); + + // initialize stream +-Guchar *p; ++unsigned char *p; + GfxRGB rgb; + std::unique_ptr imgStr( + new ImageStream(str, +@@ -401,7 +401,7 @@ static void writeImage_( OutputBuffer& o_rOutputBuf, + oneColor = { byteToCol( 0xff ), byteToCol( 0xff ), byteToCol( 0xff ) }; + if( colorMap->getColorSpace()->getMode() == csIndexed || colorMap->getColorSpace()->getMode() == csDeviceGray ) + { +-Guchar nIndex = 0; ++unsigned char nIndex = 0; + colorMap->getRGB( &nIndex, &zeroColor ); + nIndex = 1; + colorMap->getRGB( &nIndex, &oneColor ); +diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +index 98d8ede6418f..cd091e5d270f 100644 +--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +@@ -278,9 +278,13 @@ extern FILE* g_binary_out; + + // note: if you ever change Output_t, please keep in mind that the current code + // relies on it being of 8 bit size +-typedef Guchar Output_t; ++typedef unsigned char Output_t; + typedef std::vector< Output_t > OutputBuffer; + ++#if !POPPLER_CHECK_VERSION(0, 73, 0) ++static_assert(std::is_same_v, "unexpected typedef"); ++#endif ++ + #endif // INCLUDED_SDEXT_SOURCE_PDFIMPORT_XPDFWRAPPER_PDFIOUTDEV_GPL_HXX + + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +diff --git a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx +index 4d9e3bb46b61..b5828561b7eb 100644 +--- a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx +@@ -242,7 +242,7 @@ void PngHelper::createPng( OutputBuffer& o_rOutp
[arch-commits] Commit in libreoffice-fresh/trunk (2 files)
Date: Tuesday, January 15, 2019 @ 10:53:57 Author: arojas Revision: 344148 Fix build with boost 1.69 Added: libreoffice-fresh/trunk/libreoffice-boost-1.69.patch Modified: libreoffice-fresh/trunk/PKGBUILD --+ PKGBUILD |4 libreoffice-boost-1.69.patch | 17 + 2 files changed, 21 insertions(+) Modified: PKGBUILD === --- PKGBUILD2019-01-15 10:27:56 UTC (rev 344147) +++ PKGBUILD2019-01-15 10:53:57 UTC (rev 344148) @@ -57,6 +57,7 @@ poppler-0.70.patch libreoffice-poppler-0.71.patch libreoffice-poppler-0.72.patch +libreoffice-boost-1.69.patch 0001-Update-mdds-to-1.4.1.patch 0001-Update-orcus-to-0.14.0.patch libreoffice-fresh.sh libreoffice-fresh.csh) @@ -101,6 +102,7 @@ '4cac21ffdb711803c0d5372c6b0ba04f1310afa7907081fdd01c11e68c1785bf' 'ffe1698d3db3320a9213a459e7619f4962c9792a8b256ea0fe2b7e0af1df430a' 'dc8b5b0d1a4a1fed4f5cab048cd7ecd78630725458311bcbfe0a660c82357b49' +'5099c5e7818a327b661c45c0bd218835c1e70b14861b5112525da1d48beebf8c' '8e8460302a7febc9a29b32b98fb77c85910ccadc65c73e0e9997dc5aabaaeb2a' '60560283a5e22acad7f341b16dff4a654559b36db5d49b1e59f3bb9ae9b2336c' '28c97effbe55e43a1370ab141c676cec9daba9e3dc408bec78136dfefc892a8b' @@ -136,6 +138,8 @@ patch -p1 -i ../libreoffice-poppler-0.71.patch # fix build with poppler 0.72 patch -p1 -i ../libreoffice-poppler-0.72.patch +# fix build with boost 1.69 (freebsd) +patch -p0 -i ../libreoffice-boost-1.69.patch # fix build with new mdds 1.4.x, liborcus 0.14.x # sed -i "s:mdds-1.2 >= 1.2.3:mdds-1.4 >= 1.4.2:" configure.ac Added: libreoffice-boost-1.69.patch === --- libreoffice-boost-1.69.patch(rev 0) +++ libreoffice-boost-1.69.patch2019-01-15 10:53:57 UTC (rev 344148) @@ -0,0 +1,17 @@ +After https://github.com/boostorg/logic/commit/23cd89d4c80f build fails: + +sfx2/source/appl/shutdownicon.cxx:170:12: error: no viable conversion from returned value of type 'boost::logic::tribool' to function return type 'bool' +return loaded; + ^~ + +--- sfx2/source/appl/shutdownicon.cxx.orig 2018-06-19 22:27:30 UTC sfx2/source/appl/shutdownicon.cxx +@@ -167,7 +167,7 @@ bool LoadModule() + #endif // ENABLE_QUICKSTART_APPLET + } + assert(!boost::logic::indeterminate(loaded)); +-return loaded; ++return bool{loaded}; + } + + }
[arch-commits] Commit in libreoffice-fresh/trunk (2 files)
Date: Friday, December 14, 2018 @ 20:06:30 Author: arojas Revision: 342348 Fix build with poppler 0.72 Added: libreoffice-fresh/trunk/libreoffice-poppler-0.72.patch Modified: libreoffice-fresh/trunk/PKGBUILD + PKGBUILD |4 libreoffice-poppler-0.72.patch | 20 2 files changed, 24 insertions(+) Modified: PKGBUILD === --- PKGBUILD2018-12-14 20:02:34 UTC (rev 342347) +++ PKGBUILD2018-12-14 20:06:30 UTC (rev 342348) @@ -56,6 +56,7 @@ make-pyuno-work-with-system-wide-module-install.diff poppler-0.70.patch libreoffice-poppler-0.71.patch +libreoffice-poppler-0.72.patch 0001-Update-mdds-to-1.4.1.patch 0001-Update-orcus-to-0.14.0.patch libreoffice-fresh.sh libreoffice-fresh.csh) @@ -99,6 +100,7 @@ 'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563' '4cac21ffdb711803c0d5372c6b0ba04f1310afa7907081fdd01c11e68c1785bf' 'ffe1698d3db3320a9213a459e7619f4962c9792a8b256ea0fe2b7e0af1df430a' +'dc8b5b0d1a4a1fed4f5cab048cd7ecd78630725458311bcbfe0a660c82357b49' '8e8460302a7febc9a29b32b98fb77c85910ccadc65c73e0e9997dc5aabaaeb2a' '60560283a5e22acad7f341b16dff4a654559b36db5d49b1e59f3bb9ae9b2336c' '28c97effbe55e43a1370ab141c676cec9daba9e3dc408bec78136dfefc892a8b' @@ -132,6 +134,8 @@ patch -Np1 -i ../poppler-0.70.patch # fix build with poppler 0.71 patch -p1 -i ../libreoffice-poppler-0.71.patch +# fix build with poppler 0.72 +patch -p1 -i ../libreoffice-poppler-0.72.patch # fix build with new mdds 1.4.x, liborcus 0.14.x # sed -i "s:mdds-1.2 >= 1.2.3:mdds-1.4 >= 1.4.2:" configure.ac Added: libreoffice-poppler-0.72.patch === --- libreoffice-poppler-0.72.patch (rev 0) +++ libreoffice-poppler-0.72.patch 2018-12-14 20:06:30 UTC (rev 342348) @@ -0,0 +1,20 @@ +--- libreoffice-6.1.3.2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig 2018-12-14 20:04:01.633697240 + libreoffice-6.1.3.2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2018-12-14 20:04:18.020410653 + +@@ -555,7 +555,7 @@ + LinkAction* pAction = link->getAction(); + if (pAction && pAction->getKind() == actionURI) + { +-const char* pURI = static_cast(pAction)->getURI()->getCString(); ++const char* pURI = static_cast(pAction)->getURI()->c_str(); + + std::vector aEsc( lcl_escapeLineFeeds(pURI) ); + +@@ -757,7 +757,7 @@ + + aFont = it->second; + +-std::vector aEsc( lcl_escapeLineFeeds(aFont.familyName.getCString()) ); ++std::vector aEsc( lcl_escapeLineFeeds(aFont.familyName.c_str()) ); + printf( " %d %d %d %d %f %d %s", + aFont.isEmbedded, + aFont.isBold,
[arch-commits] Commit in libreoffice-fresh/trunk (2 files)
Date: Thursday, November 1, 2018 @ 21:06:15 Author: arojas Revision: 337703 Fix build with poppler 0.71 Added: libreoffice-fresh/trunk/libreoffice-poppler-0.71.patch Modified: libreoffice-fresh/trunk/PKGBUILD + PKGBUILD |4 libreoffice-poppler-0.71.patch | 169 +++ 2 files changed, 173 insertions(+) Modified: PKGBUILD === --- PKGBUILD2018-11-01 19:55:06 UTC (rev 337702) +++ PKGBUILD2018-11-01 21:06:15 UTC (rev 337703) @@ -55,6 +55,7 @@ ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll make-pyuno-work-with-system-wide-module-install.diff poppler-0.70.patch +libreoffice-poppler-0.71.patch 0001-Update-mdds-to-1.4.1.patch 0001-Update-orcus-to-0.14.0.patch libreoffice-fresh.sh libreoffice-fresh.csh) @@ -97,6 +98,7 @@ 'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6' 'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563' '4cac21ffdb711803c0d5372c6b0ba04f1310afa7907081fdd01c11e68c1785bf' +'ffe1698d3db3320a9213a459e7619f4962c9792a8b256ea0fe2b7e0af1df430a' '8e8460302a7febc9a29b32b98fb77c85910ccadc65c73e0e9997dc5aabaaeb2a' '60560283a5e22acad7f341b16dff4a654559b36db5d49b1e59f3bb9ae9b2336c' '28c97effbe55e43a1370ab141c676cec9daba9e3dc408bec78136dfefc892a8b' @@ -128,6 +130,8 @@ # fix build with poppler 0.70 patch -Np1 -i ../poppler-0.70.patch +# fix build with poppler 0.71 +patch -p1 -i ../libreoffice-poppler-0.71.patch # fix build with new mdds 1.4.x, liborcus 0.14.x # sed -i "s:mdds-1.2 >= 1.2.3:mdds-1.4 >= 1.4.2:" configure.ac Added: libreoffice-poppler-0.71.patch === --- libreoffice-poppler-0.71.patch (rev 0) +++ libreoffice-poppler-0.71.patch 2018-11-01 21:06:15 UTC (rev 337703) @@ -0,0 +1,169 @@ +diff -ru libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper.orig/pdfioutdev_gpl.cxx libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +--- libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper.orig/pdfioutdev_gpl.cxx 2018-11-01 20:43:55.802520387 + libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2018-11-01 20:44:33.399286879 + +@@ -514,7 +514,7 @@ + PDFOutDev::PDFOutDev( PDFDoc* pDoc ) : + m_pDoc( pDoc ), + m_aFontMap(), +-m_pUtf8Map( new UnicodeMap("UTF-8", gTrue, &mapUTF8) ), ++m_pUtf8Map( new UnicodeMap("UTF-8", true, &mapUTF8) ), + m_bSkipImages(false) + { + } +@@ -943,11 +943,11 @@ + } + + void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str, +- int width, int height, GBool invert, ++ int width, int height, bool invert, + #if POPPLER_CHECK_VERSION(0, 12, 0) +- GBool /*interpolate*/, ++ bool /*interpolate*/, + #endif +- GBool /*inlineImg*/ ) ++ bool /*inlineImg*/ ) + { + if (m_bSkipImages) + return; +@@ -976,9 +976,9 @@ + void PDFOutDev::drawImage(GfxState*, Object*, Stream* str, + int width, int height, GfxImageColorMap* colorMap, + #if POPPLER_CHECK_VERSION(0, 12, 0) +- GBool /*interpolate*/, ++ bool /*interpolate*/, + #endif +- int* maskColors, GBool /*inlineImg*/ ) ++ int* maskColors, bool /*inlineImg*/ ) + { + if (m_bSkipImages) + return; +@@ -1027,13 +1027,13 @@ + int width, int height, + GfxImageColorMap* colorMap, + #if POPPLER_CHECK_VERSION(0, 12, 0) +-GBool /*interpolate*/, ++bool /*interpolate*/, + #endif + Stream* maskStr, + int maskWidth, int maskHeight, +-GBool maskInvert ++bool maskInvert + #if POPPLER_CHECK_VERSION(0, 12, 0) +-, GBool /*maskInterpolate*/ ++, bool /*maskInterpolate*/ + #endif +) + { +@@ -1049,13 +1049,13 @@ + int width, int height, + GfxImageColorMap* colorMap, + #if POPPLER_CHECK_VERSION(0, 12, 0) +-GBool /*interpolate*/, ++bool /*interpolate*/, + #endif + Stream* maskStr, + i
[arch-commits] Commit in libreoffice-fresh/trunk (2 files)
Date: Sunday, August 12, 2018 @ 15:52:38 Author: andyrtr Revision: 331406 fix gtk3_kde5 vcl preselection Modified: libreoffice-fresh/trunk/libreoffice-fresh.csh libreoffice-fresh/trunk/libreoffice-fresh.sh ---+ libreoffice-fresh.csh |2 +- libreoffice-fresh.sh |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Modified: libreoffice-fresh.csh === --- libreoffice-fresh.csh 2018-08-12 14:47:23 UTC (rev 331405) +++ libreoffice-fresh.csh 2018-08-12 15:52:38 UTC (rev 331406) @@ -1,6 +1,6 @@ # to force a certain look'n feel #setenv SAL_USE_VCLPLUGIN gen -#setenv SAL_USE_VCLPLUGIN kde4 +#setenv SAL_USE_VCLPLUGIN gtk3_kde5 #setenv SAL_USE_VCLPLUGIN gtk #setenv SAL_USE_VCLPLUGIN gtk3 Modified: libreoffice-fresh.sh === --- libreoffice-fresh.sh2018-08-12 14:47:23 UTC (rev 331405) +++ libreoffice-fresh.sh2018-08-12 15:52:38 UTC (rev 331406) @@ -1,6 +1,6 @@ # to force a certain look'n feel #export SAL_USE_VCLPLUGIN=gen -#export SAL_USE_VCLPLUGIN=kde4 +#export SAL_USE_VCLPLUGIN=gtk3_kde5 #export SAL_USE_VCLPLUGIN=gtk #export SAL_USE_VCLPLUGIN=gtk3
[arch-commits] Commit in libreoffice-fresh/trunk (2 files)
Date: Thursday, August 10, 2017 @ 20:07:54 Author: andyrtr Revision: 301869 fix uno; FS#55031 Modified: libreoffice-fresh/trunk/PKGBUILD libreoffice-fresh/trunk/make-pyuno-work-with-system-wide-module-install.diff --+ PKGBUILD |2 +- make-pyuno-work-with-system-wide-module-install.diff |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-08-10 20:06:43 UTC (rev 301868) +++ PKGBUILD2017-08-10 20:07:54 UTC (rev 301869) @@ -134,7 +134,7 @@ 'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770' 'a0bd3e0186e043223bfb231a888e2bfb06c78ee2e07c2f0eca434236d173cf34' 'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6' -'ff546050a1789b0cf62369524fe939526541e32a74bdd0c9137bbe0d40d7f533' +'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563' '76f62957d0058092b11316357d9d716a62b48a53e5277426ffa87429ab5510e4' 'd24cfcb556ae1db02087c49012bbc4621f9ef7e3465ca832e1410326d260f283') Modified: make-pyuno-work-with-system-wide-module-install.diff === --- make-pyuno-work-with-system-wide-module-install.diff2017-08-10 20:06:43 UTC (rev 301868) +++ make-pyuno-work-with-system-wide-module-install.diff2017-08-10 20:07:54 UTC (rev 301869) @@ -10,7 +10,7 @@ +import os import sys +sys.path.append("/usr/lib/libreoffice/program/") -+os.putenv("URE_BOOTSTRAP", "vnd.sun.start.pathname:/usr/lib/libreoffice/program/fundamentalrc") ++os.putenv("URE_BOOTSTRAP", "vnd.sun.star.pathname:/usr/lib/libreoffice/program/fundamentalrc") + +import pyuno import traceback
[arch-commits] Commit in libreoffice-fresh/trunk (2 files)
Date: Tuesday, June 6, 2017 @ 18:50:26 Author: andyrtr Revision: 298104 upgpkg: libreoffice-fresh 5.3.3-2 fix loading uno module; FS#54250 Modified: libreoffice-fresh/trunk/PKGBUILD libreoffice-fresh/trunk/make-pyuno-work-with-system-wide-module-install.diff --+ PKGBUILD |8 +- make-pyuno-work-with-system-wide-module-install.diff | 50 - 2 files changed, 16 insertions(+), 42 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-06-06 18:36:16 UTC (rev 298103) +++ PKGBUILD2017-06-06 18:50:26 UTC (rev 298104) @@ -13,7 +13,7 @@ pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh') _LOver=5.3.3.2 pkgver=5.3.3 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/"; @@ -134,7 +134,7 @@ 'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770' 'a0bd3e0186e043223bfb231a888e2bfb06c78ee2e07c2f0eca434236d173cf34' 'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6' -'ad028513c29691b3ec3a35de21af2f224b48015afe0fbcc6fb834fdf7f613165' +'ff546050a1789b0cf62369524fe939526541e32a74bdd0c9137bbe0d40d7f533' '76f62957d0058092b11316357d9d716a62b48a53e5277426ffa87429ab5510e4' 'd24cfcb556ae1db02087c49012bbc4621f9ef7e3465ca832e1410326d260f283') @@ -157,8 +157,8 @@ rm ${srcdir}/ext_sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll cp -f ${srcdir}/185d60944ea767075d27247c3162b3bc-unowinreg.dll ${srcdir}/ext_sources - # fix not upstreamable pyuno paths - patch taken from Debian -# patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff + # 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 Modified: make-pyuno-work-with-system-wide-module-install.diff === --- make-pyuno-work-with-system-wide-module-install.diff2017-06-06 18:36:16 UTC (rev 298103) +++ make-pyuno-work-with-system-wide-module-install.diff2017-06-06 18:50:26 UTC (rev 298104) @@ -1,44 +1,18 @@ -diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh -index defd7b2..ea2a809 100755 a/desktop/scripts/soffice.sh -+++ b/desktop/scripts/soffice.sh -@@ -128,6 +128,9 @@ if echo "$checks" | grep -q "cc" ; then - exit 1; - fi - -+PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH} -+export PYTHONPATH -+ - case "`uname -s`" in - NetBSD|OpenBSD|FreeBSD|DragonFly) - # this is a temporary hack until we can live with the default search paths -diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py -index f93ac5e..92a2891 100644 a/pyuno/source/module/uno.py -+++ b/pyuno/source/module/uno.py -@@ -26,8 +26,12 @@ +--- a/pyuno/source/module/uno.py 2017-05-03 18:46:29.0 +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.start.pathname:/usr/lib/libreoffice/program/fundamentalrc") ++ ++import pyuno + import traceback + import warnings -+sys.path.append('/usr/lib/libreoffice/program') -+if getattr(os.environ, 'URE_BOOTSTRAP', None) is None: -+ os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:/usr/lib/libreoffice/program/fundamentalrc" - import pyuno - - try: -diff --git a/pyuno/source/officehelper.py b/pyuno/source/officehelper.py -index 610ac5f..df243d0 100755 a/pyuno/source/officehelper.py -+++ b/pyuno/source/officehelper.py -@@ -44,7 +44,7 @@ def bootstrap(): - if "UNO_PATH" in os.environ: - sOffice = os.environ["UNO_PATH"] - else: --sOffice = "" # lets hope for the best -+sOffice = "/usr/lib/libreoffice/program" - sOffice = os.path.join(sOffice, "soffice") - if platform.startswith("win"): - sOffice += ".exe"
[arch-commits] Commit in libreoffice-fresh/trunk (2 files)
Date: Sunday, August 28, 2016 @ 19:50:05 Author: andyrtr Revision: 274781 upgpkg: libreoffice-fresh 5.2.0-4 fix mouse wheel scrolling; FS#49827 Added: libreoffice-fresh/trunk/fix_gtk3_smooth_scolling.diff Modified: libreoffice-fresh/trunk/PKGBUILD ---+ PKGBUILD | 11 ++ fix_gtk3_smooth_scolling.diff | 157 2 files changed, 165 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2016-08-28 18:56:09 UTC (rev 274780) +++ PKGBUILD2016-08-28 19:50:05 UTC (rev 274781) @@ -13,7 +13,7 @@ pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh') _LOver=5.2.0.4 pkgver=5.2.0 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/"; @@ -65,7 +65,8 @@ libreoffice-fresh.sh libreoffice-fresh.csh update_liborcus_to_0.11.0.diff remove_unnecessary_orcus_external_usage_from_makefiles.diff - buildfix.diff) + buildfix.diff + fix_gtk3_smooth_scolling.diff) noextract=(boost_1_60_0.tar.bz2 ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip @@ -128,7 +129,8 @@ 'e7e4b3e70e99e5cba8f8dfcacf3b0d87' '3f526b966a672d1237cfcbadae0e3f95' 'ac71e21ecc0976b2ea6e233854963d4b' - 'd386f3a0b484cd3929329a294159f5bc') + 'd386f3a0b484cd3929329a294159f5bc' + '7e827ccdda93cc70e94a0766c0509a11') prepare() { @@ -144,6 +146,9 @@ # https://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-5-2&id=e13db0f16c4ac5a243587e881d7b18979d07f478 patch -Np1 -i ../buildfix.diff + # https://cgit.freedesktop.org/libreoffice/core/patch/?id=3e60438dad304c487973fb8cdb50f3d94932af2e +patch -Np1 -i ../fix_gtk3_smooth_scolling.diff + # don't run broken tests on i686 [ "$CARCH" = "i686" ] && sed -i "/CppunitTest_sw_ooxmlexport7/d" sw/Module_sw.mk Added: fix_gtk3_smooth_scolling.diff === --- fix_gtk3_smooth_scolling.diff (rev 0) +++ fix_gtk3_smooth_scolling.diff 2016-08-28 19:50:05 UTC (rev 274781) @@ -0,0 +1,157 @@ +From 3e60438dad304c487973fb8cdb50f3d94932af2e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Thu, 23 Jun 2016 17:32:11 +0100 +Subject: Resolves: rhbz#1349501 gtk3: smooth scrolling events can be + disabled... + +by the user with GDK_CORE_DEVICE_EVENTS=1, and so manage to disable their wheel +scrolling + +Change-Id: I7df63f738983c90dea75b9f43a36133910446aba +(cherry picked from commit 7dfd50f947671d79b9119f10259857700d5728d8) + +Resolves: rhbz#1349501 gtk3: smooth scrolling events can be disabled... + +better fix, if we listen to the eventbox we get either SMOOTH scrolling +or not smooth events, not both. We get SMOOTH when supported, and not +if not supported so no need to reintroduce the miserable hack, which +doesn't work under wayland anyway + +Change-Id: I993e71d3553322425a506cd93d812efe081bf3c9 +Reviewed-on: https://gerrit.libreoffice.org/26645 +Tested-by: Jenkins +Reviewed-by: Miklos Vajna + +diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx +index e8d12e3..2b7ade6 100644 +--- a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx +@@ -1013,6 +1013,7 @@ void GtkSalFrame::InitCommon() + m_aMouseSignalIds.push_back(g_signal_connect( G_OBJECT(pEventWidget), "drag-failed", G_CALLBACK(signalDragFailed), this )); + m_aMouseSignalIds.push_back(g_signal_connect( G_OBJECT(pEventWidget), "drag-data-delete", G_CALLBACK(signalDragDelete), this )); + m_aMouseSignalIds.push_back(g_signal_connect( G_OBJECT(pEventWidget), "drag-data-get", G_CALLBACK(signalDragDataGet), this )); ++m_aMouseSignalIds.push_back(g_signal_connect( G_OBJECT(pEventWidget), "scroll-event", G_CALLBACK(signalScroll), this )); + + g_signal_connect( G_OBJECT(m_pFixedContainer), "draw", G_CALLBACK(signalDraw), this ); + g_signal_connect( G_OBJECT(m_pFixedContainer), "size-allocate", G_CALLBACK(sizeAllocated), this ); +@@ -1038,7 +1039,6 @@ void GtkSalFrame::InitCommon() + g_signal_connect( G_OBJECT(m_pWindow), "key-release-event", G_CALLBACK(signalKey), this ); + g_signal_connect( G_OBJECT(m_pWindow), "delete-event", G_CALLBACK(signalDelete), this ); + g_signal_connect( G_OBJECT(m_pWindow), "window-state-event", G_CALLBACK(signalWindowState), this ); +-g_signal_connect( G_OBJECT(m_pWindow), "scroll-event", G_CALLBACK(signalScroll), this ); + g_signal_connect( G_OBJECT(m_pWindow), "leave-notify-event", G_CALLBACK(signalCrossing), this ); + g_signal_connect( G_OBJECT(m_pWindow), "enter-notify-event", G_CALLBACK(signalCrossing), this ); + g_signal_connect( G_OBJECT(m_pWindow), "visibility-notify-event", G_CALLB
[arch-commits] Commit in libreoffice-fresh/trunk (2 files)
Date: Thursday, March 10, 2016 @ 20:52:10 Author: andyrtr Revision: 261300 upgpkg: libreoffice-fresh 5.1.1-1 upstream update 5.1.1 Modified: libreoffice-fresh/trunk/PKGBUILD Deleted: libreoffice-fresh/trunk/trackpad_two_finger_scroll_goes_into_reverse.diff ---+ PKGBUILD | 18 -- trackpad_two_finger_scroll_goes_into_reverse.diff | 34 2 files changed, 7 insertions(+), 45 deletions(-) Modified: PKGBUILD === --- PKGBUILD2016-03-10 19:25:41 UTC (rev 261299) +++ PKGBUILD2016-03-10 19:52:10 UTC (rev 261300) @@ -4,9 +4,9 @@ pkgbase=libreoffice-fresh pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh') -_LOver=5.1.0.3 -pkgver=5.1.0 -pkgrel=2 +_LOver=5.1.1.3 +pkgver=5.1.1 +pkgrel=1 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/"; @@ -59,7 +59,6 @@ ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll make-pyuno-work-with-system-wide-module-install.diff libreoffice-fresh.sh libreoffice-fresh.csh - trackpad_two_finger_scroll_goes_into_reverse.diff buildfix.diff) noextract=(boost_1_59_0.tar.bz2 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz @@ -90,11 +89,11 @@ libfreehand-0.1.1.tar.bz2 185d60944ea767075d27247c3162b3bc-unowinreg.dll) validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) -md5sums=('a0cbe7fe9368e35068bd619281380379' +md5sums=('5354a6172015603ba057a2fbbfc9977e' 'SKIP' - 'e24d7920ef9fc36f977ebb954173fd43' + 'c4bde6b9f65eea1b0d7e6dc73537cdab' 'SKIP' - '76495173c3e7a74f4aa53198d8bb99e5' + '4cfbacd4328863aaf08107e7d3b329a7' 'SKIP' '6aa9a5c6a4ca1016edd0ed1178e3cb87' '1f24ab1d39f4a51faf22244c94a6203f' @@ -127,7 +126,6 @@ 'dcb5ad3e5f7139227677ea064b075422' '4195735a80876ae812fca5736b50192a' 'e7e4b3e70e99e5cba8f8dfcacf3b0d87' - '265b68b894c5a30eb66c25e7c08c87b6' '97dac0a03bbcaa4ee29f262dbcb4b427') prepare() { @@ -149,9 +147,6 @@ # fix not upstreamable pyuno paths - patch taken from Debian patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff - # FS#48161, FS#48406 - # https://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-5-1&id=b083afac2f0531bacd790cb3ac25353f9a02db5d - patch -Np1 -i ${srcdir}/trackpad_two_finger_scroll_goes_into_reverse.diff # https://gerrit.libreoffice.org/#/c/22695/ patch -Np1 -i ${srcdir}/buildfix.diff @@ -166,6 +161,7 @@ # i686 build broken [ "$CARCH" = "i686" ] && sed -i '/CppunitTest_sw_ooxmlimport/d' sw/Module_sw.mk + [ "$CARCH" = "i686" ] && sed -i '/CppunitTest_sw_ooxmlexport7/d' sw/Module_sw.mk # qt4 fix sed -i "s:qmake:qmake-qt4:g" configure.ac Deleted: trackpad_two_finger_scroll_goes_into_reverse.diff === --- trackpad_two_finger_scroll_goes_into_reverse.diff 2016-03-10 19:25:41 UTC (rev 261299) +++ trackpad_two_finger_scroll_goes_into_reverse.diff 2016-03-10 19:52:10 UTC (rev 261300) @@ -1,34 +0,0 @@ -From b083afac2f0531bacd790cb3ac25353f9a02db5d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Wed, 27 Jan 2016 16:20:35 + -Subject: Resolves: rhbz#1294208 trackpad two finger scroll goes into reverse - -(cherry picked from commit e734c7f53cfffa6141e6b46c06825ee273e2136b) - -Change-Id: Ic576f14cae82781a93e52972513a28c4a141d1a2 - -diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx -index af284ca..3914de5 100644 a/vcl/unx/gtk3/gtk3gtkframe.cxx -+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx -@@ -2557,14 +2557,12 @@ gboolean GtkSalFrame::signalScroll( GtkWidget*, GdkEvent* pEvent, gpointer frame - { - case GDK_SCROLL_SMOOTH: - { --double delta_x, delta_y; --gdk_event_get_scroll_deltas(pEvent, &delta_x, &delta_y); - //pick the bigger one I guess --aEvent.mbHorz = fabs(delta_x) > fabs(delta_y); -+aEvent.mbHorz = fabs(pSEvent->delta_x) > fabs(pSEvent->delta_y); - if (aEvent.mbHorz) --aEvent.mnDelta = -delta_x; -+aEvent.mnDelta = -pSEvent->delta_x * 40; - else --aEvent.mnDelta = -delta_y; -+aEvent.mnDelta = -pSEvent->delta_y * 40; - aEvent.mnScrollLines = 1; - pThis->m_nLastScrollEventTime = pSEvent->time; - break; --- -cgit v0.10.2 -
[arch-commits] Commit in libreoffice-fresh/trunk (2 files)
Date: Thursday, February 11, 2016 @ 16:04:37 Author: andyrtr Revision: 259069 remove comment about broken gtk3 vcl, gtk3 should work now Modified: libreoffice-fresh/trunk/libreoffice-fresh.csh libreoffice-fresh/trunk/libreoffice-fresh.sh ---+ libreoffice-fresh.csh |2 +- libreoffice-fresh.sh |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Modified: libreoffice-fresh.csh === --- libreoffice-fresh.csh 2016-02-11 12:04:17 UTC (rev 259068) +++ libreoffice-fresh.csh 2016-02-11 15:04:37 UTC (rev 259069) @@ -3,4 +3,4 @@ #setenv SAL_USE_VCLPLUGIN gen #setenv SAL_USE_VCLPLUGIN kde4 #setenv SAL_USE_VCLPLUGIN gtk -#setenv SAL_USE_VCLPLUGIN gtk3 # currently broken and not available +#setenv SAL_USE_VCLPLUGIN gtk3 Modified: libreoffice-fresh.sh === --- libreoffice-fresh.sh2016-02-11 12:04:17 UTC (rev 259068) +++ libreoffice-fresh.sh2016-02-11 15:04:37 UTC (rev 259069) @@ -3,4 +3,4 @@ #export SAL_USE_VCLPLUGIN=gen #export SAL_USE_VCLPLUGIN=kde4 #export SAL_USE_VCLPLUGIN=gtk -#export SAL_USE_VCLPLUGIN=gtk3 # currently broken and not available +#export SAL_USE_VCLPLUGIN=gtk3
[arch-commits] Commit in libreoffice-fresh/trunk (2 files)
Date: Thursday, December 25, 2014 @ 23:10:01 Author: andyrtr Revision: 228050 prepare next release Added: libreoffice-fresh/trunk/make-pyuno-work-with-system-wide-module-install_LibO44.diff Modified: libreoffice-fresh/trunk/PKGBUILD.44 -+ PKGBUILD.44 | 18 ++-- make-pyuno-work-with-system-wide-module-install_LibO44.diff | 44 ++ 2 files changed, 53 insertions(+), 9 deletions(-) Modified: PKGBUILD.44 === --- PKGBUILD.44 2014-12-25 20:51:13 UTC (rev 228049) +++ PKGBUILD.44 2014-12-25 22:10:01 UTC (rev 228050) @@ -49,7 +49,7 @@ ${_additional_source_url}/7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2 ${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz ${_additional_source_url}/libmwaw-0.3.3.tar.bz2 - ${_additional_source_url}/language-subtag-registry-2014-04-10.tar.bz2 + ${_additional_source_url}/language-subtag-registry-2014-12-03.tar.bz2 ${_additional_source_url}/CoinMP-1.7.6.tgz ${_additional_source_url}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 ${_additional_source_url}/OpenCOLLADA-master-6509aa13af.tar.bz2 @@ -58,12 +58,12 @@ ${_additional_source_url}/libgltf/libgltf-0.0.2.tar.bz2 ${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip - ${_additional_source_url}/22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz + ${_additional_source_url}/5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz ${_additional_source_url}/libe-book-0.1.1.tar.bz2 ${_additional_source_url}/libfreehand-0.1.0.tar.bz2 ${_additional_source_url}/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll - make-pyuno-work-with-system-wide-module-install.diff + make-pyuno-work-with-system-wide-module-install_LibO44.diff libreoffice-fresh.sh libreoffice-fresh.csh) noextract=(d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz @@ -87,7 +87,7 @@ 7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz libmwaw-0.3.3.tar.bz2 - language-subtag-registry-2014-04-10.tar.bz2 + language-subtag-registry-2014-12-03.tar.bz2 CoinMP-1.7.6.tgz 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 OpenCOLLADA-master-6509aa13af.tar.bz2 @@ -96,7 +96,7 @@ libgltf-0.0.2.tar.bz2 d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip - 22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz + 5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz libe-book-0.1.1.tar.bz2 libfreehand-0.1.0.tar.bz2 36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 @@ -129,7 +129,7 @@ '7681383be6ce489d84c1c74f4e7f9643' '0168229624cfac409e766913506961a8' '19b879c2a27251db6fb274d6c585d488' - '49c94710f7858b1969d74ff72e6aac84' + '0f2677ec23bb43ddc7355d1b4cc8ed45' '1cce53bf4b40ae29790d2c5c9f8b1129' '4b87018f7fff1d054939d19920b751a0' '4ca8a6ef0afeefc864e9ef21b9f14bd6' @@ -138,12 +138,12 @@ 'd63a9f47ab048f5009d90693d6aa6424' 'd8bd5eed178db6e2b18eeed243f85aa8' 'ba2930200c9f019c2d93a8c88c651a0f' - '22f8a85daf4a012180322e1f52a7563b' + '5821b806a98e6c38370970e682ce76e8' 'c25a881d21abc5b4da19205db513cc22' '5f029fef73e42a2c2ae4524a7513f97d' '36271d3fa0d9dec1632029b6d7aac925' '185d60944ea767075d27247c3162b3bc' - '07d2bf5ad839a394cca008b3ec6e7bb1' + 'dcb5ad3e5f7139227677ea064b075422' '4195735a80876ae812fca5736b50192a' 'e7e4b3e70e99e5cba8f8dfcacf3b0d87') validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') @@ -164,7 +164,7 @@ cp -f ${srcdir}/185d60944ea767075d27247c3162b3bc-unowinreg.dll ${srcdir}/ext_sources # fix not upstreamable pyuno paths - patch taken from Debian - patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff + patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install_LibO44.diff #use the CFLAGS but remove the LibO overridden ones for i in $CFLAGS; do Added: make-pyuno-work-with-system-wide-module-install_LibO44.diff === --- make-pyuno-work-with-system-wide-module-install_LibO44.diff (rev 0) +++ make-pyuno-work-with
[arch-commits] Commit in libreoffice-fresh/trunk (2 files)
Date: Sunday, May 25, 2014 @ 13:27:10 Author: andyrtr Revision: 213571 upgpkg: libreoffice-fresh 4.3.0-0.2 upstream update 4.3.0-beta1 Added: libreoffice-fresh/trunk/libreoffice-fresh.csh libreoffice-fresh/trunk/libreoffice-fresh.sh ---+ libreoffice-fresh.csh |6 ++ libreoffice-fresh.sh |6 ++ 2 files changed, 12 insertions(+) Added: libreoffice-fresh.csh === --- libreoffice-fresh.csh (rev 0) +++ libreoffice-fresh.csh 2014-05-25 11:27:10 UTC (rev 213571) @@ -0,0 +1,6 @@ +# 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 Added: libreoffice-fresh.sh === --- libreoffice-fresh.sh(rev 0) +++ libreoffice-fresh.sh2014-05-25 11:27:10 UTC (rev 213571) @@ -0,0 +1,6 @@ +# 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