Date: Wed, 28 Oct 2020 14:41:54 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r553547 - head/x11-toolkits/wlroots Message-ID: <202010281441.09SEfsnh099428@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Wed Oct 28 14:41:54 2020 New Revision: 553547 URL: https://svnweb.freebsd.org/changeset/ports/553547 Log: 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 Modified: head/x11-toolkits/wlroots/Makefile (contents, props changed) Modified: head/x11-toolkits/wlroots/Makefile ============================================================================== --- head/x11-toolkits/wlroots/Makefile Wed Oct 28 14:41:50 2020 (r553546) +++ head/x11-toolkits/wlroots/Makefile Wed Oct 28 14:41:54 2020 (r553547) @@ -44,6 +44,8 @@ CONSOLEKIT_PATCHFILES= b59460944208.patch:-p1:ck2 # ht 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010281441.09SEfsnh099428>