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

- Rootful HiDPI[1] introduces non-trivial conflicts to rootless HiDPI - AUR[2] tracks Xwayland releases, so may not help with rebases - Sway should probably adopt zero scaling from Mir/KWin/Hyprland - Xwayland usage has reduced since 2020 [1] https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1197 [2] https://aur.archlinux.org/packages/xorg-xwayland-hidpi-xprop This reverts commit 466f3a1. This reverts commit 843e295. This reverts commit dce9972. PR: 278495 Approved by: manu
freebsd · May 15, 2024 · fe76e5d · fe76e5d
1 parent c3f1423
commit fe76e5d
Show file tree

Hide file tree

Showing 18 changed files with 7 additions and 89 deletions.
diff --git a/UPDATING b/UPDATING
@@ -84,20 +84,6 @@ you update your ports collection, before attempting any port upgrades.
   See also the installation and upgrade manual for more details.
   https://gitlab.fechner.net/mfechner/Gitlab-docu/-/blob/master/install/16.11-freebsd.md
 
-20240409:
-  AFFECTS: x11-servers/xwayland-devel
-  AUTHOR: [email protected]
-
-  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: [email protected]

diff --git a/x11-servers/xwayland/Makefile b/x11-servers/xwayland/Makefile
@@ -1,14 +1,10 @@
 PORTNAME=	xwayland
 PORTVERSION=	23.2.7
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	XORG/individual/xserver
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	cd6c9c1246af.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
-PATCHFILES+=	707c37b7ab9e.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
-PATCHFILES+=	3b0d1a3a2296.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
-
 MAINTAINER=	[email protected]
 COMMENT=	X11 server as Wayland client
 WWW=		https://wayland.freedesktop.org/xserver.html

diff --git a/x11-servers/xwayland/distinfo b/x11-servers/xwayland/distinfo
@@ -1,9 +1,3 @@
 TIMESTAMP = 1715754215
 SHA256 (xwayland-23.2.7.tar.xz) = 769e5133929ca4a4141d8e8d34dbbceea1dceaa93cf7a0b90ad7e76965e40055
 SIZE (xwayland-23.2.7.tar.xz) = 1295016
-SHA256 (cd6c9c1246af.patch) = a50fd4511793a53cacefbca2c8436cf43d36ce21d245aadb5d17e16653580d75
-SIZE (cd6c9c1246af.patch) = 3730
-SHA256 (707c37b7ab9e.patch) = db8a2acbc8b8ceeeef0c6aa4b06b632ef074b1319194cc9794e3ae715062e425
-SIZE (707c37b7ab9e.patch) = 18662
-SHA256 (3b0d1a3a2296.patch) = 4e2c4165e9e287ed42cbb9a30eedf1a10f0fcbae0db6a222feb1783f9bb2ed29
-SIZE (3b0d1a3a2296.patch) = 2513
diff --git a/x11-toolkits/wlroots/Makefile b/x11-toolkits/wlroots/Makefile
@@ -1,10 +1,8 @@
 PORTNAME=	wlroots
 DISTVERSION=	0.17.3
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 
-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=	[email protected]

diff --git a/x11-toolkits/wlroots/distinfo b/x11-toolkits/wlroots/distinfo
@@ -1,7 +1,3 @@
 TIMESTAMP = 1714156372
 SHA256 (wlroots-0.17.3.tar.bz2) = b916d9574367373d42334ea12ea3cead27ebc3b8de3bea375619e537d86b0757
 SIZE (wlroots-0.17.3.tar.bz2) = 453887
-SHA256 (10f80a8f1bb2.patch) = ca65f8eecf32e7364d5ba43cd9ee91060710a6fb8392892c86ad71e4f2a4c0b5
-SIZE (10f80a8f1bb2.patch) = 6097
-SHA256 (3196c73d487f.patch) = 69c6bc4658852bb45a24b129f625a7faaed8035dab0d79c388ae74d650beacdc
-SIZE (3196c73d487f.patch) = 4243
diff --git a/x11-toolkits/wlroots015/Makefile b/x11-toolkits/wlroots015/Makefile
@@ -1,12 +1,9 @@
 PORTNAME=	wlroots
 DISTVERSION=	0.15.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits
 PKGNAMESUFFIX=	015
 
