On 15/02/17 05:55, Andreas Damm wrote:
From: Andreas Damm andreas@insightsoftware.com
dlls/odbc32/proxyodbc.c | 108 +++++++++++++++++++++++----------------------- include/sql.h | 36 ++++++++-------- include/sqlext.h | 22 +++++----- 3 files changed, 83 insertions(+), 83 deletions(-)
~/wine$ patch -p1 < [PATCH]\ Made\ ODBC\ function\ signatures\ 64-bit\ compliant.txt
This fails to apply against git.
patching file dlls/odbc32/proxyodbc.c Hunk #11 succeeded at 1095 with fuzz 2. Hunk #14 succeeded at 1408 with fuzz 2. Hunk #15 succeeded at 1420 with fuzz 2. Hunk #16 succeeded at 1445 with fuzz 2. Hunk #19 succeeded at 1546 with fuzz 2. Hunk #29 succeeded at 2412 with fuzz 2. patching file include/sql.h Hunk #1 FAILED at 506. Hunk #7 FAILED at 669. 2 out of 11 hunks FAILED -- saving rejects to file include/sql.h.rej patching file include/sqlext.h Hunk #1 FAILED at 1455. Hunk #2 FAILED at 1472. Hunk #3 FAILED at 1515. Hunk #5 FAILED at 1578. Hunk #6 succeeded at 1629 with fuzz 1. 4 out of 6 hunks FAILED -- saving rejects to file include/sqlext.h.rej
Best Regards Alistair Leslie-Hughes
Just tried it after a fresh clone (git clone git://source.winehq.org/git/wine.git)
No issues. Am I using the wrong branch? Could you send the reject files?
Andreas.
On 2/14/2017 1:54 PM, Alistair Leslie-Hughes wrote:
On 15/02/17 05:55, Andreas Damm wrote:
From: Andreas Damm andreas@insightsoftware.com
dlls/odbc32/proxyodbc.c | 108 +++++++++++++++++++++++----------------------- include/sql.h | 36 ++++++++-------- include/sqlext.h | 22 +++++----- 3 files changed, 83 insertions(+), 83 deletions(-)
~/wine$ patch -p1 < [PATCH]\ Made\ ODBC\ function\ signatures\ 64-bit\ compliant.txt
This fails to apply against git.
patching file dlls/odbc32/proxyodbc.c Hunk #11 succeeded at 1095 with fuzz 2. Hunk #14 succeeded at 1408 with fuzz 2. Hunk #15 succeeded at 1420 with fuzz 2. Hunk #16 succeeded at 1445 with fuzz 2. Hunk #19 succeeded at 1546 with fuzz 2. Hunk #29 succeeded at 2412 with fuzz 2. patching file include/sql.h Hunk #1 FAILED at 506. Hunk #7 FAILED at 669. 2 out of 11 hunks FAILED -- saving rejects to file include/sql.h.rej patching file include/sqlext.h Hunk #1 FAILED at 1455. Hunk #2 FAILED at 1472. Hunk #3 FAILED at 1515. Hunk #5 FAILED at 1578. Hunk #6 succeeded at 1629 with fuzz 1. 4 out of 6 hunks FAILED -- saving rejects to file include/sqlext.h.rej
Best Regards Alistair Leslie-Hughes
Disclaimer: This message contains confidential information and is intended only for the individual named. If you are not the named addressee you should not disseminate, distribute or copy this email. Please notify the sender immediately by email if you have received this email by mistake and delete this email from your system. Our company accepts no liability for the content of this email, or for the consequences of any actions taken on the basis of the information provided. Any views or opinions presented in this email are solely those of the author and do not necessarily represent those of the company. Finally, the recipient should check this email and any attachments for the presence of viruses. The company accepts no liability for any damage caused by any virus transmitted by this email. Hubble® is a brand name of the insightsoftware.com Group. insightsoftware.com is a registered trademark of insightsoftware.com Limited, registered in England No. 2860790 at 4th Floor, International House, 7 High Street, Ealing, London. W5 5DB. United Kingdom. VAT Number: GB 766 8160 95. Hubble is a registered trademark of insightsoftware.com International Unlimited, registered in Isle of Man No. 005199V at 8 St George's Street, Douglas. Isle of Man. IM1 1AH. VAT Number: IE 9823 609 M
Failing here too:
$ curl https://source.winehq.org/patches/data/130221 | git am % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed 100 30515 100 30515 0 0 62631 0 --:--:-- --:--:-- --:--:-- 62530 Applying: Made ODBC function signatures 64-bit compliant error: patch failed: dlls/odbc32/proxyodbc.c:1095 error: dlls/odbc32/proxyodbc.c: patch does not apply error: patch failed: include/sql.h:506 error: include/sql.h: patch does not apply error: patch failed: include/sqlext.h:1455 error: include/sqlext.h: patch does not apply Patch failed at 0001 Made ODBC function signatures 64-bit compliant The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort".
-Alex
-
Alex Henrie -
Alistair Leslie-Hughes -
Andreas Damm