From owner-svn-ports-all@freebsd.org Thu Jul 16 00:33:43 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 0CE643749B2; Thu, 16 Jul 2020 00:33:43 +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 4B6ZxL6Kxwz3STZ; Thu, 16 Jul 2020 00:33:42 +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 BD5811FAB0; Thu, 16 Jul 2020 00:33:42 +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 06G0Xgw7042531; Thu, 16 Jul 2020 00:33:42 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06G0XgI6042528; Thu, 16 Jul 2020 00:33:42 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202007160033.06G0XgI6042528@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 16 Jul 2020 00:33:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r542297 - 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: 542297 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: Thu, 16 Jul 2020 00:33:43 -0000 Author: jbeich Date: Thu Jul 16 00:33:42 2020 New Revision: 542297 URL: https://svnweb.freebsd.org/changeset/ports/542297 Log: x11-toolkits/wlroots: unbreak CONSOLEKIT after r542295 ===> Applying distribution patches for wlroots-0.11.0 1 out of 1 hunks failed--saving rejects to backend/session/meson.build.rej 1 out of 2 hunks failed--saving rejects to meson.build.rej 1 out of 1 hunks failed--saving rejects to meson_options.txt.rej ===> FAILED Applying distribution patch e8cc137111bc.patch with -p1 *** Error code 1 Modified: head/x11-toolkits/wlroots/Makefile (contents, props changed) head/x11-toolkits/wlroots/distinfo (contents, props changed) Modified: head/x11-toolkits/wlroots/Makefile ============================================================================== --- head/x11-toolkits/wlroots/Makefile Wed Jul 15 23:58:24 2020 (r542296) +++ head/x11-toolkits/wlroots/Makefile Thu Jul 16 00:33:42 2020 (r542297) @@ -45,11 +45,10 @@ OPTIONS_SUB= yes CONSOLEKIT_DESC= DRM sessions without root using ConsoleKit2 CONSOLEKIT_PATCH_SITES= https://github.com/myfreeweb/${GH_PROJECT}/commit/:ck2 -CONSOLEKIT_PATCHFILES= e8cc137111bc.patch:-p1:ck2 # see #1467 upstream +CONSOLEKIT_PATCHFILES= b59460944208.patch:-p1:ck2 # see #1467 upstream CONSOLEKIT_LIB_DEPENDS= libdbus-1.so:devel/dbus \ libconsolekit.so:sysutils/consolekit2 CONSOLEKIT_MESON_ENABLED= consolekit2 -CONSOLEKIT_BROKEN= patching fails with wlroots 0.11.0 .if make(makesum) .MAKEFLAGS: WITH+=CONSOLEKIT .endif Modified: head/x11-toolkits/wlroots/distinfo ============================================================================== --- head/x11-toolkits/wlroots/distinfo Wed Jul 15 23:58:24 2020 (r542296) +++ head/x11-toolkits/wlroots/distinfo Thu Jul 16 00:33:42 2020 (r542297) @@ -5,5 +5,5 @@ SHA256 (0fe36eb89754.patch) = a416f736df9afb7f3035488b SIZE (0fe36eb89754.patch) = 5257 SHA256 (90cb6d26877b.patch) = 4c3a87dca481a637457d7409d38ce2bcd8d52ba4a0b02cf16e09429a6d3d360d SIZE (90cb6d26877b.patch) = 3965 -SHA256 (e8cc137111bc.patch) = e0b686193a6925eedb09298e0f300aa93d4910c41dbe788a47a2699df34cfafe -SIZE (e8cc137111bc.patch) = 27737 +SHA256 (b59460944208.patch) = 8b15ed54dcec76adf231db454ece78427eeabd5466ffd180b57ec785eeb4c507 +SIZE (b59460944208.patch) = 27381