mirror of
https://abf.rosa.ru/djam/wine.git
synced 2025-02-23 14:22:46 +00:00
39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
diff -ur wine-staging-4.5/patches/gitapply.sh wine-staging-4.5_patched/patches/gitapply.sh
|
|
--- wine-staging-4.5/patches/gitapply.sh 2019-03-30 08:02:54.000000000 +0300
|
|
+++ wine-staging-4.5_patched/patches/gitapply.sh 2019-03-31 14:34:17.458722634 +0300
|
|
@@ -309,6 +309,7 @@
|
|
patch_binary_size=""
|
|
|
|
tmpoffset=$((hdroffset - 1))
|
|
+ sed -n "$offset,$tmpoffset p" "$tmpfile" > patch_export.txt
|
|
while IFS= read -r line; do
|
|
if [ "$line" == "GIT binary patch" ]; then
|
|
patch_is_binary=1
|
|
@@ -332,7 +333,8 @@
|
|
patch_binary_size="${BASH_REMATCH[2]}"
|
|
|
|
fi
|
|
- done < <(sed -n "$offset,$tmpoffset p" "$tmpfile")
|
|
+ done < patch_export.txt
|
|
+ rm -f patch_export.txt
|
|
|
|
# Remove first path components, which are always a/ and b/ for git patches
|
|
if [[ "$patch_oldname" =~ ^a/(.*)$ ]]; then
|
|
@@ -426,6 +428,7 @@
|
|
patch_binary_complete=0
|
|
patch_binary_destsize=0
|
|
|
|
+ hexdump -v -e '32/1 "%02X" "\n"' "$delta_tmpfile" | gawk "$awk_decode_binarypatch" > patch_export.txt
|
|
while read cmd arg1 arg2; do
|
|
if [ "$cmd" == "S" ]; then
|
|
[ "$arg1" -eq "$(filesize "$patch_oldname")" ] || break
|
|
@@ -441,7 +444,8 @@
|
|
patch_binary_complete=1
|
|
|
|
else break; fi
|
|
- done < <(hexdump -v -e '32/1 "%02X" "\n"' "$delta_tmpfile" | gawk "$awk_decode_binarypatch")
|
|
+ done < patch_export.txt
|
|
+ rm -f patch_export.txt
|
|
|
|
rm "$delta_tmpfile"
|
|
|