49cb564d14
* par 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
```
21 lines
564 B
Diff
21 lines
564 B
Diff
--- a/conf.cpp
|
|
+++ b/conf.cpp
|
|
@@ -479,7 +479,7 @@
|
|
if (conf_scan_root != NULL)
|
|
error(EXIT_FAILURE, 0, _("--%s specified twice"),
|
|
"database-root");
|
|
- conf_scan_root = canonicalize_file_name(optarg);
|
|
+ conf_scan_root = realpath(optarg, NULL);
|
|
if (conf_scan_root == NULL)
|
|
error(EXIT_FAILURE, errno, _("invalid value `%s' of --%s"), optarg,
|
|
"database-root");
|
|
--- a/database-builder.h
|
|
+++ b/database-builder.h
|
|
@@ -3,6 +3,7 @@
|
|
|
|
#include "db.h"
|
|
|
|
+#include <unistd.h>
|
|
#include <chrono>
|
|
#include <fcntl.h>
|
|
#include <memory>
|