Summary: | ~app-emulation/wine-1.7.54 - gstreamer patch fails to apply | ||
---|---|---|---|
Product: | Gentoo Linux | Reporter: | Juergen Rose <rose> |
Component: | Current packages | Assignee: | Wine Maintainers <wine> |
Status: | RESOLVED OBSOLETE | ||
Severity: | normal | CC: | ansla80, bob.mt.wya, cornicx, email200202, ionic, matthew, mbucas, rossi.f, scott, yuriy |
Priority: | Normal | ||
Version: | unspecified | ||
Hardware: | All | ||
OS: | Linux | ||
URL: | http://source.winehq.org/git/wine.git/commit/a1515c68d4d4b4334f44b098debba2548a16ca38 | ||
Whiteboard: | |||
Package list: | Runtime testing required: | --- | |
Attachments: | wine-1.7.34-gstreamer-v5.patch.out |
Description
Juergen Rose
2015-11-16 06:38:11 UTC
*** Bug 565970 has been marked as a duplicate of this bug. *** The Patch has a change for loader/Makefile.in in it that should substitute the first line. However, this line got removed in wine-1.7.55 and the patch fails. I am currently trying to build wine after doing this: 1.: ebuild ebuild /usr/portage/app-emulation/wine/wine-1.7.55.ebuild clean unpack 2.: Re-add the wanted line "EXTRALIBS = $(PTHREAD_LIBS)" in loader/Makefile.in 3.: ebuild ebuild /usr/portage/app-emulation/wine/wine-1.7.55.ebuild merge It runs currently, and adding pthread should not be an issue although the loader might not need (and thus use) it any more. Damn copy&paste issues... Of course the "ebuild" command is only used once. Fixed: 1.: ebuild /usr/portage/app-emulation/wine/wine-1.7.55.ebuild clean unpack 2.: Re-add the wanted line "EXTRALIBS = $(PTHREAD_LIBS)" in loader/Makefile.in 3.: ebuild /usr/portage/app-emulation/wine/wine-1.7.55.ebuild merge Sorry! 'emerge -uvDN world' fails with the same error for wine-1.7.55. Thanks for the report. I've shot an email out to the patch author to see how he thinks it should be amended. I would prefer that to fixing it here as we could become divergent. Referenced is the upstream commit that overhauled the loader/Makefile.in file, resulting in patch application failure. *** Bug 566172 has been marked as a duplicate of this bug. *** Today, 'emerge -uvDN world' tries to install wine-1.7.55 and failed. If this version can not be installed due to a "confirmed" bug, should it be removed from the tree? I've added a new patch for >=1.7.55. I haven't had the chance to work on 1.7.54 yet though. You should probably also actually *apply* the patch by changing MY_GST in the ebuild for 1.7.55? Naturally I meant GST_P. Doing that fixes at least the patching itself. I still wait for the compile run to finish, but so far everything looks fine. Also, I should mention that I haven't tested anything related to staging. 1.7.54 has been dropped. |