srcpkgs/b*: convert patches to -Np1
```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 04:18:31 +02:00
|
|
|
--- a/src/bomi/os/mac.mm 2015-05-20 11:31:58.000000000 +0200
|
|
|
|
|
+++ b/src/bomi/os/mac.mm 2021-01-16 10:51:12.701668482 +0100
|
2021-01-16 10:54:00 +01:00
|
|
|
@@ -274,7 +274,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef Q_OS_MAC
|
|
|
|
|
-#include <sys/sysctl.h>
|
|
|
|
|
+#include <linux/sysctl.h>
|
|
|
|
|
#include <mach/mach_host.h>
|
|
|
|
|
#include <mach/task.h>
|
|
|
|
|
#include <libproc.h>
|
srcpkgs/b*: convert patches to -Np1
```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 04:18:31 +02:00
|
|
|
--- a/src/bomi/os/x11.cpp 2015-05-20 11:31:58.000000000 +0200
|
|
|
|
|
+++ b/src/bomi/os/x11.cpp 2021-01-16 10:51:04.559292267 +0100
|
2021-01-16 10:54:00 +01:00
|
|
|
@@ -15,7 +15,7 @@
|
|
|
|
|
#include <fcntl.h>
|
|
|
|
|
#include <time.h>
|
|
|
|
|
#include <sys/time.h>
|
|
|
|
|
-#include <sys/sysctl.h>
|
|
|
|
|
+#include <linux/sysctl.h>
|
|
|
|
|
#include <sys/types.h>
|
|
|
|
|
#include <xcb/xcb.h>
|
|
|
|
|
#include <xcb/randr.h>
|
