Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 19 Jul 2020 18:58:24 +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: r542593 - head/x11-wm/phoc
Message-ID:  <202007191858.06JIwOjF092632@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sun Jul 19 18:58:24 2020
New Revision: 542593
URL: https://svnweb.freebsd.org/changeset/ports/542593

Log:
  x11-wm/phoc: update upstream patches
  
  Restored support for wlroots < 0.11.0.

Modified:
  head/x11-wm/phoc/Makefile   (contents, props changed)
  head/x11-wm/phoc/distinfo   (contents, props changed)

Modified: head/x11-wm/phoc/Makefile
==============================================================================
--- head/x11-wm/phoc/Makefile	Sun Jul 19 18:43:53 2020	(r542592)
+++ head/x11-wm/phoc/Makefile	Sun Jul 19 18:58:24 2020	(r542593)
@@ -6,8 +6,8 @@ DISTVERSION=	0.4.0
 CATEGORIES=	x11-wm
 
 PATCH_SITES=	${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/
-PATCHFILES+=	c7bbf4fcf917.diff:-p1 # https://source.puri.sm/Librem5/phoc/-/merge_requests/153
-PATCHFILES+=	8e132eb25297.diff:-p1 # https://source.puri.sm/Librem5/phoc/-/merge_requests/153
+PATCHFILES+=	a40585b442c3.diff:-p1 # https://source.puri.sm/Librem5/phoc/-/merge_requests/153
+PATCHFILES+=	70ddc4d677fd.diff:-p1 # https://source.puri.sm/Librem5/phoc/-/merge_requests/153
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Phone compositor
@@ -37,10 +37,5 @@ GLIB_SCHEMAS=	sm.puri.phoc.gschema.xml
 post-extract:
 # Avoid confusing Meson instead of forcing -Dembed-wlroots=disabled
 	@${RMDIR} ${WRKSRC}/subprojects/wlroots
-.if defined(PATCHFILES) && ${PATCHFILES:Mc7bbf4fcf917*}
-# Pretend to be a regular file for vendor patch to apply as is
-	@${ECHO_CMD} "Subproject commit 59f7adfe2977c3cb27a8def72c0d9fc2f2926c6d" \
-		>${WRKSRC}/subprojects/wlroots
-.endif
 
 .include <bsd.port.mk>

Modified: head/x11-wm/phoc/distinfo
==============================================================================
--- head/x11-wm/phoc/distinfo	Sun Jul 19 18:43:53 2020	(r542592)
+++ head/x11-wm/phoc/distinfo	Sun Jul 19 18:58:24 2020	(r542593)
@@ -1,7 +1,7 @@
 TIMESTAMP = 1593529103
 SHA256 (Librem5-phoc-cfc76a129d0b51c1f04f8eee73ef82a37ef9d769_GL0.tar.gz) = b7ead12ffaac0027c3c713240a239c2a2e13486e3d74791e58494c9643dbfb44
 SIZE (Librem5-phoc-cfc76a129d0b51c1f04f8eee73ef82a37ef9d769_GL0.tar.gz) = 132198
-SHA256 (c7bbf4fcf917.diff) = 5cfa281265b1c583ca8e8ee3e996e1f37f7297601e3a269ea18af22a52116a40
-SIZE (c7bbf4fcf917.diff) = 872
-SHA256 (8e132eb25297.diff) = 7c159cb218ba70be36175b2b4789e409302a1a5c9eb8163d69df9a147f86c8c4
-SIZE (8e132eb25297.diff) = 1348
+SHA256 (a40585b442c3.diff) = 525d8d4ad26dbeb4c16d6d221ac0e241e8fe98fbd1b8ef2dfc193d5ff69d09fd
+SIZE (a40585b442c3.diff) = 824
+SHA256 (70ddc4d677fd.diff) = 3da0f03e959b572664b168ffc25985d75f2b4621d723e579d8edb518ff8831ac
+SIZE (70ddc4d677fd.diff) = 1411



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007191858.06JIwOjF092632>