srcpkgs/d*: convert patches to -Np1
* daemontools and dmraid 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 10:03:21 +07:00
|
|
|
--- a/qtools/qdatetime.cpp 2020-01-03 23:51:18.000000000 +0100
|
|
|
|
|
+++ b/qtools/qdatetime.cpp 2020-12-02 10:48:03.245635836 +0100
|
2021-02-15 11:54:06 +01:00
|
|
|
@@ -35,7 +35,6 @@
|
|
|
|
|
**
|
|
|
|
|
**********************************************************************/
|
|
|
|
|
|
|
|
|
|
-#define gettimeofday __hide_gettimeofday
|
|
|
|
|
#include "qdatetime.h"
|
|
|
|
|
#include "qdatastream.h"
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
@@ -55,8 +54,6 @@
|
|
|
|
|
#elif defined(_OS_UNIX_) || defined(_OS_MAC_)
|
|
|
|
|
#include <sys/time.h>
|
|
|
|
|
#include <unistd.h>
|
|
|
|
|
-#undef gettimeofday
|
|
|
|
|
-extern "C" int gettimeofday( struct timeval *, struct timezone * );
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
static const uint FIRST_DAY = 2361222; // Julian day for 1752/09/14
|
