x11-servers/xwayland-devel: drop HiDPI patches to unblock updates

- Rootful HiDPI[1] introduces non-trivial conflicts to rootless HiDPI
- AUR tracks Xwayland releases, so cannot help with rebases
- Sway should probably adopt force_zero_scaling from Hyprland >= 0.27

[1] https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1197

This reverts commit 843e295cf33f9d2652c7b2e0d4ea0b2bc14e9c59.
This reverts commit dce99729d741f14bc81d941d29b70a8a7147298c.

(cherry picked from commit 2e435f459ff0a25e517011514c441c2a437ed79c)
(cherry picked from commit fbcb0d3c6b59caadf68ffa97af9e4f2125091852)
(cherry picked from commit 11eda6e334c128d5f30dccb893304b432168ca04)
(cherry picked from commit cf9a573044ba56652587a96f820a37fcaf36e428)

8 files changed, 17 insertions, 31 deletions

diff --git a/UPDATING b/UPDATING
index a8d3f2680b3d..cf5c7f3144be 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,20 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20240409:
+  AFFECTS: x11-servers/xwayland-devel
+  AUTHOR: jbeich@FreeBSD.org
+
+  xwayland-devel has dropped HiDPI patches thus currently incompatible
+  with stable/legacy versions of wlroots. Only affects builds when
+  /usr/local/bin/Xwayland is already installed. Doesn't affect
+  hyprland and sway-devel or non-wlroots compositors.
+
+  If you use portmaster:
+    # portmaster -o x11-servers/xwayland-devel x11-servers/xwayland
+  If you use portupgrade:
+    # portupgrade -o x11-servers/xwayland-devel x11-servers/xwayland
+
 20240408:
   AFFECTS: users of databases/p5-DBD-mysql
   AUTHOR: flo@FreeBSD.org
diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile
index 9da9a0919f15..1760c0f0f277 100644
--- a/x11-servers/xwayland-devel/Makefile
+++ b/x11-servers/xwayland-devel/Makefile
@@ -2,14 +2,10 @@ PORTNAME=	xwayland
 DISTVERSIONPREFIX=	xorg-server-
 DISTVERSION=	21.0.99.1-841
 DISTVERSIONSUFFIX=	-g052909ab9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-servers
 PKGNAMESUFFIX=	-devel
 
