https://bugs.winehq.org/show_bug.cgi?id=40371
Bug ID: 40371 Summary: patchinstall fails to apply patches Product: Wine-staging Version: unspecified Hardware: x86-64 OS: Linux Status: UNCONFIRMED Severity: blocker Priority: P2 Component: -unknown Assignee: wine-bugs@winehq.org Reporter: danielbermond@yahoo.com CC: erich.e.hoover@wine-staging.com, michael@fds-team.de, sebastian@fds-team.de Distribution: ---
Created attachment 54075 --> https://bugs.winehq.org/attachment.cgi?id=54075 wine-staging git failed patch log
When building wine-staging from latest git source, patchinstall fails to apply patches and exit with message: "ERROR: Failed to apply patch, aborting!".
Versions used: wine-staging git: latest-release-37-g0a391fa (1.9.6-37-g0a391fa) wine git: wine-1.9.6-195-gd04a548 Distro: Arch Linux x86_64
Used a new git clone command for both wine-staging and wine.
It seems that some latest commits brake the patching process. Until yesterday the patches could be successfully applied in this same approach.
Log in attachment.
https://bugs.winehq.org/show_bug.cgi?id=40371
Michael Müller michael@fds-team.de changed:
What |Removed |Added ---------------------------------------------------------------------------- Resolution|--- |INVALID Status|UNCONFIRMED |RESOLVED
--- Comment #1 from Michael Müller michael@fds-team.de --- This is not really a bug. Wine Staging is a set of patches and needs to be rebased whenever there is a change in the Wine development git. Since Wine Staging is not maintained by the same person as Wine development, it is not possible to push both versions at the same time. We instead need to wait till the commits are pushed to the server before we can start rebasing the patches. First of all we don't know exactly when this happens and it might also take some time to do the rebasing. Wine Staging therefore naturally lags some hours behind the development version. For example, the patch causing the failure for you got into Wine development today and is therefore no longer necessary.
In order to prevent this problem, you can ask Wine Staging on which development version the current patches are based:
$ patches/patchinstall.sh --upstream-commit 4315caeff699325cd681b9beb7d22908b098411b
I close this bug as INVALID since we can not really solve this problem in general and the rebasing should be finished soon. In the future you just need to be a bit more patient, we usually don't forget the rebasing ;-)
https://bugs.winehq.org/show_bug.cgi?id=40371
Bermond danielbermond@yahoo.com changed:
What |Removed |Added ---------------------------------------------------------------------------- Resolution|INVALID |FIXED
--- Comment #2 from Bermond danielbermond@yahoo.com --- Michael, thank you for your very friendly answer. It was very helpful and clarifies it all. :)
With the wine upstream commit SHA1 in hand I executed the following command in wine git directory:
$ git checkout <SHA1>
It reverts back to that commit and solves my issue.
https://bugs.winehq.org/show_bug.cgi?id=40371
--- Comment #3 from Bermond danielbermond@yahoo.com --- I suggest that this information and clarification could be added to the wine-staging packaging wiki in GitHub for people that are using wine-staging git + wine git.
Thank you again.
https://bugs.winehq.org/show_bug.cgi?id=40371
Dmitry Timoshkov dmitry@baikal.ru changed:
What |Removed |Added ---------------------------------------------------------------------------- Status|RESOLVED |CLOSED Resolution|FIXED |INVALID
--- Comment #5 from Dmitry Timoshkov dmitry@baikal.ru --- Closing.
https://bugs.winehq.org/show_bug.cgi?id=40371
--- Comment #4 from Sebastian Lackner sebastian@fds-team.de --- (In reply to Bermond from comment #2)
It reverts back to that commit and solves my issue.
I'm glad that the solution works for you. I've added a couple of lines to the Wiki, which should hopefully make it a bit more clear:
https://github.com/wine-compholio/wine-staging/wiki/Packaging#failure-to-app...
-
wine-bugs＠winehq.org