This is an automated email from the git hooks/post-receive script. jreyer-guest pushed a commit to branch master in repository wine.
commit 8f500cfa3a51e1317c793a13a1867b51fe41f627 Author: Jens Reyer <[email protected]> Date: Fri Jan 19 18:04:28 2018 +0100 Drop armel.patch, applied upstream. --- debian/patches/armel.patch | 18 ------------------ debian/patches/series | 1 - 2 files changed, 19 deletions(-) diff --git a/debian/patches/armel.patch b/debian/patches/armel.patch deleted file mode 100644 index 8993e3f..0000000 --- a/debian/patches/armel.patch +++ /dev/null @@ -1,18 +0,0 @@ -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 265a97f..b231ecf 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -24,4 +24,3 @@ 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 _______________________________________________ pkg-wine-party mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-wine-party