-PATCH_SITES+=	https://github.com/swaywm/${GL_PROJECT}/commit/:github
-PATCHFILES+=	7c0e2a271a4c.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064
-PATCHFILES+=	55a8d225cf8c.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064
 PATCH_SITES+=	https://source.puri.sm/Librem5/${PORTNAME}/-/commit/:purism
 PATCHFILES+=	21bc0ec09200.patch:-p1:purism # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3475
 PATCH_SITES+=	${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/

diff --git a/x11-toolkits/wlroots015/distinfo b/x11-toolkits/wlroots015/distinfo
@@ -1,10 +1,6 @@
 TIMESTAMP = 1643923194
 SHA256 (wlroots-0.15.1.tar.bz2) = 8bb791aed9405abc20253c570de1a3b7af91ad65bee2b60293fbbab27ea62c8d
 SIZE (wlroots-0.15.1.tar.bz2) = 423138
-SHA256 (7c0e2a271a4c.patch) = 2b92d3dde7640061ed85ab1690031f7627bebc2366e8c4da217017188ba7195e
-SIZE (7c0e2a271a4c.patch) = 5729
-SHA256 (55a8d225cf8c.patch) = f9df98540fdabe35c61ed828f6d64633aab72edf0ba1c7ad0849594f10383ce7
-SIZE (55a8d225cf8c.patch) = 4209
 SHA256 (21bc0ec09200.patch) = bb5e4727c4cce2878c353ad329ae28523d2f229f3301bee15bb4ac243742986a
 SIZE (21bc0ec09200.patch) = 1188
 SHA256 (dd03d839ab56.patch) = 458f31cf2515fb075c33a947a5ead91c9560ab9db9c76da1c42d4a5fcd7f3c02

diff --git a/x11-toolkits/wlroots016/Makefile b/x11-toolkits/wlroots016/Makefile
@@ -1,12 +1,9 @@
 PORTNAME=	wlroots
 DISTVERSION=	0.16.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 PKGNAMESUFFIX=	016
 
-PATCH_SITES+=	https://github.com/swaywm/${GL_PROJECT}/commit/:github
-PATCHFILES+=	fc0854d5f256.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064
-PATCHFILES+=	29cb694655db.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064
 PATCH_SITES+=	${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/
 PATCHFILES+=	f3ba14e49133.patch:-p1 # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3850
 

diff --git a/x11-toolkits/wlroots016/distinfo b/x11-toolkits/wlroots016/distinfo
@@ -1,9 +1,5 @@
 TIMESTAMP = 1676068199
 SHA256 (wlroots-0.16.2.tar.bz2) = afea2cc740344c4e86749cf4908e07692e183cb14a3db854d24dec454c664b88
 SIZE (wlroots-0.16.2.tar.bz2) = 437628
-SHA256 (fc0854d5f256.patch) = ceaa947fd7f64b773c61d7a5a4bdcfe85a083a686d4356ff58d3666aa182e2a9
-SIZE (fc0854d5f256.patch) = 6013
-SHA256 (29cb694655db.patch) = ef36e6b7a0bea0b82469c395feac303f50bf940ae651d91370ef052f5d97938c
-SIZE (29cb694655db.patch) = 4233
 SHA256 (f3ba14e49133.patch) = fb61329725f9482eae15100ae46c59159f39abc3324937e92fdf5065155944a9
 SIZE (f3ba14e49133.patch) = 1976
diff --git a/x11-wm/sway/Makefile b/x11-wm/sway/Makefile
@@ -1,11 +1,8 @@
 PORTNAME=	sway
 DISTVERSION=	1.9
+PORTREVISION=	1
 CATEGORIES=	x11-wm wayland
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	cd9d1038a822.patch:-p1 # https://github.com/swaywm/sway/pull/5090
-PATCHFILES+=	1f1c83e83a1a.patch:-p1 # https://github.com/swaywm/sway/pull/5090
-
 MAINTAINER=	[email protected]
 COMMENT=	i3-compatible Wayland compositor
 WWW=		https://swaywm.org/

diff --git a/x11-wm/sway/distinfo b/x11-wm/sway/distinfo
@@ -1,7 +1,3 @@
 TIMESTAMP = 1708781966
 SHA256 (swaywm-sway-1.9_GH0.tar.gz) = b6e4e8d74af744278201792bcc4447470fcb91e15bbda475c647d475bf8e7b0b
 SIZE (swaywm-sway-1.9_GH0.tar.gz) = 5581281
-SHA256 (cd9d1038a822.patch) = 266891cbe27a67f81740879dbe39819e3bf0f17b681bdc93087ae05987c2f88d
-SIZE (cd9d1038a822.patch) = 8968
-SHA256 (1f1c83e83a1a.patch) = 59d24c7e69a871d92b65095c46fc994900440453064dd70ffc7de2f0ff728655
-SIZE (1f1c83e83a1a.patch) = 2701
diff --git a/x11-wm/sway/pkg-message b/x11-wm/sway/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
 }
 ]
