ec4c2d75fa
```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
```
30 lines
754 B
Diff
30 lines
754 B
Diff
--- a/include/zeroconf-detail.hpp 2020-07-15 20:02:29.000000000 +0200
|
|
+++ b/include/zeroconf-detail.hpp 2020-07-15 20:02:29.000000000 +0200
|
|
@@ -20,9 +20,7 @@
|
|
#define WIN32_LEAN_AND_MEAN
|
|
#include <winsock2.h>
|
|
#else
|
|
- #ifndef __WXOSX__
|
|
- #include <error.h>
|
|
- #else
|
|
+ #ifdef __WXOSX__
|
|
#include <mach/error.h>
|
|
#endif
|
|
|
|
@@ -424,4 +422,4 @@
|
|
}
|
|
}
|
|
|
|
-#endif // ZEROCONF_DETAIL_HPP
|
|
\ No newline at end of file
|
|
+#endif // ZEROCONF_DETAIL_HPP
|
|
--- a/include/zeroconf-detail.hpp 2020-07-25 18:05:08.714098962 +0200
|
|
+++ b/include/zeroconf-detail.hpp 2020-07-25 18:05:08.714098962 +0200
|
|
@@ -27,6 +27,7 @@
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <sys/socket.h>
|
|
+#include <sys/time.h>
|
|
#include <netinet/in.h>
|
|
#endif
|
|
|