git: 517f98aaf3e3 - main - x11-wm/sway-devel: remove until enough upstream changes accumulate

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Sat, 26 Nov 2022 23:14:41 UTC
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=517f98aaf3e3cadc36f13500d1dae686c9d58e59

commit 517f98aaf3e3cadc36f13500d1dae686c9d58e59
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2022-11-26 23:11:35 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2022-11-26 23:13:42 +0000

    x11-wm/sway-devel: remove until enough upstream changes accumulate
---
 MOVED                         |  1 +
 x11-wm/Makefile               |  1 -
 x11-wm/sway-devel/Makefile    | 68 -------------------------------------------
 x11-wm/sway-devel/distinfo    |  7 -----
 x11-wm/sway-devel/pkg-descr   |  3 --
 x11-wm/sway-devel/pkg-message |  9 ------
 x11-wm/sway-devel/pkg-plist   | 32 --------------------
 x11-wm/sway/Makefile          |  2 --
 8 files changed, 1 insertion(+), 122 deletions(-)

diff --git a/MOVED b/MOVED
index c61ee607aef8..ae6b44a611f9 100644
--- a/MOVED
+++ b/MOVED
@@ -17614,3 +17614,4 @@ databases/foundationdb-devel|databases/foundationdb|2022-11-16|Remove obsolete d
 devel/py-pytest4-asyncio||2022-11-19|Has expired: legacy version for pytest4 no longer used by any port
 devel/tokamak||2022-11-20|Has expired: Last release in 2008, abandoned upstream, not used, website disappeared
 net/libutp|net-p2p/libutp|2022-11-20|Moved to a more adequated category
+x11-wm/sway-devel|x11-wm/sway|2022-11-26|Out of date: use x11-wm/sway for now
diff --git a/x11-wm/Makefile b/x11-wm/Makefile
index 1aa4834cfc04..0ec1af17c189 100644
--- a/x11-wm/Makefile
+++ b/x11-wm/Makefile
@@ -101,7 +101,6 @@
     SUBDIR += stumpwm
     SUBDIR += subtle
     SUBDIR += sway
-    SUBDIR += sway-devel
     SUBDIR += tinywm
     SUBDIR += transset
     SUBDIR += treewm
