[libreoffice] 01/01: debian/patches/fix-includes-in-aarch64-bridge.patch: add from master

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-6.0
in repository libreoffice.

commit f90fc62c0b088e0add213bb09641ab63ff5a05e2
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Nov 27 23:06:25 2017 +0100

    debian/patches/fix-includes-in-aarch64-bridge.patch: add from master
---
 changelog                                    |  3 ++
 patches/fix-includes-in-aarch64-bridge.patch | 70 ++++++++++++++++++++++++++++
 patches/series                               |  1 +
 3 files changed, 74 insertions(+)

diff --git a/changelog b/changelog
index e17723a..823b7ff 100644
--- a/changelog
+++ b/changelog
@@ -4,6 +4,9 @@ libreoffice (1:6.0.0~beta1-2) UNRELEASED; urgency=medium
     debian/shell-lib-lool.sh: add trigger updating LOOLs systemplate
   * debian/libreoffice-common.triggers.in: switch to interest-noawait triggers
 
+  * merge from Ubuntu:
+    - debian/patches/fix-includes-in-aarch64-bridge.patch: add from master
+
  -- Rene Engelhard <rene at debian.org>  Mon, 27 Nov 2017 21:41:01 +0100
 
 libreoffice (1:6.0.0~beta1-1) experimental; urgency=medium
diff --git a/patches/fix-includes-in-aarch64-bridge.patch b/patches/fix-includes-in-aarch64-bridge.patch
new file mode 100644
index 0000000..45e0c79
--- /dev/null
+++ b/patches/fix-includes-in-aarch64-bridge.patch
@@ -0,0 +1,70 @@
+From 897c07bda2d116bcc2fa4a64c1eb75a52651c991 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Sun, 26 Nov 2017 16:04:25 +0100
+Subject: [PATCH] fix includes in aarch64 bridge
+
+Change-Id: Ia27f15483c27bc43a3cd3a74432f15fa928ad6da
+---
+ bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx                 | 2 +-
+ bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx | 2 +-
+ bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx             | 2 +-
+ bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx             | 4 ++--
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
+index fa6ffebfbc17..da22eb436b8f 100644
+--- a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
++++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
+@@ -38,7 +38,7 @@
+ #include <uno/any2.h>
+ #include <uno/mapping.h>
+ 
+-#include <abi.hxx>
++#include "abi.hxx"
+ #include <osl/mutex.hxx>
+ #include <unordered_map>
+ 
+diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx b/bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx
+index 09f7696cfb4a..2f7188ea4f99 100644
+--- a/bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx
++++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx
+@@ -24,7 +24,7 @@
+ #include <sal/types.h>
+ #include <sal/alloca.h>
+ 
+-#include <callvirtualfunction.hxx>
++#include "callvirtualfunction.hxx"
+ 
+ void callVirtualFunction(
+     unsigned long function, unsigned long * gpr, unsigned long * fpr,
+diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx
+index 3d8eea4503e9..d867a04dd299 100644
+--- a/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx
++++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx
+@@ -40,7 +40,7 @@
+ #include <types.hxx>
+ #include <vtablefactory.hxx>
+ 
+-#include <abi.hxx>
++#include "abi.hxx"
+ 
+ extern "C" void vtableSlotCall_();
+ 
+diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx
+index 4e7d69b0a871..8faccbf3edaf 100644
+--- a/bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx
++++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx
+@@ -42,8 +42,8 @@
+ #include <uno/any2.h>
+ #include <uno/data.h>
+ 
+-#include <abi.hxx>
+-#include <callvirtualfunction.hxx>
++#include "abi.hxx"
++#include "callvirtualfunction.hxx"
+ 
+ namespace {
+ 
+-- 
+2.14.1
+
diff --git a/patches/series b/patches/series
index e3d0b7f..fdf594d 100644
--- a/patches/series
+++ b/patches/series
@@ -32,3 +32,4 @@ cppunit-optional.diff
 disable-unused-test-programs.diff
 disable-tests-somehow-needing-more-fonts.diff
 tdf108963-test.diff
+fix-includes-in-aarch64-bridge.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git