pacman: use git apply for patches

so we don't depend on a git commiter being set
This commit is contained in:
Christoph Reiter 2022-02-09 19:26:57 +01:00
parent 7e7680cc65
commit b4759e37f1
2 changed files with 4 additions and 4 deletions

View File

@ -95,11 +95,11 @@ sha256sums=('SKIP'
'c28e00baa470ba9849c5fa98c646e869bf5b6b3afa183c0cd88826fc26ed9a9a'
'7aa85f11fb929a0234b228354ae1f6135567d77bfaf424340bd1afc65fadc1b4')
apply_git_am_with_msg() {
apply_git_with_msg() {
for _patch in "$@"
do
msg2 "Applying $_patch"
git am --committer-date-is-author-date "${srcdir}/${_patch}"
git apply "${srcdir}/${_patch}"
done
}
@ -110,7 +110,7 @@ prepare() {
git config core.symlinks true
git reset HEAD --hard
apply_git_am_with_msg 0001-Msysize.patch \
apply_git_with_msg 0001-Msysize.patch \
0002-More-debugging-info.patch \
0003-Core-update.patch \
0004-Remove-ldconfig.patch \

View File

@ -60,7 +60,7 @@ die "Could not stage new patch set"
in_sources="$(echo "$patches" | sed "{s/^/ /;:1;N;s/\\n/\\\\n /;b1}")"
in_prepare="$(echo "$patches" | tr '\n' '\\' | sed -e 's/\\$//' -e 's/\\/ &&&n /g')"
sed -i -e "/^ 0.*\.patch$/{:1;N;/[^)]$/b1;s|.*|$in_sources)|}" \
-e "/^ *apply_git_am_with_msg /{:2;N;/[^}]$/b2;s|.*| apply_git_am_with_msg $in_prepare\\n\\}|}" \
-e "/^ *apply_git_with_msg /{:2;N;/[^}]$/b2;s|.*| apply_git_with_msg $in_prepare\\n\\}|}" \
PKGBUILD ||
die "Could not update the patch set in PKGBUILD"