From nobody Fri Nov 11 22:41:41 2022 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 4N8DGF4Dwbz4YTFR; Fri, 11 Nov 2022 22:41:41 +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 4N8DGF3Kbrz3Kdn; Fri, 11 Nov 2022 22:41:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668206501; 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=MHvfV+b0qEvi+wG+7b72mPbontuqVevXIP8SR3ljejo=; b=vp8K7uY5hHp2fWnt6LZlhMhjLYxKAERD5ZlHs0QTZG2Lp/Cw4scJ+gZIrMFmSUjEUq2Ms6 k4oe2t84L9KWdqz4p15VaWdOC67i4Ln01gPFAaCjv2B/AYbRTiiSDaMNpnAJIMaU/dYaal eJNWzsuXqzQ7yvaC5sOLpPNmWCFtpb+ltKqkWBll4hbnf6DDeY2rkDF8qgyFp2qk4bqrrI Wsixwlzv98bBq0TfPcAeYMEinHmRsXJunXpfpAzNmWtbHoz6PYy0qvBD/w7xlpncfNJY4F i2bS1+WuBJ/jmHz0OC8ot+HAZDNxhGRhDCMp6U2iuVwXkEtr2wcMuX4MWwv5wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668206501; 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=MHvfV+b0qEvi+wG+7b72mPbontuqVevXIP8SR3ljejo=; b=Uu4jGReIgdpPjg/QvBJ1gl9mjTAuB9TLzeajok6Tuua07bKeTRDvAfIkdVNFMWAHD3QPHA MfPgFiFr/tZh47JYHoHi0yTzrAjvULan7eMvgMAQ8zrm5tL6tBt2F+fJnHrbxsTLUWCyF0 vseQ+yqH7E2OrmHSIt0jP8XJz1QMFKzrmDA60sRN62Xe4bs23hZN5sjmpF/DOQzcgs6sJ3 vDprJ8eZbR+PhalIF41fulVby4+s3m3O/7ctpUD9v6fnyQtXGG0C6VxvOuMHKDA9YTEgHa pk4unrHAfnzH6heSghMivkW2ehnnpcFmonTH8/ukyGeul3N94eBTK4Q1HQOF8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668206501; a=rsa-sha256; cv=none; b=JLkxZef+4yxfKwK59Z4CUvN4wcQa2xif680XcqsY78xkm8ccBjWWZ2UTMTwmHxDsL0bTz+ IUkjfQh7rUPBKqmhSTNOxbzO5gJsOmti3ADd9/pQXyLumndxpivu2TTr0Qx2cLPTVc1hyo vPvI2GmVhJBngN6xeKNpAM9+QFb8pIi+9EkeJA6UE20ir/WoQBf4yF92jW0TKtjLMyFUgW OJZjQ7HaXLCDNnNAII+CFRb8IWy9jMNHgh5jNz9rcLP4F80XouBXgd3Pk0vtO9HJI+hqQi DAysp8TeYgxkBLUPBMs7c7fme8kgqttdKspabgMrvojuIoIDh5VOsZEHWsKXCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4N8DGF2NHxz10kn; Fri, 11 Nov 2022 22:41:41 +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 2ABMffqc059419; Fri, 11 Nov 2022 22:41:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ABMffLS059418; Fri, 11 Nov 2022 22:41:41 GMT (envelope-from git) Date: Fri, 11 Nov 2022 22:41:41 GMT Message-Id: <202211112241.2ABMffLS059418@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: 3eb7d7b7f6a0 - main - x11-wm/sway: back to default wlroots 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: 3eb7d7b7f6a07406520572d1457a1e57a4bca837 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=3eb7d7b7f6a07406520572d1457a1e57a4bca837 commit 3eb7d7b7f6a07406520572d1457a1e57a4bca837 Author: Jan Beich AuthorDate: 2022-06-28 21:09:17 +0000 Commit: Jan Beich CommitDate: 2022-11-11 22:39:56 +0000 x11-wm/sway: back to default wlroots --- x11-wm/sway/Makefile | 28 +++++++++++++++++++++++++--- x11-wm/sway/distinfo | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 3 deletions(-) diff --git a/x11-wm/sway/Makefile b/x11-wm/sway/Makefile index ab6f60a4b9a9..1666396dce0e 100644 --- a/x11-wm/sway/Makefile +++ b/x11-wm/sway/Makefile @@ -1,11 +1,33 @@ PORTNAME= sway DISTVERSION= 1.7 -PORTREVISION= 1 +PORTREVISION= 2 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+= f98ca3ab7ca1.patch:-p1 # https://github.com/swaywm/sway/pull/5090 +PATCHFILES+= 17ee30d07058.patch:-p1 # wlroots 0.16 +PATCHFILES+= d6f8820a8b71.patch:-p1 # wlroots 0.16 +PATCHFILES+= 8ca2847b4253.patch:-p1 # wlroots 0.16 +PATCHFILES+= ee7668c1f2b5.patch:-p1 # wlroots 0.16 +PATCHFILES+= 30d27b5996f3.patch:-p1 # wlroots 0.16 +PATCHFILES+= f795aa1c95b1.patch:-p1 # wlroots 0.16 +PATCHFILES+= 9a6687ee04db.patch:-p1 # wlroots 0.16 +PATCHFILES+= f8990523b456.patch:-p1 # wlroots 0.16 +PATCHFILES+= 85d1c98476b6.patch:-p1 # wlroots 0.16 +PATCHFILES+= 04676936e71f.patch:-p1 # wlroots 0.16 +PATCHFILES+= 0345148ea667.patch:-p1 # wlroots 0.16 +PATCHFILES+= 49b3ac9a2ce1.patch:-p1 # wlroots 0.16 +PATCHFILES+= 440d0bc22d57.patch:-p1 # wlroots 0.16 +PATCHFILES+= 6c4c0387a24b.patch:-p1 # wlroots 0.16 +PATCHFILES+= acdb48a59c26.patch:-p1 # wlroots 0.16 +PATCHFILES+= 3f600565e4dd.patch:-p1 # wlroots 0.16 +PATCHFILES+= 26a0e97634dc.patch:-p1 # wlroots 0.16 +PATCHFILES+= 1c69d0e72fe8.patch:-p1 # wlroots 0.16 +PATCHFILES+= 94dbc6a92a03.patch:-p1 # wlroots 0.16 +PATCHFILES+= 6b97c4fa7109.patch:-p1 # wlroots 0.16 +PATCHFILES+= aaa6c4ac892d.patch:-p1 # wlroots 0.16 +PATCHFILES+= 07bfeb2abcb4.patch:-p1 # wlroots 0.16 MAINTAINER= jbeich@FreeBSD.org COMMENT= i3-compatible Wayland compositor @@ -16,7 +38,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wayland-protocols>=1.24:graphics/wayland-protocols \ - wlroots>=0.15.0<0.16.0:x11-toolkits/wlroots + 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 \ @@ -52,6 +74,7 @@ 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: @@ -63,5 +86,4 @@ post-patch: -e '/project_version/s/@0@/${DISTVERSIONFULL}/' \ ${WRKSRC}/meson.build -.include "${.CURDIR:H:H}/x11-toolkits/wlroots015/override.mk" .include diff --git a/x11-wm/sway/distinfo b/x11-wm/sway/distinfo index 7e1135e7492f..eff23b339df4 100644 --- a/x11-wm/sway/distinfo +++ b/x11-wm/sway/distinfo @@ -5,3 +5,47 @@ SHA256 (cd9d1038a822.patch) = 266891cbe27a67f81740879dbe39819e3bf0f17b681bdc9308 SIZE (cd9d1038a822.patch) = 8968 SHA256 (f98ca3ab7ca1.patch) = b3a427b6edbf1c89bbf5fdeb5e3fc4c6708478e6d2031fcead87d29bf5c409fa SIZE (f98ca3ab7ca1.patch) = 2673 +SHA256 (17ee30d07058.patch) = 76796f36761e9aa3e634a7f6ffae15c75248cd57bc615b47844cab624e7185cc +SIZE (17ee30d07058.patch) = 710 +SHA256 (d6f8820a8b71.patch) = 9f4e4029219f2c7b3b60c462ce95331598399000c46fbc903d456dd87478191a +SIZE (d6f8820a8b71.patch) = 6841 +SHA256 (8ca2847b4253.patch) = 2d9837dc216ab9a530ddd48544f3178df94d3673e19d5aa89fb9c20284009b7f +SIZE (8ca2847b4253.patch) = 3193 +SHA256 (ee7668c1f2b5.patch) = 7d0cc4b2f6d3a622584f9424e5aebfe688f490f5a4f644a913d5fdab8c9f5c6b +SIZE (ee7668c1f2b5.patch) = 9739 +SHA256 (30d27b5996f3.patch) = a8df92c5b64768f1f4d5bc436ef5453f2fe3d821d93692df8038c32ef9a2417d +SIZE (30d27b5996f3.patch) = 4805 +SHA256 (f795aa1c95b1.patch) = a6abb17acf235ab16a599525ef8433126943cff0d3fa6232b09b440841817838 +SIZE (f795aa1c95b1.patch) = 11981 +SHA256 (9a6687ee04db.patch) = f08350743391ab42e268675733e74046d9fc1d40b5d2c7526a480c5272343b5f +SIZE (9a6687ee04db.patch) = 2429 +SHA256 (f8990523b456.patch) = b44dd6efe5c7ff3a38488db9a4a5c4a4b80dd5a081214fe706ae87d8e38ee391 +SIZE (f8990523b456.patch) = 756 +SHA256 (85d1c98476b6.patch) = b053e162590a669313d5ebe5a6a580d914c28988285f9a1b1e92b16988c03c1f +SIZE (85d1c98476b6.patch) = 2046 +SHA256 (04676936e71f.patch) = ad34265e4399dbe9109f4530e50c491160a93d37f621a00cb56f340a76065823 +SIZE (04676936e71f.patch) = 3530 +SHA256 (0345148ea667.patch) = cebecdf01cefbc3962e5f84afec4af4bcfe83931d2f99fd55822e9d732efc028 +SIZE (0345148ea667.patch) = 1176 +SHA256 (49b3ac9a2ce1.patch) = 3e8dc9987e8cb6d6724024ce347a051470a5bcf7def494516f4ce8b40923ffb4 +SIZE (49b3ac9a2ce1.patch) = 1791 +SHA256 (440d0bc22d57.patch) = 3de0a7fe83a0d69a73960322e066990a4ee5a80061c1f6ef3244aad0892f3cdd +SIZE (440d0bc22d57.patch) = 23827 +SHA256 (6c4c0387a24b.patch) = 7fbc0b9476014669c3d519009cf0ff11ac8766eec200406d7ae9b57217bac205 +SIZE (6c4c0387a24b.patch) = 2724 +SHA256 (acdb48a59c26.patch) = a1bcb9cfe917d0b4fe44785a2ac833b223e0e17517f9b8e29ff1ea9c86433145 +SIZE (acdb48a59c26.patch) = 2848 +SHA256 (3f600565e4dd.patch) = 326ca734e8eef7fc2f23ef63f5ec7c693e17c159b8c71ca0e3d17d99f17538e6 +SIZE (3f600565e4dd.patch) = 1355 +SHA256 (26a0e97634dc.patch) = 92660c130ec41158383438afe32f32244ef2506d6f6d306a1ba64c2ac1cda4e5 +SIZE (26a0e97634dc.patch) = 2175 +SHA256 (1c69d0e72fe8.patch) = df8f1ed38b3570eefaa9a3ea0a8e1d66e3234e2f09e70b1930c903dc56a5a033 +SIZE (1c69d0e72fe8.patch) = 9450 +SHA256 (94dbc6a92a03.patch) = 7b2b736cbc621c6d9cc19c7aefb62bbdee45a12da085ab330bd6fda8c6cd2076 +SIZE (94dbc6a92a03.patch) = 24413 +SHA256 (6b97c4fa7109.patch) = 836ca57772429fbcd6a707c0329f5b0aaf6fee9823fdf213ec15e31b9392a1fb +SIZE (6b97c4fa7109.patch) = 946 +SHA256 (aaa6c4ac892d.patch) = d4d8133a38aa6bf8720665a859560399daecbcef1c5d7d1f5c32b59dcb98b313 +SIZE (aaa6c4ac892d.patch) = 694 +SHA256 (07bfeb2abcb4.patch) = dc0d9ab7d5079da202d1ef505ba83686eec468d732abce31fc5717f64144bfad +SIZE (07bfeb2abcb4.patch) = 1042