mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2025-03-19 00:21:40 +00:00
extra/libreoffice-fresh to 5.1.1-1
This commit is contained in:
parent
dc483cd9d6
commit
dda3dbf35e
2 changed files with 7 additions and 45 deletions
|
@ -10,9 +10,9 @@ highmem=1
|
|||
|
||||
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/"
|
||||
|
@ -65,7 +65,6 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
|
|||
${_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
|
||||
|
@ -96,11 +95,11 @@ noextract=(boost_1_59_0.tar.bz2
|
|||
libfreehand-0.1.1.tar.bz2
|
||||
185d60944ea767075d27247c3162b3bc-unowinreg.dll)
|
||||
validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build@documentfoundation.org>
|
||||
md5sums=('a0cbe7fe9368e35068bd619281380379'
|
||||
md5sums=('5354a6172015603ba057a2fbbfc9977e'
|
||||
'SKIP'
|
||||
'e24d7920ef9fc36f977ebb954173fd43'
|
||||
'c4bde6b9f65eea1b0d7e6dc73537cdab'
|
||||
'SKIP'
|
||||
'76495173c3e7a74f4aa53198d8bb99e5'
|
||||
'4cfbacd4328863aaf08107e7d3b329a7'
|
||||
'SKIP'
|
||||
'6aa9a5c6a4ca1016edd0ed1178e3cb87'
|
||||
'1f24ab1d39f4a51faf22244c94a6203f'
|
||||
|
@ -133,7 +132,6 @@ md5sums=('a0cbe7fe9368e35068bd619281380379'
|
|||
'dcb5ad3e5f7139227677ea064b075422'
|
||||
'4195735a80876ae812fca5736b50192a'
|
||||
'e7e4b3e70e99e5cba8f8dfcacf3b0d87'
|
||||
'265b68b894c5a30eb66c25e7c08c87b6'
|
||||
'97dac0a03bbcaa4ee29f262dbcb4b427')
|
||||
|
||||
prepare() {
|
||||
|
@ -155,9 +153,6 @@ 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
|
||||
|
||||
|
@ -172,6 +167,7 @@ prepare() {
|
|||
|
||||
# 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
|
||||
|
|
|
@ -1,34 +0,0 @@
|
|||
From b083afac2f0531bacd790cb3ac25353f9a02db5d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
||||
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
|
||||
|
Loading…
Reference in a new issue