ae69000001
* arduino and antiword is kept at -Np0
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
30 lines
1 KiB
Diff
30 lines
1 KiB
Diff
--- a/src/parsley.cpp
|
|
+++ b/src/parsley.cpp
|
|
@@ -4585,10 +4585,11 @@
|
|
#if defined(_MSC_VER)
|
|
fpos_t file_offset = dest_position + file_pos;
|
|
#elif defined(__GLIBC__)
|
|
- fpos_t file_offset = {0};
|
|
+ fpos_t file_offset = {0};
|
|
file_offset.__pos = dest_position + file_pos;
|
|
#else
|
|
- off_t file_offset = dest_position + file_pos;
|
|
+ fpos_t file_offset = {0};
|
|
+ *(uint64_t*) &file_offset = dest_position + file_pos;
|
|
#endif
|
|
fsetpos(dest_file, &file_offset);
|
|
fwrite(buffer, (size_t)max_buffer, 1, dest_file);
|
|
@@ -4601,10 +4601,11 @@
|
|
#if defined(_MSC_VER)
|
|
fpos_t file_offset = dest_position + file_pos;
|
|
#elif defined(__GLIBC__)
|
|
- fpos_t file_offset = {0};
|
|
+ fpos_t file_offset = {0};
|
|
file_offset.__pos = dest_position + file_pos;
|
|
#else
|
|
- off_t file_offset = dest_position + file_pos;
|
|
+ fpos_t file_offset = {0};
|
|
+ *(uint64_t*) &file_offset = dest_position + file_pos;
|
|
#endif
|
|
fsetpos(dest_file, &file_offset );
|
|
fwrite(buffer, (size_t)(src_file_size - file_pos), 1, dest_file);
|