3353bf4722
```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
```
21 lines
797 B
Diff
21 lines
797 B
Diff
--- a/main.c
|
|
+++ b/main.c
|
|
@@ -2654,7 +2654,7 @@ get_pty(int *pty, char *from GCC_UNUSED)
|
|
close(opened_tty);
|
|
opened_tty = -1;
|
|
}
|
|
-#elif defined(HAVE_POSIX_OPENPT) && defined(HAVE_PTSNAME) && defined(HAVE_GRANTPT_PTY_ISATTY)
|
|
+#elif defined(HAVE_POSIX_OPENPT) && defined(HAVE_PTSNAME)
|
|
if ((*pty = posix_openpt(O_RDWR)) >= 0) {
|
|
char *name = ptsname(*pty);
|
|
if (name != 0) {
|
|
@@ -3735,7 +3735,7 @@ spawnXTerm(XtermWidget xw)
|
|
/*
|
|
* now in child process
|
|
*/
|
|
-#if defined(_POSIX_SOURCE) || defined(SVR4) || defined(__convex__) || defined(__SCO__) || defined(__QNX__)
|
|
+#if defined(_POSIX_VERSION) || defined(SVR4) || defined(__convex__) || defined(__SCO__) || defined(__QNX__)
|
|
int pgrp = setsid(); /* variable may not be used... */
|
|
#else
|
|
int pgrp = getpid();
|
|
|