7fc9190f0e
* gcc is kept at -Np0, because of void-cross
```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
```
23 lines
887 B
Diff
23 lines
887 B
Diff
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -94,19 +94,8 @@ if xdmcp_dep.found() and get_option('tcp-wrappers')
|
|
libwrap_dep = cc.find_library('libwrap')
|
|
endif
|
|
# systemd
|
|
-systemd_dep = dependency('systemd')
|
|
libsystemd_dep = dependency('libsystemd')
|
|
-if meson.version().version_compare('>= 0.53')
|
|
- systemd_multiseat_x = find_program('systemd-multi-seat-x',
|
|
- required: false,
|
|
- dirs: [
|
|
- systemd_dep.get_pkgconfig_variable('systemdutildir'),
|
|
- '/lib/systemd',
|
|
- '/usr/lib/systemd',
|
|
- ])
|
|
-else
|
|
- systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
|
|
-endif
|
|
+systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
|
|
systemd_x_server = systemd_multiseat_x.found()? systemd_multiseat_x.path() : '/lib/systemd/systemd-multi-seat-x'
|
|
# Plymouth
|
|
plymouth_dep = dependency('ply-boot-client', required: get_option('plymouth'))
|