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
```
29 lines
1.1 KiB
Diff
29 lines
1.1 KiB
Diff
Upstream: Pending, https://bugs.freedesktop.org/show_bug.cgi?id=105989
|
|
From 08bb656496cd3d6213bbe9473f63f2d4a110da6e Mon Sep 17 00:00:00 2001
|
|
From: Rasmus Thomsen <cogitri@exherbo.org>
|
|
Date: Wed, 11 Apr 2018 13:14:14 +0200
|
|
Subject: [PATCH] configure: fix elogind support
|
|
|
|
HAVE_LIBSYSTEMD is used to determine which source files to use.
|
|
We have to check if either have_libsystemd or have_libelogind is
|
|
true, as both of these need the source files which are used when
|
|
HAVE_LIBSYSTEMD is true.
|
|
---
|
|
configure.ac | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git configure.ac configure.ac
|
|
index 36df239..da47ecb 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -221,7 +221,7 @@ AS_IF([test "x$cross_compiling" != "xyes" ], [
|
|
|
|
AC_SUBST(LIBSYSTEMD_CFLAGS)
|
|
AC_SUBST(LIBSYSTEMD_LIBS)
|
|
-AM_CONDITIONAL(HAVE_LIBSYSTEMD, [test "$have_libsystemd" = "yes"], [Using libsystemd])
|
|
+AM_CONDITIONAL(HAVE_LIBSYSTEMD, [test "$have_libsystemd" = "yes" || test "$have_libelogind" = "yes" ], [Using libsystemd])
|
|
|
|
dnl ---------------------------------------------------------------------------
|
|
dnl - systemd unit / service files
|
|
--
|
|
2.17.0
|