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
```
14 lines
806 B
Diff
14 lines
806 B
Diff
--- a/startx.cpp 2018-03-10 02:46:03.000000000 +0100
|
|
+++ b/startx.cpp 2018-03-12 20:30:43.041201031 +0100
|
|
@@ -296,9 +296,9 @@
|
|
XCOMM now add the same credentials to the client authority file
|
|
XCOMM if '$displayname' already exists do not overwrite it as another
|
|
XCOMM server may need it. Add them to the '$xserverauthfile' instead.
|
|
- for displayname in $authdisplay $hostname$authdisplay; do
|
|
+ for displayname in $authdisplay $hostname/unix$authdisplay; do
|
|
authcookie=`XAUTH list "$displayname" @@
|
|
- | sed -n "s/.*$displayname[[:space:]*].*[[:space:]*]//p"` 2>/dev/null;
|
|
+ | sed -n "s/.*$hostname\/unix$authdisplay[[:space:]*].*[[:space:]*]//p"` 2>/dev/null;
|
|
if [ "z${authcookie}" = "z" ] ; then
|
|
XAUTH -q << EOF
|
|
add $displayname . $mcookie
|