diff --git a/extra/libreoffice-fresh/PKGBUILD b/extra/libreoffice-fresh/PKGBUILD index a7267ba54..354fad695 100644 --- a/extra/libreoffice-fresh/PKGBUILD +++ b/extra/libreoffice-fresh/PKGBUILD @@ -12,7 +12,7 @@ pkgbase=libreoffice-fresh pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh') _LOver=5.1.0.3 pkgver=5.1.0 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -28,7 +28,7 @@ makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.5' 'libwpd>=0.9.2' 'lib 'bluez-libs' 'harfbuzz-icu' 'gdb' 'doxygen' 'libatomic_ops' 'mdds' 'glew' 'apr' 'serf' 'ttf-liberation' 'glm' 'libxinerama' 'libpagemaker' 'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'liborcus' 'liblangtag' - 'libexttextcat' 'libfbclient') + 'libexttextcat' 'libfbclient' 'libcmis') _mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}" #_mirror="http://dev-builds.libreoffice.org/pre-releases/src" @@ -61,11 +61,12 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc} ${_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}/5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz ${_additional_source_url}/libfreehand-0.1.1.tar.bz2 ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll make-pyuno-work-with-system-wide-module-install.diff - libreoffice-fresh.sh libreoffice-fresh.csh) + 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 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip @@ -92,7 +93,6 @@ noextract=(boost_1_59_0.tar.bz2 libgltf-0.0.2.tar.bz2 d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip - 5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz libfreehand-0.1.1.tar.bz2 185d60944ea767075d27247c3162b3bc-unowinreg.dll) validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) @@ -128,12 +128,13 @@ md5sums=('a0cbe7fe9368e35068bd619281380379' 'd63a9f47ab048f5009d90693d6aa6424' 'd8bd5eed178db6e2b18eeed243f85aa8' 'ba2930200c9f019c2d93a8c88c651a0f' - '5821b806a98e6c38370970e682ce76e8' '8cf70c5dc4d24d2dc4a107f509d2d6d7' '185d60944ea767075d27247c3162b3bc' 'dcb5ad3e5f7139227677ea064b075422' - '40680393752d98bcb590f1f62efa61a9' - 'f82232620f3e27d1532c49af4b36ce9a') + '4195735a80876ae812fca5736b50192a' + 'e7e4b3e70e99e5cba8f8dfcacf3b0d87' + '265b68b894c5a30eb66c25e7c08c87b6' + '97dac0a03bbcaa4ee29f262dbcb4b427') prepare() { @@ -153,6 +154,12 @@ prepare() { # 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 #use the CFLAGS but remove the LibO overridden ones for i in $CFLAGS; do @@ -169,8 +176,9 @@ prepare() { # qt4 fix sed -i "s:qmake:qmake-qt4:g" configure.ac - # mdds 1.0.0 fix + # mdds 1.0.0/liborcus 0.11.0 fix sed -i "s:mdds >= 0.12.0:mdds-1.0 >= 0.12.0:g" configure.ac +# sed -i "s:liborcus-0.10:liborcus-0.11:g" configure.ac } build() { @@ -212,7 +220,7 @@ build() { --with-system-mdds\ --without-myspell-dicts \ --with-system-libvisio \ - --without-system-libcmis \ + --with-system-libcmis \ --with-system-libmspub \ --with-system-libexttextcat \ --with-system-orcus \ @@ -306,7 +314,7 @@ package_libreoffice-fresh() { 'libmspub' 'harfbuzz-icu' 'glew' 'nss' 'clucene' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'glu' 'libpagemaker' 'gst-plugins-base-libs' 'libxinerama' 'libabw' 'libmwaw' 'libe-book' 'libcups' 'gtk2' - 'liborcus' 'liblangtag' 'libexttextcat' 'libfbclient') + 'liborcus' 'liblangtag' 'libexttextcat' 'libfbclient' 'libcmis') 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' diff --git a/extra/libreoffice-fresh/buildfix.diff b/extra/libreoffice-fresh/buildfix.diff new file mode 100644 index 000000000..b4fcc7303 --- /dev/null +++ b/extra/libreoffice-fresh/buildfix.diff @@ -0,0 +1,67 @@ +From 36ae1972ff64c80dc053680c82032904f7bbdcb8 Mon Sep 17 00:00:00 2001 +From: Fabio Buso +Date: Thu, 25 Feb 2016 09:45:03 +0100 +Subject: Use rtl::math::isNan() + +isnan() not found causes compilation error +System: Archlinux (Kernel Version 4.4) - GCC 5.3.0 + +Change-Id: Id0bb4555428896678437e8abf228f1c208f1e7a0 +Reviewed-on: https://gerrit.libreoffice.org/22695 +Reviewed-by: Tor Lillqvist +Tested-by: Tor Lillqvist + +diff --git a/svx/source/items/e3ditem.cxx b/svx/source/items/e3ditem.cxx +index 9e623dc..9604bce 100644 +--- a/svx/source/items/e3ditem.cxx ++++ b/svx/source/items/e3ditem.cxx +@@ -19,6 +19,7 @@ + + #include + #include ++#include + + #include + +@@ -87,7 +88,7 @@ SvStream& SvxB3DVectorItem::Store(SvStream &rStream, sal_uInt16 /*nItemVersion*/ + + bool SvxB3DVectorItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const + { +- assert(!isnan(aVal.getX()) && !isnan(aVal.getY()) && !isnan(aVal.getZ())); ++ assert(!rtl::math::isNan(aVal.getX()) && !rtl::math::isNan(aVal.getY()) && !rtl::math::isNan(aVal.getZ())); + + drawing::Direction3D aDirection; + +@@ -111,7 +112,7 @@ bool SvxB3DVectorItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) + aVal.setY(aDirection.DirectionY); + aVal.setZ(aDirection.DirectionZ); + +- assert(!isnan(aVal.getX()) && !isnan(aVal.getY()) && !isnan(aVal.getZ())); ++ assert(!rtl::math::isNan(aVal.getX()) && !rtl::math::isNan(aVal.getY()) && !rtl::math::isNan(aVal.getZ())); + + return true; + } +diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx +index 5cf205f..69fb32a 100644 +--- a/xmloff/source/draw/ximp3dscene.cxx ++++ b/xmloff/source/draw/ximp3dscene.cxx +@@ -18,6 +18,7 @@ + */ + + #include ++#include + + #include "ximp3dscene.hxx" + #include +@@ -66,7 +67,7 @@ SdXML3DLightContext::SdXML3DLightContext( + { + ::basegfx::B3DVector aVal; + SvXMLUnitConverter::convertB3DVector(aVal, sValue); +- if (!isnan(aVal.getX()) && !isnan(aVal.getY()) && !isnan(aVal.getZ())) ++ if (!rtl::math::isNan(aVal.getX()) && !rtl::math::isNan(aVal.getY()) && !rtl::math::isNan(aVal.getZ())) + { + maDirection = aVal; + } +-- +cgit v0.10.2 + diff --git a/extra/libreoffice-fresh/libreoffice-fresh.csh b/extra/libreoffice-fresh/libreoffice-fresh.csh index aad5933b6..502512189 100644 --- a/extra/libreoffice-fresh/libreoffice-fresh.csh +++ b/extra/libreoffice-fresh/libreoffice-fresh.csh @@ -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 diff --git a/extra/libreoffice-fresh/libreoffice-fresh.sh b/extra/libreoffice-fresh/libreoffice-fresh.sh index 29d32b381..7bfdcf7f6 100644 --- a/extra/libreoffice-fresh/libreoffice-fresh.sh +++ b/extra/libreoffice-fresh/libreoffice-fresh.sh @@ -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 diff --git a/extra/libreoffice-fresh/trackpad_two_finger_scroll_goes_into_reverse.diff b/extra/libreoffice-fresh/trackpad_two_finger_scroll_goes_into_reverse.diff new file mode 100644 index 000000000..9639f9b40 --- /dev/null +++ b/extra/libreoffice-fresh/trackpad_two_finger_scroll_goes_into_reverse.diff @@ -0,0 +1,34 @@ +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 +0000 +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 +