From nobody Sat Apr 22 14:45:28 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q3Z211VvQz46qQw; Sat, 22 Apr 2023 14:45:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q3Z2070Bmz3tgd; Sat, 22 Apr 2023 14:45:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682174729; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SWlN8X0XgGKjIYDtzvToAKE2UW+MZSirahukr8oOf7k=; b=gd+neLqBHlCDVF4r7qxJ8Zg048M9GASe3BjwICH0kRKw1CGw++xfCwO008quaDnwF64Psl +7/aiLPYqdtqneaDMMrYlcvS1kR/qFdbUJV+4gKyljoxeiGgI7Aa6jiMuSrsC0q+EW+vdh snM88I1c9QQ5esy1siGkBBU0tPNlHBHsn1yWfbecoDgFLAktqegJCAGv0Cal+iqIswR6n1 m1awW6eip3wQBiPPXdLh9TcJMKZSI26dsTOT8vGxd+2zopBH1EqDidkLHINMThVzhOUAjC nDSlhu0wFz7Qit7xdC4Q79mlVaNdXYko0WCgGakEWQygyEOkbG2fsmSX1HvksA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682174729; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SWlN8X0XgGKjIYDtzvToAKE2UW+MZSirahukr8oOf7k=; b=xhxR6cEelJB6LFnnbwo8H7TisobJ2kaQFYOMcfKFzjS3mtnPpkn8Q1I0xmUxR7Ir5Vav/n tRPXKLasu7jlqjCs33PQMkFUcGt7Vw8bunvQSTH6QY1huY1N0X4eP77M0fF+B2L/xHyOWX rjSN1SMFhGXJCEeOzTs4LLSzXkqzGVPiltIGgsNG70zjr0Q1puQBwuLfaPc3WqO5uOYkDG 0UWk5dMt4rTAL39K1kcZzn1bqWZghwfgFjvzZY303KqijKAYhGQmxp+3hzn99Ew0Ds6s/w x/fYDGxzWoP0n7w1foVRArBosoUVyRc2SlGQ6HcmVZTKR7foYHiEgVeJygB6ag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682174729; a=rsa-sha256; cv=none; b=CRmYWpOA8Cvm9uBSx2v/6a6spDL6FH8Smmg2h+86GvsR95UbwNVIzAWRTHiXPNoWCGf3Q5 CrSs/hPSoMG4V+slQRzFonrBeTDfQQ8js39pT5GNCBh/sDL+wxyKPDXeR5sA0MggmysrbK sklEOc6C9xZ8OoiId3qkz7KLsHqJJN/X3kdQQ4b9fAhbvtjtOYWXH9isQfxpo8KOdCPUJ4 0C/+bpi/cwEwjxIdVULO3v89uzXR2ly1mycw7M7RcnfrAxdmHgJEsG3wPaGFpdxxsNtQk2 KN+WdJf/cyyB4IfgggBmldFqfMmguo0it8sz2iHgRh0VvDGmM+CdOInmTBVbQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q3Z205cHQz152Q; Sat, 22 Apr 2023 14:45:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33MEjSgu039893; Sat, 22 Apr 2023 14:45:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33MEjSwp039892; Sat, 22 Apr 2023 14:45:28 GMT (envelope-from git) Date: Sat, 22 Apr 2023 14:45:28 GMT Message-Id: <202304221445.33MEjSwp039892@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 6f63bb889fd1 - main - x11-wm/sway-devel: restore port List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6f63bb889fd1f9480f4a75e86fedcd708aa44380 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=6f63bb889fd1f9480f4a75e86fedcd708aa44380 commit 6f63bb889fd1f9480f4a75e86fedcd708aa44380 Author: Jan Beich AuthorDate: 2023-04-22 13:28:27 +0000 Commit: Jan Beich 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 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: <