svn commit: r545175 - branches/2020Q3/x11/libX11

[Niclas Zeising]

Author: zeising
Date: Mon Aug 17 17:01:51 2020
New Revision: 545175
URL: https://svnweb.freebsd.org/changeset/ports/545175

Log:
  MFH: r543914 r544154 r544630 r545155
  
  With these changes libX11 in 2020Q3 branch should be mostly up to date with
  what's in the default ports tree branch.
  
  This is needed because the amount of patches fixing various issues started to
  pile up, and it was hard to merge the needed patches one by one.
  
  x11/libX11: Update to 1.6.10
  
  Update x11/libX11 to 1.6.10.
  Changelog:
  https://lists.x.org/archives/xorg-announce/2020-July/003052.html
  
  PR:		248409
  Submitted by:	VVD
  
  x11/libX11: Fix regression after security fixes
  
  Add an upstream patch that fixes regressions after the last round of
  security updates, and the update to 1.6.10.
  This regression causes issues with emacs, at least.
  
  Reported by:	Kevin Oberman
  
  x11/libX11: Update to 1.6.11
  
  Update x11/libX11 to 1.6.11.
  This is effectively a noop, since the only change between 1.6.10 and 1.6.11
  has already been included in the port.
  Bump the version anyway to keep things up to date.
  
  x11/libX11: Fix regression with inputh methods
  
  Add an upstream patch to fix regressions with input metods, where input
  method clients can't connect to the input method server. [1]
  While here, add a patch that removes register keywords and fixes compiles
  against libX11 headers with C++17.
  
  PR:		248549 [1]
  Reported by:	Atsuo Ohki
  
  Approved by:	ports-secteam (joenum)

Modified:
  branches/2020Q3/x11/libX11/Makefile
  branches/2020Q3/x11/libX11/distinfo
Directory Properties:
  branches/2020Q3/   (props changed)

Modified: branches/2020Q3/x11/libX11/Makefile
==============================================================================
--- branches/2020Q3/x11/libX11/Makefile	Mon Aug 17 17:00:24 2020	(r545174)
+++ branches/2020Q3/x11/libX11/Makefile	Mon Aug 17 17:01:51 2020	(r545175)
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	libX11
-PORTVERSION=	1.6.9
-PORTREVISION=	3
+PORTVERSION=	1.6.11
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11
 
@@ -11,11 +11,8 @@ MAINTAINER=	x11 at FreeBSD.org
 COMMENT=	X11 library
 
 PATCH_SITES=	https://gitlab.freedesktop.org/xorg/lib/libx11/-/commit/
-PATCHFILES=	0e6561efcfaa0ae7b5c74eac7e064b76d687544e.diff:-p1
-PATCHFILES+=	388b303c62aa35a245f1704211a023440ad2c488.diff:-p1
-PATCHFILES+=	2fcfcc49f3b1be854bb9085993a01d17c62acf60.diff:-p1
-PATCHFILES+=	1a566c9e00e5f35c1f9e7f3d741a02e5170852b2.diff:-p1
-PATCHFILES+=	1703b9f3435079d3c6021e1ee2ec34fd4978103d.diff:-p1
+PATCHFILES+=	6dd618e5ea8e7558dd8e99a2777ab7b69211789c.diff:-p1
+PATCHFILES+=	d15c24c8b44be5e4054c8ecd0ff9dcf2c8e18e5b.diff:-p1
 
 LICENSE=	MIT
 

Modified: branches/2020Q3/x11/libX11/distinfo
==============================================================================
--- branches/2020Q3/x11/libX11/distinfo	Mon Aug 17 17:00:24 2020	(r545174)
+++ branches/2020Q3/x11/libX11/distinfo	Mon Aug 17 17:01:51 2020	(r545175)
@@ -1,13 +1,7 @@
-TIMESTAMP = 1596290430
-SHA256 (xorg/lib/libX11-1.6.9.tar.bz2) = 9cc7e8d000d6193fa5af580d50d689380b8287052270f5bb26a5fb6b58b2bed1
-SIZE (xorg/lib/libX11-1.6.9.tar.bz2) = 2283814
-SHA256 (xorg/lib/0e6561efcfaa0ae7b5c74eac7e064b76d687544e.diff) = 9ad45b12018b914a03db18773d6a98bada3b0bcdae652b32a6015d85ed2abb1f
-SIZE (xorg/lib/0e6561efcfaa0ae7b5c74eac7e064b76d687544e.diff) = 1638
-SHA256 (xorg/lib/388b303c62aa35a245f1704211a023440ad2c488.diff) = 94132d3b1b3fa43c6e8a6c1ae465b4565eef6e3f0b50e94351b8f40d17bbc1c7
-SIZE (xorg/lib/388b303c62aa35a245f1704211a023440ad2c488.diff) = 1917
-SHA256 (xorg/lib/2fcfcc49f3b1be854bb9085993a01d17c62acf60.diff) = 71ac3ec3e27a48a2d08ad11a3f3654dd0452e51c2ee3f21a16a7ddeb041f85bb
-SIZE (xorg/lib/2fcfcc49f3b1be854bb9085993a01d17c62acf60.diff) = 854
-SHA256 (xorg/lib/1a566c9e00e5f35c1f9e7f3d741a02e5170852b2.diff) = 1a85e3b4bd56248be5a5a373dda6f3985af60de8b8d784db1406a583d1a24091
-SIZE (xorg/lib/1a566c9e00e5f35c1f9e7f3d741a02e5170852b2.diff) = 4297
-SHA256 (xorg/lib/1703b9f3435079d3c6021e1ee2ec34fd4978103d.diff) = 8b002aa51e1eb0ac7d435e078c9104ce47f1327bffa29e5bece93af8b4cdd27f
-SIZE (xorg/lib/1703b9f3435079d3c6021e1ee2ec34fd4978103d.diff) = 443
+TIMESTAMP = 1597657392
+SHA256 (xorg/lib/libX11-1.6.11.tar.bz2) = b1cc4b802058be7e3fb438ee2490f66fcc52ac3b2a14f47a22cbf77638e33606
+SIZE (xorg/lib/libX11-1.6.11.tar.bz2) = 2389687
+SHA256 (xorg/lib/6dd618e5ea8e7558dd8e99a2777ab7b69211789c.diff) = 9e3ebb781e985372f0b10db41898873049d50094aeea58884b150ebce27b68f8
+SIZE (xorg/lib/6dd618e5ea8e7558dd8e99a2777ab7b69211789c.diff) = 1011
+SHA256 (xorg/lib/d15c24c8b44be5e4054c8ecd0ff9dcf2c8e18e5b.diff) = f0e637d850a24116c0abf7b45eff3bc926caef5df17b2664aef81c03f792bdf4
+SIZE (xorg/lib/d15c24c8b44be5e4054c8ecd0ff9dcf2c8e18e5b.diff) = 463