srcpkgs/r*: convert patches to -Np1
* runit 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
```
2021-06-19 05:03:21 +02:00
|
|
|
--- a/src/cpp/core/HtmlUtils.cpp 2021-02-11 00:26:02.000000000 +0100
|
|
|
|
|
+++ b/src/cpp/core/HtmlUtils.cpp 2021-02-11 00:26:02.000000000 +0100
|
2021-05-30 14:50:36 +02:00
|
|
|
@@ -17,6 +17,7 @@
|
|
|
|
|
|
|
|
|
|
#include <core/system/System.hpp>
|
|
|
|
|
|
|
|
|
|
+#include <boost/bind/bind.hpp>
|
|
|
|
|
#include <boost/format.hpp>
|
|
|
|
|
#include <boost/algorithm/string/predicate.hpp>
|
|
|
|
|
|
srcpkgs/r*: convert patches to -Np1
* runit 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
```
2021-06-19 05:03:21 +02:00
|
|
|
--- a/src/cpp/core/file_lock/FileLock.cpp 2021-02-11 00:26:02.000000000 +0100
|
|
|
|
|
+++ b/src/cpp/core/file_lock/FileLock.cpp 2021-02-11 00:26:02.000000000 +0100
|
2021-05-30 14:50:36 +02:00
|
|
|
@@ -26,6 +26,7 @@
|
|
|
|
|
#include <core/system/Environment.hpp>
|
|
|
|
|
#include <core/system/Xdg.hpp>
|
|
|
|
|
|
|
|
|
|
+#include <boost/bind/bind.hpp>
|
|
|
|
|
#include <boost/algorithm/string.hpp>
|
|
|
|
|
|
|
|
|
|
// borrowed from SessionConstants.hpp
|
