[patch] wine-1.7.34.patch

wine-1.7.34.patch (text/plain), 2.82 KB, created by Adam Feldman on 2015-01-14 03:48:31 UTC

--- wine-1.7.33-r5.ebuild	2015-01-13 22:32:12.458978751 -0500
+++ wine-1.7.34.ebuild	2015-01-13 22:41:29.084981808 -0500
@@ -26,6 +26,7 @@
 GV="2.34"
 MV="4.5.4"
 STAGING_P="wine-staging-${PV}"
+STAGING_DIR="${WORKDIR}/${STAGING_P}"
 WINE_GENTOO="wine-gentoo-2013.06.24"
 DESCRIPTION="Free implementation of Windows(tm) on Unix"
 HOMEPAGE="http://www.winehq.org/"
@@ -303,7 +304,7 @@
 		if use staging || use pulseaudio; then
 			EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
 			unset ${PN}_LIVE_REPO;
-			EGIT_CHECKOUT_DIR=${WORKDIR}/${STAGING_P} git-r3_src_unpack
+			EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
 		fi
 	else
 		unpack ${MY_P}.tar.bz2
@@ -317,16 +318,13 @@
 
 src_prepare() {
 	local md5="$(md5sum server/protocol.def)"
-	local f
 	local PATCHES=(
 		"${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726
 		"${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
 		"${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
 		"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
 	)
-	local STAGING_MAKE_ARGS="-W fonts-Missing_Fonts.ok"
 
-	use pipelight || STAGING_MAKE_ARGS="${STAGING_MAKE_ARGS} -W Pipelight.ok"
 	if use gstreamer; then
 		# See http://bugs.winehq.org/show_bug.cgi?id=30557
 		ewarn "Applying experimental patch to fix GStreamer support. Note that"
@@ -339,23 +337,24 @@
 		ewarn "by Wine developers. Please don't report bugs to Wine bugzilla"
 		ewarn "unless you can reproduce them with USE=-staging"
 
-		# epatch doesn't support binary patches and we ship our own pulse patches
-		emake -C "${WORKDIR}/${STAGING_P}/patches" \
-			$(echo ${STAGING_MAKE_ARGS}) \
-		    series
-
-		PATCHES+=( $(sed -e "s:^:${WORKDIR}/${STAGING_P}/patches/:" \
-		    "${WORKDIR}/${STAGING_P}/patches/series") )
-
-		# epatch doesn't support binary patches
-		ebegin "Applying Wine-Staging font patches"
-		for f in "${WORKDIR}/${STAGING_P}/patches/fonts-Missing_Fonts"/*.patch; do
-			"../${STAGING_P}/debian/tools/gitapply.sh" < "${f}" \
-			    || die "Failed to apply ${f}"
-		done
-		eend
+		# Apply temporary patch to wine-staging to allow for epatch as a backend to wine-staging's new patch script
+		pushd "${STAGING_DIR}"
+		epatch "${FILESDIR}"/wine-staging-gentoo-epatch-support.patch
+		popd
+
+		local STAGING_EXCLUDE=""
+		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
+
+		# Launch wine-staging patcher in a subshell, using epatch as a backend, and gitapply.sh as a backend for binary patches
+		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 $?
 	elif use pulseaudio; then
-		PATCHES+=( "../${STAGING_P}/patches/winepulse-PulseAudio_Support"/*.patch )
+		PATCHES+=( "${STAGING_DIR}/patches/winepulse-PulseAudio_Support"/*.patch )
 	fi
 	autotools-utils_src_prepare