4f75cf25fd
```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
```
13 lines
705 B
Diff
13 lines
705 B
Diff
Try to include <asm/page.h> only if __GLIBC__ is defined also.
|
|
|
|
--- a/unix/Xvnc/programs/Xserver/Xext/xf86bigfont.c 2014-07-20 02:45:59.000000000 +0200
|
|
+++ b/unix/Xvnc/programs/Xserver/Xext/xf86bigfont.c 2015-09-01 10:28:30.171432632 +0200
|
|
@@ -40,7 +40,7 @@
|
|
|
|
#include <sys/types.h>
|
|
#ifdef HAS_SHM
|
|
-#if defined(linux) && (!defined(__GNU_LIBRARY__) || __GNU_LIBRARY__ < 2)
|
|
+#if defined(linux) && (!defined(__GNU_LIBRARY__) || __GNU_LIBRARY__ < 2) && defined(__GLIBC__)
|
|
/* libc4 does not define __GNU_LIBRARY__, libc5 defines __GNU_LIBRARY__ as 1 */
|
|
/* Linux libc4 and libc5 only (because glibc doesn't include kernel headers):
|
|
Linux 2.0.x and 2.2.x define SHMLBA as PAGE_SIZE, but forget to define
|