c987560802
```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
```
38 lines
840 B
Diff
38 lines
840 B
Diff
diff --git a/src/cc/error.h b/src/cc/error.h
|
|
index c1d80ab..98a4a10 100644
|
|
--- a/src/cc/error.h
|
|
+++ b/src/cc/error.h
|
|
@@ -21,6 +21,7 @@
|
|
#ifndef cc__error_h
|
|
#define cc__error_h
|
|
|
|
+#include <iostream>
|
|
#include <ccinternal>
|
|
|
|
#include <boost/exception/diagnostic_information.hpp>
|
|
diff --git a/src/cc/log.h b/src/cc/log.h
|
|
index 2b2c986..77708f5 100644
|
|
--- a/src/cc/log.h
|
|
+++ b/src/cc/log.h
|
|
@@ -21,6 +21,7 @@
|
|
#ifndef cc__log_h
|
|
#define cc__log_h
|
|
|
|
+#include <iostream>
|
|
#include <ccinternal>
|
|
|
|
#include <boost/iostreams/filtering_stream.hpp>
|
|
diff --git a/src/cc/options.h b/src/cc/options.h
|
|
index 6c45ce8..d757bfb 100644
|
|
--- a/src/cc/options.h
|
|
+++ b/src/cc/options.h
|
|
@@ -21,6 +21,8 @@
|
|
#ifndef cc__options_h
|
|
#define cc__options_h
|
|
|
|
+#include <iostream>
|
|
+
|
|
#include <ccinternal>
|
|
|
|
#include <boost/program_options/options_description.hpp>
|
|
|