[pkg-wine-party] [wine] 97/98: Add patch by upstream to fix armel build failure.

Jens Reyer jreyer-guest at moszumanska.debian.org
Thu Jan 18 21:11:05 UTC 2018


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

jreyer-guest pushed a commit to branch master
in repository wine.

commit 6620bf1d9b8c9e62860e787bb7aa871e603b8628
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Thu Jan 18 17:23:15 2018 +0100

    Add patch by upstream to fix armel build failure.
    
    Closes: #887558
---
 debian/patches/armel.patch | 18 ++++++++++++++++++
 debian/patches/series      |  1 +
 2 files changed, 19 insertions(+)

diff --git a/debian/patches/armel.patch b/debian/patches/armel.patch
new file mode 100644
index 0000000..8993e3f
--- /dev/null
+++ b/debian/patches/armel.patch
@@ -0,0 +1,18 @@
+Description: Fix armel FTBFS
+Origin: https://source.winehq.org/git/wine.git/commitdiff/3e26caf0d85caa4256edb011a6311e00cf893e3b
+Bug: https://bugs.winehq.org/show_bug.cgi?id=44365
+Bug-Debian: https://bugs.debian.org/887558
+Applied-Upstream: 3.0
+
+--- a/dlls/ntdll/relay.c
++++ b/dlls/ntdll/relay.c
+@@ -594,7 +594,8 @@ __ASM_GLOBAL_FUNC( relay_call,
+                    "mov r5, r1\n\t"
+                    "mov r0, r7\n\t"
+                    "mov r1, r8\n\t"
+-                   "strd r4, [sp]\n\t"
++                   "str r4, [sp]\n\t"
++                   "str r5, [sp, #4]\n\t"
+ #ifndef __SOFTFP__
+                    "vstr d0, [sp, #8]\n\t"  /* preserve floating point retval */
+                    "bl " __ASM_NAME("relay_trace_exit") "\n\t"
diff --git a/debian/patches/series b/debian/patches/series
index b231ecf..265a97f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -24,3 +24,4 @@ font-divbyzero.patch
 printer-resolution.patch
 
 revert_opengl46.patch
+armel.patch

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



More information about the pkg-wine-party mailing list