ae69000001
* arduino and antiword 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
```
29 lines
827 B
Diff
29 lines
827 B
Diff
--- a/anki/mpv.py
|
|
+++ b/anki/mpv.py
|
|
@@ -104,9 +104,9 @@
|
|
"""
|
|
self.argv = [self.executable]
|
|
self.argv += self.default_argv
|
|
- self.argv += ["--input-ipc-server", self._sock_filename]
|
|
+ self.argv += ["--input-ipc-server="+self._sock_filename]
|
|
if self.window_id is not None:
|
|
- self.argv += ["--wid", str(self.window_id)]
|
|
+ self.argv += ["--wid="+str(self.window_id)]
|
|
|
|
def _start_process(self):
|
|
"""Start the mpv process.
|
|
|
|
--- a/anki/sound.py
|
|
+++ b/anki/sound.py
|
|
@@ -123,10 +123,7 @@
|
|
|
|
def setMpvConfigBase(base):
|
|
mpvConfPath = os.path.join(base, "mpv.conf")
|
|
- MpvManager.default_argv += [
|
|
- "--no-config",
|
|
- "--include="+mpvConfPath,
|
|
- ]
|
|
+ MpvManager.default_argv += ["--include="+mpvConfPath]
|
|
|
|
mpvManager = None
|
|
|