diff --git a/x11-wm/sway-devel/Makefile b/x11-wm/sway-devel/Makefile
deleted file mode 100644
index c5b1278ee4f3..000000000000
--- a/x11-wm/sway-devel/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-PORTNAME=	sway
-DISTVERSION=	1.7-154 # v1.8 branch
-DISTVERSIONSUFFIX=	-g0143c7ade
-CATEGORIES=	x11-wm wayland
-PKGNAMESUFFIX=	-devel
-
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	cd9d1038a822.patch:-p1 # https://github.com/swaywm/sway/pull/5090
-PATCHFILES+=	f98ca3ab7ca1.patch:-p1 # https://github.com/swaywm/sway/pull/5090
-
-MAINTAINER=	jbeich@FreeBSD.org
-COMMENT=	i3-compatible Wayland compositor (development snapshot)
-WWW=		https://swaywm.org/
-
-LICENSE=	MIT
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
-		wayland-protocols>=1.24:graphics/wayland-protocols \
-		wlroots>=0.16.0<0.17.0:x11-toolkits/wlroots
-LIB_DEPENDS=	libjson-c.so:devel/json-c \
-		libevdev.so:devel/libevdev \
-		libudev.so:devel/libudev-devd \
-		libpcre2-8.so:devel/pcre2 \
-		libwayland-egl.so:graphics/wayland \
-		libwlroots.so:x11-toolkits/wlroots \
-		libinput.so:x11/libinput \
-		libxkbcommon.so:x11/libxkbcommon
-RUN_DEPENDS=	swaybg:x11/swaybg
-
-CONFLICTS_INSTALL=	${PORTNAME}
-
-USES=		compiler:c11 gl gnome meson pkgconfig xorg
-USE_GITHUB=	yes
-USE_GL=		glesv2
-USE_GNOME=	cairo pango
-USE_XORG=	pixman
-GH_ACCOUNT=	swaywm
-MESON_ARGS=	-Dsd-bus-provider=basu
-
-OPTIONS_DEFINE=	BASU MANPAGES PIXBUF X11
-OPTIONS_DEFAULT=BASU MANPAGES PIXBUF X11
-OPTIONS_SUB=	yes
-
-BASU_DESC=		Tray in swaybar via basu
-BASU_LIB_DEPENDS=	libbasu.so:devel/basu
-BASU_MESON_ENABLED=	tray
-
-MANPAGES_BUILD_DEPENDS=	scdoc>=1.9.2:textproc/scdoc
-MANPAGES_MESON_ENABLED=	man-pages
-
-PIXBUF_USE=		GNOME=gdkpixbuf2
-PIXBUF_MESON_ENABLED=	gdk-pixbuf
-
-X11_USE=		XORG=xcb
-X11_LIB_DEPENDS=	libxcb-icccm.so:x11/xcb-util-wm
-X11_MESON_ENABLED=	xwayland
-
-post-patch:
-# Let @sample handle default files under etc/
-	@${REINPLACE_CMD} -e '/config\.in/{ N; s/@BASENAME@/&.sample/; }' \
-		${WRKSRC}/meson.build
-# Extract (snapshot) version from the port instead of meson.build
-	@${REINPLACE_CMD} -i .nogit -e 's/git.found()/false/' \
-		-e '/project_version/s/@0@/${DISTVERSIONFULL}/' \
-		${WRKSRC}/meson.build
-
-.include <bsd.port.mk>
diff --git a/x11-wm/sway-devel/distinfo b/x11-wm/sway-devel/distinfo
deleted file mode 100644
index 38d0287dddc7..000000000000
--- a/x11-wm/sway-devel/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1668202210
-SHA256 (swaywm-sway-1.7-154-g0143c7ade_GH0.tar.gz) = 8ccc2138cf2801ce5ba2feb1ac9786999dcac0da4946f5c7a1c1fdc903aa7dce
-SIZE (swaywm-sway-1.7-154-g0143c7ade_GH0.tar.gz) = 5575732
-SHA256 (cd9d1038a822.patch) = 266891cbe27a67f81740879dbe39819e3bf0f17b681bdc93087ae05987c2f88d
-SIZE (cd9d1038a822.patch) = 8968
-SHA256 (f98ca3ab7ca1.patch) = b3a427b6edbf1c89bbf5fdeb5e3fc4c6708478e6d2031fcead87d29bf5c409fa
-SIZE (f98ca3ab7ca1.patch) = 2673
diff --git a/x11-wm/sway-devel/pkg-descr b/x11-wm/sway-devel/pkg-descr
deleted file mode 100644
index 8bd2c4c8a0f3..000000000000
--- a/x11-wm/sway-devel/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Sway is a tiling Wayland compositor and a drop-in replacement for the
-i3 window manager for X11. It works with your existing i3 configuration
-and supports most of i3's features, plus a few extras.
diff --git a/x11-wm/sway-devel/pkg-message b/x11-wm/sway-devel/pkg-message
deleted file mode 100644
index 9017b1d5a888..000000000000
--- a/x11-wm/sway-devel/pkg-message
+++ /dev/null
@@ -1,9 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-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/sway-devel/pkg-plist b/x11-wm/sway-devel/pkg-plist
deleted file mode 100644
index 9192fd8c56b9..000000000000
--- a/x11-wm/sway-devel/pkg-plist
+++ /dev/null
@@ -1,32 +0,0 @@
-bin/sway
-bin/swaybar
-bin/swaymsg
-bin/swaynag
-@sample %%ETCDIR%%/config.sample
-%%MANPAGES%%man/man1/sway.1.gz
-%%MANPAGES%%man/man1/swaymsg.1.gz
-%%MANPAGES%%man/man1/swaynag.1.gz
-%%MANPAGES%%man/man5/sway-bar.5.gz
-%%MANPAGES%%man/man5/sway-input.5.gz
-%%MANPAGES%%man/man5/sway-output.5.gz
-%%MANPAGES%%man/man5/sway.5.gz
-%%MANPAGES%%man/man5/swaynag.5.gz
-%%MANPAGES%%man/man7/sway-ipc.7.gz
-%%MANPAGES%%man/man7/swaybar-protocol.7.gz
-share/backgrounds/sway/Sway_Wallpaper_Blue_1136x640.png
-share/backgrounds/sway/Sway_Wallpaper_Blue_1136x640_Portrait.png
-share/backgrounds/sway/Sway_Wallpaper_Blue_1366x768.png
-share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png
-share/backgrounds/sway/Sway_Wallpaper_Blue_2048x1536.png
-share/backgrounds/sway/Sway_Wallpaper_Blue_2048x1536_Portrait.png
-share/backgrounds/sway/Sway_Wallpaper_Blue_768x1024.png
-share/backgrounds/sway/Sway_Wallpaper_Blue_768x1024_Portrait.png
-share/bash-completion/completions/sway
-share/bash-completion/completions/swaybar
-share/bash-completion/completions/swaymsg
-share/fish/vendor_completions.d/sway.fish
-share/fish/vendor_completions.d/swaymsg.fish
-share/fish/vendor_completions.d/swaynag.fish
-share/wayland-sessions/sway.desktop
-share/zsh/site-functions/_sway
-share/zsh/site-functions/_swaymsg
diff --git a/x11-wm/sway/Makefile b/x11-wm/sway/Makefile
index b0a9355558f2..bc4afb2a9366 100644
--- a/x11-wm/sway/Makefile
+++ b/x11-wm/sway/Makefile
@@ -26,8 +26,6 @@ LIB_DEPENDS=	libjson-c.so:devel/json-c \
 		libxkbcommon.so:x11/libxkbcommon
 RUN_DEPENDS=	swaybg:x11/swaybg
 
-CONFLICTS_INSTALL=	${PORTNAME}-devel
-
 USES=		compiler:c11 gl gnome meson pkgconfig xorg
 USE_GITHUB=	yes
 USE_GL=		glesv2