mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
patchinstall.sh: Add support for eapply backend and mark epatch as deprecated (thanks NP-Hardass).
(cherry picked from commit e875860886)
This commit is contained in:
Sebastian Lackner
parent
1bf2e6fe90
commit
441bcce3db
@ -66,7 +66,8 @@ Configuration:
|
||||
|
||||
Backends:
|
||||
--backend=patch Use regular 'patch' utility to apply patches (default)
|
||||
--backend=epatch Use 'epatch' to apply patches (Gentoo only)
|
||||
--backend=eapply Use 'eapply' to apply patches (Gentoo only)
|
||||
--backend=epatch Use 'epatch' to apply patches (Gentoo only, deprecated)
|
||||
--backend=git-am Use 'git am' to apply patches
|
||||
--backend=git-apply Use 'git apply' to apply patches
|
||||
--backend=stg Import the patches using stacked git
|
||||
|
||||
@ -41,7 +41,8 @@ usage()
|
||||
echo ""
|
||||
echo "Backends:"
|
||||
echo " --backend=patch Use regular 'patch' utility to apply patches (default)"
|
||||
echo " --backend=epatch Use 'epatch' to apply patches (Gentoo only)"
|
||||
echo " --backend=eapply Use 'eapply' to apply patches (Gentoo only)"
|
||||
echo " --backend=epatch Use 'epatch' to apply patches (Gentoo only, deprecated)"
|
||||
echo " --backend=git-am Use 'git am' to apply patches"
|
||||
echo " --backend=git-apply Use 'git apply' to apply patches"
|
||||
echo " --backend=stg Import the patches using stacked git"
|
||||
@ -1196,7 +1197,7 @@ elif test ! -f "$DESTDIR/tools/make_requests"; then
|
||||
abort "DESTDIR does not point to the Wine source tree."
|
||||
fi
|
||||
|
||||
# Change directory to DESTDIR, epatch depends on that
|
||||
# Change directory to DESTDIR, eapply/epatch depends on that
|
||||
if ! cd "$DESTDIR"; then
|
||||
abort "Unable to change directory to $DESTDIR."
|
||||
fi
|
||||
@ -1311,8 +1312,8 @@ if test "$backend" = "patch"; then
|
||||
fi
|
||||
}
|
||||
|
||||
# 'epatch' backend - used on Gentoo
|
||||
elif test "$backend" = "epatch"; then
|
||||
# 'eapply/epatch' backend - used on Gentoo
|
||||
elif test "$backend" = "eapply" -o "$backend" = "epatch"; then
|
||||
|
||||
if test "$workaround_git_bug" -eq 0; then
|
||||
gitapply_args="--nogit"
|
||||
@ -1320,11 +1321,11 @@ elif test "$backend" = "epatch"; then
|
||||
gitapply_args=""
|
||||
fi
|
||||
|
||||
if ! command -v epatch >/dev/null 2>&1 || \
|
||||
! command -v ebegin >/dev/null 2>&1 || \
|
||||
! command -v eend >/dev/null 2>&1 || \
|
||||
! command -v die >/dev/null 2>&1; then
|
||||
abort "Shell functions epatch/ebegin/eend not found. You have to source this script from your ebuild."
|
||||
if ! command -v "$backend" >/dev/null 2>&1 || \
|
||||
! command -v ebegin >/dev/null 2>&1 || \
|
||||
! command -v eend >/dev/null 2>&1 || \
|
||||
! command -v nonfatal >/dev/null 2>&1; then
|
||||
abort "Shell functions $backend/ebegin/eend/nonfatal not found. You have to source this script from your ebuild."
|
||||
fi
|
||||
|
||||
if test "$enable_autoconf" -gt 1; then
|
||||
@ -1337,13 +1338,15 @@ elif test "$backend" = "epatch"; then
|
||||
_shortname="$(basename "$1")"
|
||||
if grep -q "^GIT binary patch" "$1"; then
|
||||
ebegin "Applying $_shortname"
|
||||
if ! "$patchdir/gitapply.sh" $gitapply_args < "$1"; then
|
||||
die "Failed Patch: $1!"
|
||||
"$patchdir/gitapply.sh" $gitapply_args < "$1"
|
||||
if ! eend $?; then
|
||||
exit 1
|
||||
fi
|
||||
eend
|
||||
|
||||
else
|
||||
epatch "$1" # epatch calls die upon failure
|
||||
# we are run from a subshell, so we can't call die
|
||||
if ! nonfatal "$backend" "$1"; then
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
unset _shortname
|
||||
}
|
||||
|
||||
@ -41,7 +41,8 @@ usage()
|
||||
echo ""
|
||||
echo "Backends:"
|
||||
echo " --backend=patch Use regular 'patch' utility to apply patches (default)"
|
||||
echo " --backend=epatch Use 'epatch' to apply patches (Gentoo only)"
|
||||
echo " --backend=eapply Use 'eapply' to apply patches (Gentoo only)"
|
||||
echo " --backend=epatch Use 'epatch' to apply patches (Gentoo only, deprecated)"
|
||||
echo " --backend=git-am Use 'git am' to apply patches"
|
||||
echo " --backend=git-apply Use 'git apply' to apply patches"
|
||||
echo " --backend=stg Import the patches using stacked git"
|
||||
@ -177,7 +178,7 @@ elif test ! -f "$DESTDIR/tools/make_requests"; then
|
||||
abort "DESTDIR does not point to the Wine source tree."
|
||||
fi
|
||||
|
||||
# Change directory to DESTDIR, epatch depends on that
|
||||
# Change directory to DESTDIR, eapply/epatch depends on that
|
||||
if ! cd "$DESTDIR"; then
|
||||
abort "Unable to change directory to $DESTDIR."
|
||||
fi
|
||||
@ -292,8 +293,8 @@ if test "$backend" = "patch"; then
|
||||
fi
|
||||
}}
|
||||
|
||||
# 'epatch' backend - used on Gentoo
|
||||
elif test "$backend" = "epatch"; then
|
||||
# 'eapply/epatch' backend - used on Gentoo
|
||||
elif test "$backend" = "eapply" -o "$backend" = "epatch"; then
|
||||
|
||||
if test "$workaround_git_bug" -eq 0; then
|
||||
gitapply_args="--nogit"
|
||||
@ -301,11 +302,11 @@ elif test "$backend" = "epatch"; then
|
||||
gitapply_args=""
|
||||
fi
|
||||
|
||||
if ! command -v epatch >/dev/null 2>&1 || \
|
||||
! command -v ebegin >/dev/null 2>&1 || \
|
||||
! command -v eend >/dev/null 2>&1 || \
|
||||
! command -v die >/dev/null 2>&1; then
|
||||
abort "Shell functions epatch/ebegin/eend not found. You have to source this script from your ebuild."
|
||||
if ! command -v "$backend" >/dev/null 2>&1 || \
|
||||
! command -v ebegin >/dev/null 2>&1 || \
|
||||
! command -v eend >/dev/null 2>&1 || \
|
||||
! command -v nonfatal >/dev/null 2>&1; then
|
||||
abort "Shell functions $backend/ebegin/eend/nonfatal not found. You have to source this script from your ebuild."
|
||||
fi
|
||||
|
||||
if test "$enable_autoconf" -gt 1; then
|
||||
@ -318,13 +319,15 @@ elif test "$backend" = "epatch"; then
|
||||
_shortname="$(basename "$1")"
|
||||
if grep -q "^GIT binary patch" "$1"; then
|
||||
ebegin "Applying $_shortname"
|
||||
if ! "$patchdir/gitapply.sh" $gitapply_args < "$1"; then
|
||||
die "Failed Patch: $1!"
|
||||
"$patchdir/gitapply.sh" $gitapply_args < "$1"
|
||||
if ! eend $?; then
|
||||
exit 1
|
||||
fi
|
||||
eend
|
||||
|
||||
else
|
||||
epatch "$1" # epatch calls die upon failure
|
||||
# we are run from a subshell, so we can't call die
|
||||
if ! nonfatal "$backend" "$1"; then
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
unset _shortname
|
||||
}}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user