aboutsummaryrefslogtreecommitdiff
path: root/x11/libX11
diff options
context:
space:
mode:
authorNiclas Zeising <zeising@FreeBSD.org>2020-08-17 10:51:02 +0000
committerNiclas Zeising <zeising@FreeBSD.org>2020-08-17 10:51:02 +0000
commit945c3c663d60109b005dac7dab6b1f380d3718ab (patch)
tree080748396f7b4d4c17c74e7e8690c1ad4531fec7 /x11/libX11
parent28d671234f206b28f9096ea91f14da01c3d911f0 (diff)
downloadports-945c3c663d60109b005dac7dab6b1f380d3718ab.tar.gz
ports-945c3c663d60109b005dac7dab6b1f380d3718ab.zip
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 MFH: 2020Q3
Notes
Notes: svn path=/head/; revision=545155
Diffstat (limited to 'x11/libX11')
-rw-r--r--x11/libX11/Makefile5
-rw-r--r--x11/libX11/distinfo6
2 files changed, 10 insertions, 1 deletions
diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index 5d6b50e13799..16ef6b46e834 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -3,12 +3,17 @@
PORTNAME= libX11
PORTVERSION= 1.6.11
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= X11 library
+PATCH_SITES= https://gitlab.freedesktop.org/xorg/lib/libx11/-/commit/
+PATCHFILES+= 6dd618e5ea8e7558dd8e99a2777ab7b69211789c.diff:-p1
+PATCHFILES+= d15c24c8b44be5e4054c8ecd0ff9dcf2c8e18e5b.diff:-p1
+
LICENSE= MIT
USES= cpe perl5 xorg xorg-cat:lib
diff --git a/x11/libX11/distinfo b/x11/libX11/distinfo
index 8cb4ed050d33..9cfbb1613abd 100644
--- a/x11/libX11/distinfo
+++ b/x11/libX11/distinfo
@@ -1,3 +1,7 @@
-TIMESTAMP = 1597078364
+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