diff --git a/x11-wm/swayfx/Makefile b/x11-wm/swayfx/Makefile
@@ -1,12 +1,9 @@
 PORTNAME=	sway
 DISTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	x11-wm wayland
 PKGNAMESUFFIX=	${GH_PROJECT:S/${PORTNAME}//}
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	cd9d1038a822.patch:-p1 # https://github.com/swaywm/sway/pull/5090
-PATCHFILES+=	1f1c83e83a1a.patch:-p1 # https://github.com/swaywm/sway/pull/5090
-
 MAINTAINER=	[email protected]
 COMMENT=	Sway, but with eye candy!
 WWW=		https://github.com/WillPower3309/swayfx

diff --git a/x11-wm/swayfx/distinfo b/x11-wm/swayfx/distinfo
@@ -1,7 +1,3 @@
 TIMESTAMP = 1714368823
 SHA256 (WillPower3309-swayfx-0.4_GH0.tar.gz) = fa164734a7b32fd82f31e54c407b147e92247ef275de9df4a87b6198a36f20e2
 SIZE (WillPower3309-swayfx-0.4_GH0.tar.gz) = 17603249
-SHA256 (cd9d1038a822.patch) = 266891cbe27a67f81740879dbe39819e3bf0f17b681bdc93087ae05987c2f88d
-SIZE (cd9d1038a822.patch) = 8968
-SHA256 (1f1c83e83a1a.patch) = 59d24c7e69a871d92b65095c46fc994900440453064dd70ffc7de2f0ff728655
-SIZE (1f1c83e83a1a.patch) = 2701
diff --git a/x11-wm/swayfx/pkg-message b/x11-wm/swayfx/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
 }
 ]
diff --git a/x11-wm/wayfire/Makefile b/x11-wm/wayfire/Makefile
@@ -1,11 +1,9 @@
 PORTNAME=	wayfire
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.8.1
+PORTREVISION=	1
 CATEGORIES=	x11-wm wayland
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	dd479c06bf84.patch:-p1 # https://github.com/WayfireWM/wayfire/issues/599
-
 MAINTAINER=	[email protected]
 COMMENT=	3D Wayland compositor
 WWW=		https://wayfire.org/

diff --git a/x11-wm/wayfire/distinfo b/x11-wm/wayfire/distinfo
@@ -5,5 +5,3 @@ SHA256 (WayfireWM-wf-touch-8974eb0_GH0.tar.gz) = 3d66a67b35452741135420caf43ba34
 SIZE (WayfireWM-wf-touch-8974eb0_GH0.tar.gz) = 9881
 SHA256 (WayfireWM-wf-utils-15f8e16_GH0.tar.gz) = 8f32164bb2c620252aa5ca74f03f25d808cce01809a9eddd4b13a4b83ecfa94d
 SIZE (WayfireWM-wf-utils-15f8e16_GH0.tar.gz) = 48505
-SHA256 (dd479c06bf84.patch) = c58562defa005b8b3188d8a64003f0ee5444fef7449ed0a5f899d70b1901fb6d
-SIZE (dd479c06bf84.patch) = 2086
diff --git a/x11-wm/wayfire/pkg-message b/x11-wm/wayfire/pkg-message
@@ -5,18 +5,6 @@ Additional packages recommended for new users:
 - wf-shell (default background/launcher/panel)
 - wcm (GUI settings)
 - wayfire-plugins-extra
-
-Experimental features:
-- HiDPI support for X11 applications. For instructions see
-  https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064#note_1139855
-
-  Instead of ~/.config/sway/config edit ~/.config/wayfire.ini either via
-  wcm (General -> Core -> XWayland scale + General -> Autostart) or manually:
-
-    [core]
-    xwayland_scale = 2
-    [autostart]
-    xsettingsd = xsettingsd
 EOM
 }
 ]