-PATCH_SITES+=	https://github.com/mirror/${GL_PROJECT}/commit/:github
-PATCHFILES+=	cd6c9c1246af.patch:-p1:github # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
-PATCHFILES+=	91b97b031290.patch:-p1:github # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
-PATCHFILES+=	3b0d1a3a2296.patch:-p1:github # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
 PATCH_SITES+=	${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/
 PATCHFILES+=	96798fc19674.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1463
 PATCHFILES+=	3e77295f888c.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1463
diff --git a/x11-servers/xwayland-devel/distinfo b/x11-servers/xwayland-devel/distinfo
index b09bfbb6aed1..5d3e616b8444 100644
--- a/x11-servers/xwayland-devel/distinfo
+++ b/x11-servers/xwayland-devel/distinfo
@@ -1,12 +1,6 @@
 TIMESTAMP = 1710808655
 SHA256 (xserver-xorg-server-21.0.99.1-841-g052909ab9.tar.bz2) = a5913f854f0d3035cf3c750ee2ddb0f9fd2573daaa1cb47ddc4f0c63b2367a50
 SIZE (xserver-xorg-server-21.0.99.1-841-g052909ab9.tar.bz2) = 3697834
-SHA256 (cd6c9c1246af.patch) = a50fd4511793a53cacefbca2c8436cf43d36ce21d245aadb5d17e16653580d75
-SIZE (cd6c9c1246af.patch) = 3730
-SHA256 (91b97b031290.patch) = 8e44f24c34d598cc152173d2d59cc6eb7d3ac3427819c732f0fc069de8aaf0c6
-SIZE (91b97b031290.patch) = 18382
-SHA256 (3b0d1a3a2296.patch) = 4e2c4165e9e287ed42cbb9a30eedf1a10f0fcbae0db6a222feb1783f9bb2ed29
-SIZE (3b0d1a3a2296.patch) = 2513
 SHA256 (96798fc19674.patch) = 8b59b74f09476bb44d7b425dc2453b54766db4b7d30e20e1b1f1bef4ad0db7c1
 SIZE (96798fc19674.patch) = 1467
 SHA256 (3e77295f888c.patch) = 33686bbf6ecec42d064b4066b13f79f9e32f86d4ceef819ebdb7567f326fbd7d
diff --git a/x11-toolkits/wlroots-devel/Makefile b/x11-toolkits/wlroots-devel/Makefile
index a86318aac239..6e22292c74f9 100644
--- a/x11-toolkits/wlroots-devel/Makefile
+++ b/x11-toolkits/wlroots-devel/Makefile
@@ -1,13 +1,10 @@
 PORTNAME=	wlroots
 DISTVERSION=	0.17.0-255
 DISTVERSIONSUFFIX=	-g50eae512d9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 PKGNAMESUFFIX=	-devel
 
-PATCH_SITES+=	https://github.com/swaywm/${GL_PROJECT}/commit/:github
-PATCHFILES+=	10f80a8f1bb2.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064
-PATCHFILES+=	3196c73d487f.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064
 PATCH_SITES+=	${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/x11-toolkits/wlroots-devel/distinfo b/x11-toolkits/wlroots-devel/distinfo
index aed8495f1655..43a21f47e7c6 100644
--- a/x11-toolkits/wlroots-devel/distinfo
+++ b/x11-toolkits/wlroots-devel/distinfo
@@ -1,7 +1,3 @@
 TIMESTAMP = 1709983277
 SHA256 (wlroots-0.17.0-255-g50eae512d9.tar.bz2) = 7b2500218c92dbdc364b8af293d533cf99600692f74bce501e6d469b54fa207c
 SIZE (wlroots-0.17.0-255-g50eae512d9.tar.bz2) = 454568
-SHA256 (10f80a8f1bb2.patch) = ca65f8eecf32e7364d5ba43cd9ee91060710a6fb8392892c86ad71e4f2a4c0b5
-SIZE (10f80a8f1bb2.patch) = 6097
-SHA256 (3196c73d487f.patch) = 69c6bc4658852bb45a24b129f625a7faaed8035dab0d79c388ae74d650beacdc
-SIZE (3196c73d487f.patch) = 4243
diff --git a/x11-wm/sway-devel/Makefile b/x11-wm/sway-devel/Makefile
index a11127ece23d..a5182c2fc303 100644
--- a/x11-wm/sway-devel/Makefile
+++ b/x11-wm/sway-devel/Makefile
@@ -1,13 +1,10 @@
 PORTNAME=	sway
 DISTVERSION=	1.9-103 # git rev-list --count 1.9..
 DISTVERSIONSUFFIX=	-g2e951163c
+PORTREVISION=	1
 CATEGORIES=	x11-wm wayland
 PKGNAMESUFFIX=	-devel
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	15575bf1c085.patch:-p1 # https://github.com/swaywm/sway/pull/5090
-PATCHFILES+=	1f1c83e83a1a.patch:-p1 # https://github.com/swaywm/sway/pull/5090
-
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	i3-compatible Wayland compositor (development snapshot)
 WWW=		https://swaywm.org/
diff --git a/x11-wm/sway-devel/distinfo b/x11-wm/sway-devel/distinfo
index 7af6b8dc16eb..f090f7be272b 100644
--- a/x11-wm/sway-devel/distinfo
+++ b/x11-wm/sway-devel/distinfo
@@ -1,7 +1,3 @@
 TIMESTAMP = 1709981262
 SHA256 (swaywm-sway-1.9-103-g2e951163c_GH0.tar.gz) = b99f9c59e309f29a4c80a3ee797de1bd497ed3e0657c8d4b0f0d423a35c496a8
 SIZE (swaywm-sway-1.9-103-g2e951163c_GH0.tar.gz) = 5573915
-SHA256 (15575bf1c085.patch) = 5f704c5001fd09d2ffeda81c22627d4c1c5cac0db0a0ddeaf59a6b99a6b56ddd
-SIZE (15575bf1c085.patch) = 9070
-SHA256 (1f1c83e83a1a.patch) = 59d24c7e69a871d92b65095c46fc994900440453064dd70ffc7de2f0ff728655
-SIZE (1f1c83e83a1a.patch) = 2701
diff --git a/x11-wm/sway-devel/pkg-message b/x11-wm/sway-devel/pkg-message
index c0888f1f4cb7..6a2347801f07 100644
--- a/x11-wm/sway-devel/pkg-message
+++ b/x11-wm/sway-devel/pkg-message
@@ -3,10 +3,6 @@
   message: <<EOM
 Notes:
 - sway(1) can use mac_priority(4) to avoid stutter during high load
-
-Experimental features:
-- HiDPI support for X11 applications. For instructions see
-  https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064#note_1139855
 EOM
 }
 ]