986c0a7d5e
```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
```
65 lines
1.7 KiB
Diff
65 lines
1.7 KiB
Diff
--- a/Makefile.am 2019-10-30 06:50:34.000000000 -0400
|
|
+++ b/Makefile.am 2019-10-30 09:10:08.542128891 -0400
|
|
@@ -139,15 +139,15 @@
|
|
if DBUS_POLICY
|
|
dbus_datadir = @DBUS_DATADIR@/dbus-1/system.d
|
|
dist_dbus_data_DATA =
|
|
+
|
|
+dbus_busdir = @DBUS_BUSDIR@
|
|
+dbus_bus_DATA =
|
|
endif
|
|
|
|
if SYSTEMD_SERVICE
|
|
systemd_unitdir = @SYSTEMD_UNITDIR@
|
|
systemd_unit_DATA =
|
|
|
|
-dbus_busdir = @DBUS_BUSDIR@
|
|
-dbus_bus_DATA =
|
|
-
|
|
systemd_networkdir = @SYSTEMD_NETWORKDIR@
|
|
systemd_network_DATA =
|
|
|
|
@@ -244,13 +244,13 @@
|
|
|
|
if DBUS_POLICY
|
|
dist_dbus_data_DATA += src/iwd-dbus.conf
|
|
+dbus_bus_DATA += src/net.connman.iwd.service
|
|
endif
|
|
|
|
if SYSTEMD_SERVICE
|
|
src_iwd_DEPENDENCIES += src/iwd.service
|
|
|
|
systemd_unit_DATA += src/iwd.service
|
|
-dbus_bus_DATA += src/net.connman.iwd.service
|
|
|
|
systemd_network_DATA += src/80-iwd.link
|
|
endif
|
|
@@ -320,13 +320,13 @@
|
|
|
|
if DBUS_POLICY
|
|
dist_dbus_data_DATA += wired/ead-dbus.conf
|
|
+dbus_bus_DATA += wired/net.connman.ead.service
|
|
endif
|
|
|
|
if SYSTEMD_SERVICE
|
|
wired_ead_DEPENDENCIES += wired/ead.service
|
|
|
|
systemd_unit_DATA += wired/ead.service
|
|
-dbus_bus_DATA += wired/net.connman.ead.service
|
|
endif
|
|
|
|
if MANUAL_PAGES
|
|
diff --git configure.ac configure.ac
|
|
index ec0619e..13d6de4 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -188,7 +188,7 @@ AM_CONDITIONAL(SYSTEMD_SERVICE, test "${enable_systemd_service}" != "no")
|
|
AC_ARG_WITH([dbus-busdir], AC_HELP_STRING([--with-dbus-busdir=DIR],
|
|
[path to D-Bus bus services directory]),
|
|
[path_dbus_busdir=${withval}])
|
|
-if (test "${enable_systemd_service}" != "no" && test -z "${path_dbus_busdir}"); then
|
|
+if (test -z "${path_dbus_busdir}"); then
|
|
AC_MSG_CHECKING([D-Bus bus services directory])
|
|
path_dbus_busdir="`$PKG_CONFIG --variable=system_bus_services_dir dbus-1`"
|
|
if (test -z "${path_dbus_busdir}"); then
|
|
|