From owner-svn-ports-all@freebsd.org Wed Oct 28 14:41:55 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4B1004483FC; Wed, 28 Oct 2020 14:41:55 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CLrr30jVkz4DBs; Wed, 28 Oct 2020 14:41:55 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EC86C1D868; Wed, 28 Oct 2020 14:41:54 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09SEfsTe099429; Wed, 28 Oct 2020 14:41:54 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09SEfsnh099428; Wed, 28 Oct 2020 14:41:54 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202010281441.09SEfsnh099428@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 28 Oct 2020 14:41:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r553547 - head/x11-toolkits/wlroots X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/x11-toolkits/wlroots X-SVN-Commit-Revision: 553547 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Oct 2020 14:41:55 -0000 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