ec4c2d75fa
```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
```
20 lines
604 B
Diff
20 lines
604 B
Diff
--- a/gconf/gconftool.c 2006-10-14 17:37:14.000000000 +0000
|
|
+++ b/gconf/gconftool.c 2006-10-14 17:39:27.000000000 +0000
|
|
@@ -963,6 +963,8 @@ main (int argc, char** argv)
|
|
|
|
gconf_engine_unref (conf);
|
|
|
|
+ g_spawn_command_line_sync ("/usr/bin/killall -q -TERM " GCONF_SERVERDIR "/" GCONFD, NULL, NULL, NULL, NULL);
|
|
+
|
|
return retval;
|
|
}
|
|
|
|
@@ -975,6 +977,8 @@ main (int argc, char** argv)
|
|
|
|
gconf_engine_unref (conf);
|
|
|
|
+ g_spawn_command_line_sync ("/usr/bin/killall -q -TERM " GCONF_SERVERDIR "/" GCONFD, NULL, NULL, NULL, NULL);
|
|
+
|
|
return retval;
|
|
}
|
|
|