Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!

Bug 536378

Summary: >=app-emulation/wine-1.7.34 - wine-staging changes its patch application process
Product: Gentoo Linux Reporter: Adam Feldman <np-hardass>
Component: Current packagesAssignee: Wine Maintainers <wine>
Status: RESOLVED FIXED    
Severity: normal    
Priority: Normal    
Version: unspecified   
Hardware: All   
OS: Linux   
Whiteboard:
Package list:
Runtime testing required: ---
Bug Depends on:    
Bug Blocks: 536192, 536380    
Attachments: wine-staging-gentoo-epatch-support.patch

Description Adam Feldman gentoo-dev 2015-01-12 02:29:11 UTC
Reference: https://github.com/wine-compholio/wine-staging/wiki/Packaging

Excerpt:
> In the past we were using a Makefile to apply our patchset, but this method is deprecated in Wine 1.7.34 and greater - it turned out that this method was just not flexible enough when the number of patches increased. Instead we're now providing a script which can be used to do the same.
> ./patches/patchinstall.sh DESTDIR="$(pwd)" --all -W DIRNAME

Previously, we used a makefile target to get a serialized list of patches that we passed to epatch, however, they have no deprecated that in favor of a patch script.  I'm currently working with the wine-staging folks to see if we can make it portage friendly.
Comment 1 Adam Feldman gentoo-dev 2015-01-12 12:34:28 UTC
So, I've worked with the wine-staging guys, and we incorporated epatch functionality into the wine-staging patch script.

The meat is:

ebegin "Running Wine-Staging patch installer"
(
	set -- DESTDIR="${S}" --backend=epatch --all ${STAGING_EXCLUDE}
	cd "${STAGING_DIR}/patches"
	source "${STAGING_DIR}/patches/patchinstall.sh"
)
eend $?

Way simpler than the previous setup.  Now, 1.7.34 needs to manually be patched because this update to their system supporting epatch happened after their 1.7.35 tag, but 9999 and >1.7.34 are good to go.

For 1.7.34
pushd "${STAGING_DIR}"
epatch "${FILESDIR}"/wine-staging-gentoo-epatch-support.patch
popd

I'll be attaching the full ebuild/patch to bug #536380
Comment 2 Adam Feldman gentoo-dev 2015-01-12 12:35:21 UTC
Created attachment 393772 [details, diff]
wine-staging-gentoo-epatch-support.patch