4b97cd2fb4
```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
```
11 lines
424 B
Diff
11 lines
424 B
Diff
--- a/configure.ac 2017-05-20 09:50:30.146864516 +0000
|
|
+++ b/configure.ac 2017-05-20 09:51:26.216792794 +0000
|
|
@@ -336,7 +336,7 @@
|
|
[HAVE_UUID=yes],
|
|
[HAVE_UUID=no])
|
|
|
|
-AM_PATH_CPPUNIT([1.10.0], [HAVE_CPPUNIT=yes])
|
|
+PKG_CHECK_MODULES([CPPUNIT], [cppunit], [HAVE_CPPUNIT=yes], [HAVE_CPPUNIT=no])
|
|
AM_CONDITIONAL([USE_UNIT_TESTS], [test -n "$HAVE_CPPUNIT"])
|
|
|
|
SCHROOT_CFLAGS="$UUID_CFLAGS"
|