On 02/07/2020 23.33, Michele Denber wrote:
On 07/02/20 13:34, Thomas Huth wrote:
That's just the context, cut at three lines after the last change.
Simply try to apply the patch with "patch -p1 -i ..." or "git am" in a
separate git branch if you're using git. It should hopefully apply
cleanly.
Looks like it partly worked:
root@hemlock:~/qemu-5.0.0# gpatch -p1 -i < configpatch.diff
gpatch: option requires an argument -- 'i'
gpatch: Try 'gpatch --help' for more information.
root@hemlock:~/qemu-5.0.0# gpatch -p1 < configpatch.diff
patching file configure
Hunk #1 succeeded at 5049 (offset -85 lines).
Hunk #2 succeeded at 7117 (offset -267 lines).
patching file util/qemu-openpty.c
Hunk #1 FAILED at 52.
Hunk #2 succeeded at 95 with fuzz 2 (offset 2 lines).
1 out of 2 hunks FAILED -- saving rejects to file util/qemu-openpty.c.rej
root@hemlock:~/qemu-5.0.0# cat util/qemu-openpty.c.rej
--- util/qemu-openpty.c
+++ util/qemu-openpty.c
@@ -52,7 +52,8 @@
#endif
#ifdef __sun__
-/* Once Solaris has openpty(), this is going to be removed. */
+
+#if !defined(HAVE_OPENPTY)
static int openpty(int *amaster, int *aslave, char *name,
struct termios *termp, struct winsize *winp)
Did you have a local modification to that file? If so, please revert it
first before applying the patch (or add the "#if !defined(HAVE_OPENPTY)"
now manually to see whether it works).
Thanks,
Thomas
