Date: Sat, 22 Apr 2023 14:45:28 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 6f63bb889fd1 - main - x11-wm/sway-devel: restore port Message-ID: <202304221445.33MEjSwp039892@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=6f63bb889fd1f9480f4a75e86fedcd708aa44380 commit 6f63bb889fd1f9480f4a75e86fedcd708aa44380 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2023-04-22 13:28:27 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2023-04-22 14:40:09 +0000 x11-wm/sway-devel: restore port This reverts commit 517f98aaf3e3cadc36f13500d1dae686c9d58e59. --- MOVED | 1 - x11-wm/Makefile | 1 + x11-wm/sway-devel/Makefile | 71 +++++++++++++++++++++++++++++++++++++++++++ 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 +- x11-wm/swayfx/Makefile | 2 +- 9 files changed, 125 insertions(+), 3 deletions(-) diff --git a/MOVED b/MOVED index fa6e77dc3be5..ca7d712fea99 100644 --- a/MOVED +++ b/MOVED @@ -17584,7 +17584,6 @@ 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 math/suitesparse-slip_lu|math/suitesparse-spex|2022-11-26|Renamed by upstream graphics/giblib||2022-11-27|Has expired: Last release in 2004, abandoned upstream, not used, website disappeared www/typo3-10||2022-11-29|Requires php74 which was EOL on 2022-11-28 diff --git a/x11-wm/Makefile b/x11-wm/Makefile index 737524324cf7..9730356163eb 100644 --- a/x11-wm/Makefile +++ b/x11-wm/Makefile @@ -101,6 +101,7 @@ SUBDIR += stumpwm SUBDIR += subtle SUBDIR += sway + SUBDIR += sway-devel SUBDIR += swayfx SUBDIR += tinywm SUBDIR += transset diff --git a/x11-wm/sway-devel/Makefile b/x11-wm/sway-devel/Makefile new file mode 100644 index 000000000000..7846ee2e61b0 --- /dev/null +++ b/x11-wm/sway-devel/Makefile @@ -0,0 +1,71 @@ +PORTNAME= sway +DISTVERSION?= 1.8.1-132 # git rev-list --count 1.8.1.. +DISTVERSIONSUFFIX?= -g33cfdbe88 +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+= 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/ + +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.346<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 + +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 + +CONFLICTS_INSTALL?= ${PORTNAME} ${PORTNAME}fx + +OPTIONS_DEFINE= BASU MANPAGES PIXBUF SWAYBG X11 +OPTIONS_DEFAULT=BASU MANPAGES PIXBUF SWAYBG 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 + +SWAYBG_DESC= Default command to set background +SWAYBG_RUN_DEPENDS= swaybg:x11/swaybg + +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 "${.CURDIR:H:H}/x11-toolkits/wlroots-devel/override.mk" +.include <bsd.port.mk> diff --git a/x11-wm/sway-devel/distinfo b/x11-wm/sway-devel/distinfo new file mode 100644 index 000000000000..906db9440ef2 --- /dev/null +++ b/x11-wm/sway-devel/distinfo @@ -0,0 +1,7 @@ +TIMESTAMP = 1681667700 +SHA256 (swaywm-sway-1.8.1-132-g33cfdbe88_GH0.tar.gz) = 26272f62ebdd338ea0a13195468eb028cd8a2a8b161f23dbc8e2fc16dd0128a6 +SIZE (swaywm-sway-1.8.1-132-g33cfdbe88_GH0.tar.gz) = 5583200 +SHA256 (cd9d1038a822.patch) = 266891cbe27a67f81740879dbe39819e3bf0f17b681bdc93087ae05987c2f88d +SIZE (cd9d1038a822.patch) = 8968 +SHA256 (1f1c83e83a1a.patch) = 59d24c7e69a871d92b65095c46fc994900440453064dd70ffc7de2f0ff728655 +SIZE (1f1c83e83a1a.patch) = 2701 diff --git a/x11-wm/sway-devel/pkg-descr b/x11-wm/sway-devel/pkg-descr new file mode 100644 index 000000000000..8bd2c4c8a0f3 --- /dev/null +++ b/x11-wm/sway-devel/pkg-descr @@ -0,0 +1,3 @@ +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 new file mode 100644 index 000000000000..9017b1d5a888 --- /dev/null +++ b/x11-wm/sway-devel/pkg-message @@ -0,0 +1,9 @@ +[ +{ 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 new file mode 100644 index 000000000000..9192fd8c56b9 --- /dev/null +++ b/x11-wm/sway-devel/pkg-plist @@ -0,0 +1,32 @@ +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 3a08f76fdd7b..3e541f990be8 100644 --- a/x11-wm/sway/Makefile +++ b/x11-wm/sway/Makefile @@ -35,7 +35,7 @@ USE_XORG= pixman GH_ACCOUNT?= swaywm MESON_ARGS= -Dsd-bus-provider=basu -CONFLICTS_INSTALL?= ${PORTNAME}fx +CONFLICTS_INSTALL?= ${PORTNAME}-devel ${PORTNAME}fx OPTIONS_DEFINE= BASU MANPAGES PIXBUF SWAYBG X11 OPTIONS_DEFAULT=BASU MANPAGES PIXBUF SWAYBG X11 diff --git a/x11-wm/swayfx/Makefile b/x11-wm/swayfx/Makefile index c159ec55dd64..f57edd229355 100644 --- a/x11-wm/swayfx/Makefile +++ b/x11-wm/swayfx/Makefile @@ -13,6 +13,6 @@ GH_ACCOUNT= WillPower3309 GH_PROJECT= swayfx USE_GL= egl -CONFLICTS_INSTALL= ${PORTNAME} +CONFLICTS_INSTALL= ${PORTNAME} ${PORTNAME}-devel .include "${MASTERDIR}/Makefile"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304221445.33MEjSwp039892>