diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2020-10-28 14:41:54 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2020-10-28 14:41:54 +0000 |
| commit | d04a1f3e79ecd9e50b0ad3390c582531b2ed4dd4 (patch) | |
| tree | 70770ac9002ba9e5366bef63e2aec1f089021aa7 | |
| parent | x11-toolkits/wlroots: adjust X11 identation to match other options (diff) | |
x11-toolkits/wlroots: reject CONSOLEKIT + LIBSEAT
===> Applying distribution patches for wlroots-0.11.0_2
1 out of 3 hunks failed--saving rejects to backend/session/session.c.rej
2 out of 2 hunks failed--saving rejects to meson.build.rej
===> FAILED Applying distribution patch bad1e9afa8ea.patch with -p1
| -rw-r--r-- | x11-toolkits/wlroots/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/x11-toolkits/wlroots/Makefile b/x11-toolkits/wlroots/Makefile index 759017469eda..279de2f0b834 100644 --- a/x11-toolkits/wlroots/Makefile +++ b/x11-toolkits/wlroots/Makefile @@ -44,6 +44,8 @@ CONSOLEKIT_PATCHFILES= b59460944208.patch:-p1:ck2 # https://github.com/swaywm/wl CONSOLEKIT_LIB_DEPENDS= libdbus-1.so:devel/dbus \ libconsolekit.so:sysutils/consolekit2 CONSOLEKIT_MESON_ENABLED= consolekit2 +CONSOLEKIT_PREVENTS= LIBSEAT +CONSOLEKIT_PREVENTS_MSG=CONSOLEKIT and LIBSEAT patches cannot be applied together .if make(makesum) .MAKEFLAGS: WITH+=CONSOLEKIT .endif |