Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 13 Apr 2021 19:46:12 GMT
From:      Emmanuel Vadot <manu@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: 23351ba6e55b - 2021Q2 - x11/xorg-server: Update to 1.20.11
Message-ID:  <202104131946.13DJkC8B040149@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2021Q2 has been updated by manu:

URL: https://cgit.FreeBSD.org/ports/commit/?id=23351ba6e55bcf0d23c53bec5575168871c8403d

commit 23351ba6e55bcf0d23c53bec5575168871c8403d
Author:     Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2021-04-13 15:48:22 +0000
Commit:     Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2021-04-13 19:45:50 +0000

    x11/xorg-server: Update to 1.20.11
    
    Changes: https://lists.x.org/archives/xorg/2021-April/060678.html
    (cherry picked from commit fdd94741382f7962682630fe7f03f7652c898e79)
---
 x11-servers/xorg-server/Makefile | 7 +------
 x11-servers/xorg-server/distinfo | 6 +++---
 x11-servers/xwayland/Makefile    | 1 -
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index be716b7147aa..940a4400fb36 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -1,8 +1,7 @@
 # Created by: Eric Anholt <anholt@FreeBSD.org>
 
 PORTNAME?=	xorg-server
-PORTVERSION?=	1.20.9
-PORTREVISION?=	3
+PORTVERSION?=	1.20.11
 PORTEPOCH?=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	XORG/individual/xserver
@@ -11,10 +10,6 @@ DISTNAME=	xorg-server-${PORTVERSION}
 MAINTAINER=	x11@FreeBSD.org
 COMMENT?=	X.Org X server and related programs
 
-PATCH_SITES=	https://gitlab.freedesktop.org/xorg/xserver/-/commit/
-PATCHFILES+=	06d1a032ee491547f7037c3ff042065dc2aeaa99.diff:-p1
-PATCHFILES+=	7ccb3b0eabb4658daf0ecb2c78a53609ae2c263b.diff:-p1
-
 LICENSE=	MIT
 
 RUN_DEPENDS+=	xkeyboard-config>=2.5:x11/xkeyboard-config \
diff --git a/x11-servers/xorg-server/distinfo b/x11-servers/xorg-server/distinfo
index 9e9fae901e26..e0ffd2e4de8d 100644
--- a/x11-servers/xorg-server/distinfo
+++ b/x11-servers/xorg-server/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1606845198
-SHA256 (xorg/xserver/xorg-server-1.20.9.tar.bz2) = e219f2e0dfe455467939149d7cd2ee53b79b512cc1d2094ae4f5c9ed9ccd3571
-SIZE (xorg/xserver/xorg-server-1.20.9.tar.bz2) = 6302902
+TIMESTAMP = 1618327364
+SHA256 (xorg/xserver/xorg-server-1.20.11.tar.bz2) = 914c796e3ffabe1af48071d40ccc85e92117c97a9082ed1df29e4d64e3c34c49
+SIZE (xorg/xserver/xorg-server-1.20.11.tar.bz2) = 6476116
 SHA256 (xorg/xserver/06d1a032ee491547f7037c3ff042065dc2aeaa99.diff) = 2e0f1027e56e1512f659dc5cc48400de9bea722e516b05498a7c6a4130f09f55
 SIZE (xorg/xserver/06d1a032ee491547f7037c3ff042065dc2aeaa99.diff) = 3867
 SHA256 (xorg/xserver/7ccb3b0eabb4658daf0ecb2c78a53609ae2c263b.diff) = 5f0996f07af30d6d55713def544aa4b3280909ed91a36cd495ca2ace517b328b
diff --git a/x11-servers/xwayland/Makefile b/x11-servers/xwayland/Makefile
index 8d537e938f1b..7512c1b85ad1 100644
--- a/x11-servers/xwayland/Makefile
+++ b/x11-servers/xwayland/Makefile
@@ -1,6 +1,5 @@
 
 PORTNAME=	xwayland
-PORTREVISION=	2
 
 COMMENT=	X Clients under Wayland
 



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