c6ce65d3d0
```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
```
12 lines
444 B
Diff
12 lines
444 B
Diff
--- a/src/Toolbar.cc 2020-12-13 23:57:20.285876509 +0100
|
|
+++ b/src/Toolbar.cc 2020-12-13 23:58:32.570856812 +0100
|
|
@@ -44,7 +44,7 @@
|
|
{
|
|
timeval now;
|
|
gettimeofday(&now, 0);
|
|
- return (std::max(1000l, ((((resolution - (now.tv_sec % resolution)) * 1000l))
|
|
+ return (std::max(static_cast<uint64_t>(1000l), static_cast<uint64_t>((((resolution - (now.tv_sec % resolution)) * 1000l))
|
|
- (now.tv_usec / 1000l))));
|
|
}
|
|
|