http://bugs.winehq.org/show_bug.cgi?id=6971
Matt Chisholm matthewdchisholm@gmail.com changed:
What |Removed |Added ---------------------------------------------------------------------------- CC| |matthewdchisholm@gmail.com
--- Comment #370 from Matt Chisholm matthewdchisholm@gmail.com 2010-07-13 10:15:58 --- I'm running Mac OS X and thanks to the wonderful work of doh123 (Wineskin developer) Mac OS X users can now easily patch wine source using Terminal...I'm trying to use the Xi2 patch but I am unsure as to why I cannot successfully complete the build. What is the optimal wine source for the Xi2 patch? It shows as unspecified at the top of the page...It just hasn't worked for me (although I have patched source for, and played the STALKER series without any issues using the "dlls/dinput/mouse.c patch). I've also broken down the patch and created separate patches for every diff that is included in the new Xi2 patch...creating 10 different patches...all except 2 of the diffs give me a successful message except the "dlls/winex11.drv/winex11.drv.spec" and the "dlls/winex11.drv/x11drv_main.c" diffs which gives me an error message of a malformed line. Can anyone offer me insight on this or perhaps tell me what source this patch was written for?
This is the my Terminal input while trying to patch the 1.2rc7 source
[spoiler] can't find file to patch at input line 40 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |From 53cebc206afab1684c432a1eda224ea9f568c3cf Mon Sep 17 00:00:00 2001 |From: Vitaliy Margolen wine-patches@kievinfo.com |Date: Sat, 3 Jul 2010 07:06:46 -0600 |Subject: Dinput/x11drv: Use Xi2 extension if available. | Workaround current xorg bug that results in duplication of events. |Reply-To: wine-devel@winehq.org |X-Identity-Key: id6 |To: wine-patches@winehq.org |MIME-Version: 1.0 |Content-Type: multipart/mixed; boundary="------------1.7.1" | |This is a multi-part message in MIME format. |--------------1.7.1 |Content-Type: text/plain; charset=UTF-8; format=fixed |Content-Transfer-Encoding: 8bit | |--- | configure | 56 ++++++++ | configure.ac | 12 ++ | dlls/dinput/dinput_main.c | 47 ++++++- | dlls/dinput/mouse.c | 8 +- | dlls/winex11.drv/event.c | 3 +- | dlls/winex11.drv/mouse.c | 260 +++++++++++++++++++++++++++++++++++-- | dlls/winex11.drv/winex11.drv.spec | 2 + | dlls/winex11.drv/x11drv.h | 3 + | dlls/winex11.drv/x11drv_main.c | 1 + | include/config.h.in | 6 + | 10 files changed, 378 insertions(+), 20 deletions(-) | | |--------------1.7.1 |Content-Type: text/x-patch; name="0001-Dinput-x11drv-Use-Xi2-extension-if-available.patch" |Content-Transfer-Encoding: 8bit |Content-Disposition: attachment; filename="0001-Dinput-x11drv-Use-Xi2-extension-if-available.patch" | |diff --git a/configure b/configure |index 37b3a7d..45a3648 100755 |--- a/configure |+++ b/configure -------------------------- File to patch: wine-1.2-rc7/configure patching file wine-1.2-rc7/configure can't find file to patch at input line 114 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/configure.ac b/configure.ac |index 61f376e..74b8f88 100644 |--- a/configure.ac |+++ b/configure.ac -------------------------- File to patch: wine-1.2-rc7/configure.ac patching file wine-1.2-rc7/configure.ac can't find file to patch at input line 144 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c |index 04c62f8..c9f20d1 100644 |--- a/dlls/dinput/dinput_main.c |+++ b/dlls/dinput/dinput_main.c -------------------------- File to patch: wine-1.2-rc7/dlls/dinput/dinput_main.c patching file wine-1.2-rc7/dlls/dinput/dinput_main.c Hunk #3 succeeded at 892 (offset -46 lines). Hunk #4 succeeded at 1035 (offset -46 lines). can't find file to patch at input line 224 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c |index e05d9e2..278d8e6 100644 |--- a/dlls/dinput/mouse.c |+++ b/dlls/dinput/mouse.c -------------------------- File to patch: wine-1.2-rc7/dlls/dinput/mouse.c patching file wine-1.2-rc7/dlls/dinput/mouse.c can't find file to patch at input line 250 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c |index 8fc955a..c4b90a8 100644 |--- a/dlls/winex11.drv/event.c |+++ b/dlls/winex11.drv/event.c -------------------------- File to patch: wine-1.2-rc7/dlls/winex11.drv/event.c patching file wine-1.2-rc7/dlls/winex11.drv/event.c can't find file to patch at input line 266 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c |index cf988c9..681d20b 100644 |--- a/dlls/winex11.drv/mouse.c |+++ b/dlls/winex11.drv/mouse.c -------------------------- File to patch: wine-1.2-rc7/winex11.drv/mouse.c wine-1.2-rc7/winex11.drv/mouse.c: No such file or directory Skip this patch? [y] n File to patch: wine-1.2-rc7/dlls/winex11.drv/mouse.c patching file wine-1.2-rc7/dlls/winex11.drv/mouse.c can't find file to patch at input line 556 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec |index ab61f54..b6f85d1 100644 |--- a/dlls/winex11.drv/winex11.drv.spec |+++ b/dlls/winex11.drv/winex11.drv.spec -------------------------- File to patch: wine-1.2-rc7/winex11.drv/winex11.drv.spec wine-1.2-rc7/winex11.drv/winex11.drv.spec: No such file or directory Skip this patch? [y] n File to patch: wine-1.2-rc7/dlls/winex11.drv/winex11.drv.spec patching file wine-1.2-rc7/dlls/winex11.drv/winex11.drv.spec can't find file to patch at input line 566 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h |index 1cd610d..f52f65b 100644 |--- a/dlls/winex11.drv/x11drv.h |+++ b/dlls/winex11.drv/x11drv.h -------------------------- File to patch: wine-1.2-rc7/dlls/winex11.drv/x11drv.h patching file wine-1.2-rc7/dlls/winex11.drv/x11drv.h can't find file to patch at input line 587 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c |index b07061c..546ea7d 100644 |--- a/dlls/winex11.drv/x11drv_main.c |+++ b/dlls/winex11.drv/x11drv_main.c -------------------------- File to patch: wine-1.2-rc7/dlls/winex11.drv/x11drv_main.c patching file wine-1.2-rc7/dlls/winex11.drv/x11drv_main.c can't find file to patch at input line 599 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/include/config.h.in b/include/config.h.in |index f365fca..7b69c9f 100644 |--- a/include/config.h.in |+++ b/include/config.h.in -------------------------- File to patch: wine-1.2-rc7/include/config.h.in patching file wine-1.2-rc7/include/config.h.in Matt-Chisholms-MacBook-Pro-15:WS3CustomBuild DankOS$ ./build wine-1.2-rc7 Build environment being moved into place [/spoiler]