srcpkgs/q*: convert patches to -Np1
* par 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 05:03:21 +02:00
|
|
|
--- a/qmake/library/ioutils.cpp 2020-09-24 17:55:53.000000000 +0200
|
|
|
|
|
+++ b/qmake/library/ioutils.cpp 2020-09-24 17:55:53.000000000 +0200
|
2020-10-08 20:40:31 +02:00
|
|
|
@@ -40,6 +40,7 @@
|
|
|
|
|
# include <unistd.h>
|
|
|
|
|
# include <utime.h>
|
|
|
|
|
# include <fcntl.h>
|
|
|
|
|
+# include <limits.h>
|
|
|
|
|
# include <errno.h>
|
|
|
|
|
#endif
|
|
|
|
|
|
srcpkgs/q*: convert patches to -Np1
* par 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 05:03:21 +02:00
|
|
|
--- a/src/corelib/io/qstorageinfo_unix.cpp 2020-09-24 17:55:53.000000000 +0200
|
|
|
|
|
+++ b/src/corelib/io/qstorageinfo_unix.cpp 2020-09-24 17:55:53.000000000 +0200
|
2020-10-08 20:40:31 +02:00
|
|
|
@@ -58,6 +58,7 @@
|
|
|
|
|
# include <sys/vfs.h>
|
|
|
|
|
# include <mntent.h>
|
|
|
|
|
#elif defined(Q_OS_LINUX) || defined(Q_OS_HURD)
|
|
|
|
|
+# include <limits.h>
|
|
|
|
|
# include <mntent.h>
|
|
|
|
|
# include <sys/statvfs.h>
|
|
|
|
|
# include <sys/sysmacros.h>
|
