49cb564d14
* par 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
```
18 lines
799 B
Diff
18 lines
799 B
Diff
--- a/project.py 2020-09-27 14:28:27.338774698 +0700
|
|
+++ b/project.py 2020-09-27 14:28:29.317795099 +0700
|
|
@@ -51,6 +51,15 @@
|
|
_QOpenGLFunctions_2_1, _QOpenGLFunctions_4_1_Core,
|
|
_QOpenGLFunctions_ES2, pylupdate, pyrcc]
|
|
|
|
+ def run_command(self, args, *, fatal=True):
|
|
+ """ Run a command and display the output if requested. """
|
|
+ qemu_machine = os.environ.get("XBPS_TARGET_QEMU_MACHINE")
|
|
+ builddir = os.environ.get("XBPS_BUILDDIR")
|
|
+ if qemu_machine and args[0].startswith(os.path.join(builddir, "PyQt5")):
|
|
+ qemu = "qemu-{}-static".format(qemu_machine)
|
|
+ args.insert(0, qemu)
|
|
+ super().run_command(args, fatal=fatal)
|
|
+
|
|
def apply_user_defaults(self, tool):
|
|
""" Set default values where needed. """
|
|
|