svn commit: r542297 - head/x11-toolkits/wlroots

[Jan Beich]

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