From nobody Wed Sep 20 14:36:02 2023 X-Original-To: dev-commits-ports-all@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 4RrLgQ2VFnz4tlKL; Wed, 20 Sep 2023 14:36:02 +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 4RrLgQ1kbzz3clQ; Wed, 20 Sep 2023 14:36:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695220562; 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=8qLdBcw7X+Q3wwFJsT5OiMnGqNAp+xz7q3Ep162jIbU=; b=mXdqIOP0MHd/60Ota6ytvYo6al/CGVR6nrJX9iTUFuDZxMcQVeiqn4kHsxsgjK0+aQDwF6 Seo3iadjDY/D2Cdlxrhg6CwZwCOLpzL4Mk4Q7jnsp8LecleT/hkKo6qusSEFcMP12W/IZ0 s0PQdHsyo4R68jF8JEntVWXdIiZHEtd1R3qgtFurjtGucIu901yjeUwgDFaW0ndzPl56ug Q/uEIOoJhs+5fTUeNBPGWgLbWMATUKObJf/064E67c7RJU8uogfWdi3TQswhgb5COvzFqa Un8IffYyl1LgOSqPGNgszJlU82C6ZAVRXpCThbeOE7BKINb20og5oZXCpX8EcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695220562; a=rsa-sha256; cv=none; b=D1txDqLjHGSCkoQ/GW8RLNuRRV46496VXQKzWpTyuX0vAJYA6kmMjNfzJE7mb67U9LU2oI wHbW8Rwv0aS8YNpr1oREfov7i074NW7zHhD88O8h6jasrZoEUHiuJTaX1hox2Fu4GDAll2 9x5o0Cn0x8eKoSBLR94/teD68Ylx2Ghi/0wxwEWDLL4hBm84qAsrCnxtz3WePCNVjKNt2f nRDOdZrEleUwHcfamODdDppyygBA64W9AfpUKlz4ttmMKX3c5I+LNnHHptNXoY7DZIlGcW frmtB2GQknYZFEWU7xvBhDCT4WzWaVkqfOwMqwbx4YsOhKJHzl5swNcDkHHOqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695220562; 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=8qLdBcw7X+Q3wwFJsT5OiMnGqNAp+xz7q3Ep162jIbU=; b=WwxFtX/w8Ot4YlYdyXrmf7YS5UFbBcOGnFe0bTk+biP0tXHMFH9WwfPJnfdxLG0TW1idkF C8R5zrNIgy55zMbqhNrAHbQnR2jz/UypMKOM/cllcRjwV+W/jKYC5j7LJ14yAHE+1XluFy jFt8lB9TO2EKCZPH7d8cbb+y+yRPHKdqjNjGVLXf0q4ufYnK0RvY3sjc0kQ/GoMLcy0ZpA jl8sunKdYEoDMu/3yDnOOuSoaTKO4plNiBDNY3g+8YHPI2F6TSTeEJcNKjLzEQP7nA9lNP 4dXIVR5mp2kG+VBBzvOc7Dh3eSmsdgckA1RBQeCqY43AJaHplYx/SxFIISQbAw== 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 4RrLgQ0lr2zypP; Wed, 20 Sep 2023 14:36:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38KEa2KN002358; Wed, 20 Sep 2023 14:36:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38KEa2S0002355; Wed, 20 Sep 2023 14:36:02 GMT (envelope-from git) Date: Wed, 20 Sep 2023 14:36:02 GMT Message-Id: <202309201436.38KEa2S0002355@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: 18741dd85a2e - main - x11-wm/sway-devel: unbreak Rust-based clients after edd477c5e7a4 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 18741dd85a2e8e88c89e2fcbaa7c71d48f4d3740 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=18741dd85a2e8e88c89e2fcbaa7c71d48f4d3740 commit 18741dd85a2e8e88c89e2fcbaa7c71d48f4d3740 Author: Jan Beich AuthorDate: 2023-08-03 00:39:51 +0000 Commit: Jan Beich CommitDate: 2023-09-20 14:35:01 +0000 x11-wm/sway-devel: unbreak Rust-based clients after edd477c5e7a4 interface 'wl_surface' has no event 2 PR: 268810 --- audio/spotify-player/Makefile | 2 +- audio/spotify-player/files/patch-sctk | 15 +++++++++++++++ games/jumpy/Makefile | 2 +- games/jumpy/files/patch-sctk | 15 +++++++++++++++ games/punchy/Makefile | 2 +- games/punchy/files/patch-sctk | 15 +++++++++++++++ games/veloren-weekly/Makefile | 2 +- games/veloren-weekly/files/patch-sctk | 15 +++++++++++++++ misc/binocle/Makefile | 2 +- misc/binocle/files/patch-sctk | 15 +++++++++++++++ net/sniffnet/Makefile | 2 +- net/sniffnet/files/patch-sctk | 15 +++++++++++++++ security/gpg-tui/Makefile | 1 + security/gpg-tui/files/patch-sctk | 15 +++++++++++++++ x11/alacritty/Makefile | 2 +- x11/alacritty/files/patch-sctk | 15 +++++++++++++++ x11/kickoff/Makefile | 2 +- x11/kickoff/files/patch-sctk | 25 +++++++++++++++++++++++++ x11/rio/Makefile | 1 + x11/rio/files/patch-sctk | 15 +++++++++++++++ x11/wezterm/Makefile | 2 +- x11/wezterm/files/patch-sctk | 15 +++++++++++++++ 22 files changed, 186 insertions(+), 9 deletions(-) diff --git a/audio/spotify-player/Makefile b/audio/spotify-player/Makefile index c1a33a3db4a7..4403bb3f402b 100644 --- a/audio/spotify-player/Makefile +++ b/audio/spotify-player/Makefile @@ -1,7 +1,7 @@ PORTNAME= spotify-player DISTVERSIONPREFIX= v DISTVERSION= 0.10.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= audio MAINTAINER= jfree@FreeBSD.org diff --git a/audio/spotify-player/files/patch-sctk b/audio/spotify-player/files/patch-sctk new file mode 100644 index 000000000000..9d2cabb1bcb0 --- /dev/null +++ b/audio/spotify-player/files/patch-sctk @@ -0,0 +1,15 @@ +Backport https://github.com/Smithay/client-toolkit/commit/5cfd95021c05 +to ignore wl_surface::Event::preferred_buffer_scale after +https://invent.kde.org/plasma/kwin/-/commit/d2b0ed0c5a1e +https://github.com/swaywm/sway/commit/fc16fb65491b + +--- cargo-crates/smithay-client-toolkit-0.16.0/src/environment.rs.orig 1970-01-01 00:00:00 UTC ++++ cargo-crates/smithay-client-toolkit-0.16.0/src/environment.rs +@@ -283,6 +283,7 @@ impl> + AsRef(version, id)).clone()) + } + fn get(&self) -> Option> { diff --git a/games/jumpy/Makefile b/games/jumpy/Makefile index 89a7ec52f711..cc990f264e1d 100644 --- a/games/jumpy/Makefile +++ b/games/jumpy/Makefile @@ -1,7 +1,7 @@ PORTNAME= jumpy DISTVERSIONPREFIX= v DISTVERSION= 0.7.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games wayland MAINTAINER= jbeich@FreeBSD.org diff --git a/games/jumpy/files/patch-sctk b/games/jumpy/files/patch-sctk new file mode 100644 index 000000000000..9d2cabb1bcb0 --- /dev/null +++ b/games/jumpy/files/patch-sctk @@ -0,0 +1,15 @@ +Backport https://github.com/Smithay/client-toolkit/commit/5cfd95021c05 +to ignore wl_surface::Event::preferred_buffer_scale after +https://invent.kde.org/plasma/kwin/-/commit/d2b0ed0c5a1e +https://github.com/swaywm/sway/commit/fc16fb65491b + +--- cargo-crates/smithay-client-toolkit-0.16.0/src/environment.rs.orig 1970-01-01 00:00:00 UTC ++++ cargo-crates/smithay-client-toolkit-0.16.0/src/environment.rs +@@ -283,6 +283,7 @@ impl> + AsRef(version, id)).clone()) + } + fn get(&self) -> Option> { diff --git a/games/punchy/Makefile b/games/punchy/Makefile index 53e5de6f81c7..a0e796d7cc67 100644 --- a/games/punchy/Makefile +++ b/games/punchy/Makefile @@ -1,7 +1,7 @@ PORTNAME= punchy DISTVERSIONPREFIX= v DISTVERSION= 0.3.0 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= games wayland MAINTAINER= jbeich@FreeBSD.org diff --git a/games/punchy/files/patch-sctk b/games/punchy/files/patch-sctk new file mode 100644 index 000000000000..9d2cabb1bcb0 --- /dev/null +++ b/games/punchy/files/patch-sctk @@ -0,0 +1,15 @@ +Backport https://github.com/Smithay/client-toolkit/commit/5cfd95021c05 +to ignore wl_surface::Event::preferred_buffer_scale after +https://invent.kde.org/plasma/kwin/-/commit/d2b0ed0c5a1e +https://github.com/swaywm/sway/commit/fc16fb65491b + +--- cargo-crates/smithay-client-toolkit-0.16.0/src/environment.rs.orig 1970-01-01 00:00:00 UTC ++++ cargo-crates/smithay-client-toolkit-0.16.0/src/environment.rs +@@ -283,6 +283,7 @@ impl> + AsRef(version, id)).clone()) + } + fn get(&self) -> Option> { diff --git a/games/veloren-weekly/Makefile b/games/veloren-weekly/Makefile index 98d03dcd0cb6..c5ef4273ce25 100644 --- a/games/veloren-weekly/Makefile +++ b/games/veloren-weekly/Makefile @@ -1,6 +1,6 @@ PORTNAME= veloren PORTVERSION= s20230913 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games wayland PKGNAMESUFFIX= -weekly diff --git a/games/veloren-weekly/files/patch-sctk b/games/veloren-weekly/files/patch-sctk new file mode 100644 index 000000000000..9d2cabb1bcb0 --- /dev/null +++ b/games/veloren-weekly/files/patch-sctk @@ -0,0 +1,15 @@ +Backport https://github.com/Smithay/client-toolkit/commit/5cfd95021c05 +to ignore wl_surface::Event::preferred_buffer_scale after +https://invent.kde.org/plasma/kwin/-/commit/d2b0ed0c5a1e +https://github.com/swaywm/sway/commit/fc16fb65491b + +--- cargo-crates/smithay-client-toolkit-0.16.0/src/environment.rs.orig 1970-01-01 00:00:00 UTC ++++ cargo-crates/smithay-client-toolkit-0.16.0/src/environment.rs +@@ -283,6 +283,7 @@ impl> + AsRef(version, id)).clone()) + } + fn get(&self) -> Option> { diff --git a/misc/binocle/Makefile b/misc/binocle/Makefile index 84f23fbde591..60d63fd7bad4 100644 --- a/misc/binocle/Makefile +++ b/misc/binocle/Makefile @@ -1,7 +1,7 @@ PORTNAME= binocle DISTVERSIONPREFIX= v DISTVERSION= 0.3.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= misc MAINTAINER= yuri@FreeBSD.org diff --git a/misc/binocle/files/patch-sctk b/misc/binocle/files/patch-sctk new file mode 100644 index 000000000000..a9f0f1cbd59f --- /dev/null +++ b/misc/binocle/files/patch-sctk @@ -0,0 +1,15 @@ +Backport https://github.com/Smithay/client-toolkit/commit/5cfd95021c05 +to ignore wl_surface::Event::preferred_buffer_scale after +https://invent.kde.org/plasma/kwin/-/commit/d2b0ed0c5a1e +https://github.com/swaywm/sway/commit/fc16fb65491b + +--- cargo-crates/smithay-client-toolkit-0.15.4/src/environment.rs.orig 1970-01-01 00:00:00 UTC ++++ cargo-crates/smithay-client-toolkit-0.15.4/src/environment.rs +@@ -283,6 +283,7 @@ impl> + AsRef(version, id)).clone()) + } + fn get(&self) -> Option> { diff --git a/net/sniffnet/Makefile b/net/sniffnet/Makefile index 5129d8529c7b..900d76587fad 100644 --- a/net/sniffnet/Makefile +++ b/net/sniffnet/Makefile @@ -1,7 +1,7 @@ PORTNAME= sniffnet DISTVERSIONPREFIX= v DISTVERSION= 1.2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MAINTAINER= tagattie@FreeBSD.org diff --git a/net/sniffnet/files/patch-sctk b/net/sniffnet/files/patch-sctk new file mode 100644 index 000000000000..9d2cabb1bcb0 --- /dev/null +++ b/net/sniffnet/files/patch-sctk @@ -0,0 +1,15 @@ +Backport https://github.com/Smithay/client-toolkit/commit/5cfd95021c05 +to ignore wl_surface::Event::preferred_buffer_scale after +https://invent.kde.org/plasma/kwin/-/commit/d2b0ed0c5a1e +https://github.com/swaywm/sway/commit/fc16fb65491b + +--- cargo-crates/smithay-client-toolkit-0.16.0/src/environment.rs.orig 1970-01-01 00:00:00 UTC ++++ cargo-crates/smithay-client-toolkit-0.16.0/src/environment.rs +@@ -283,6 +283,7 @@ impl> + AsRef(version, id)).clone()) + } + fn get(&self) -> Option> { diff --git a/security/gpg-tui/Makefile b/security/gpg-tui/Makefile index 43a0d4b70077..c39953cb828b 100644 --- a/security/gpg-tui/Makefile +++ b/security/gpg-tui/Makefile @@ -1,6 +1,7 @@ PORTNAME= gpg-tui DISTVERSIONPREFIX= v DISTVERSION= 0.10.0 +PORTREVISION= 1 CATEGORIES= security MAINTAINER= se@FreeBSD.org diff --git a/security/gpg-tui/files/patch-sctk b/security/gpg-tui/files/patch-sctk new file mode 100644 index 000000000000..9d2cabb1bcb0 --- /dev/null +++ b/security/gpg-tui/files/patch-sctk @@ -0,0 +1,15 @@ +Backport https://github.com/Smithay/client-toolkit/commit/5cfd95021c05 +to ignore wl_surface::Event::preferred_buffer_scale after +https://invent.kde.org/plasma/kwin/-/commit/d2b0ed0c5a1e +https://github.com/swaywm/sway/commit/fc16fb65491b + +--- cargo-crates/smithay-client-toolkit-0.16.0/src/environment.rs.orig 1970-01-01 00:00:00 UTC ++++ cargo-crates/smithay-client-toolkit-0.16.0/src/environment.rs +@@ -283,6 +283,7 @@ impl> + AsRef(version, id)).clone()) + } + fn get(&self) -> Option> { diff --git a/x11/alacritty/Makefile b/x11/alacritty/Makefile index 942466461b4a..3d26e7f13795 100644 --- a/x11/alacritty/Makefile +++ b/x11/alacritty/Makefile @@ -1,7 +1,7 @@ PORTNAME= alacritty DISTVERSIONPREFIX= v DISTVERSION= 0.12.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 wayland MAINTAINER= vishwin@FreeBSD.org diff --git a/x11/alacritty/files/patch-sctk b/x11/alacritty/files/patch-sctk new file mode 100644 index 000000000000..9d2cabb1bcb0 --- /dev/null +++ b/x11/alacritty/files/patch-sctk @@ -0,0 +1,15 @@ +Backport https://github.com/Smithay/client-toolkit/commit/5cfd95021c05 +to ignore wl_surface::Event::preferred_buffer_scale after +https://invent.kde.org/plasma/kwin/-/commit/d2b0ed0c5a1e +https://github.com/swaywm/sway/commit/fc16fb65491b + +--- cargo-crates/smithay-client-toolkit-0.16.0/src/environment.rs.orig 1970-01-01 00:00:00 UTC ++++ cargo-crates/smithay-client-toolkit-0.16.0/src/environment.rs +@@ -283,6 +283,7 @@ impl> + AsRef(version, id)).clone()) + } + fn get(&self) -> Option> { diff --git a/x11/kickoff/Makefile b/x11/kickoff/Makefile index 950059c67d02..28417b2ae274 100644 --- a/x11/kickoff/Makefile +++ b/x11/kickoff/Makefile @@ -1,7 +1,7 @@ PORTNAME= kickoff DISTVERSIONPREFIX= v DISTVERSION= 0.7.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11 wayland MAINTAINER= ports@FreeBSD.org diff --git a/x11/kickoff/files/patch-sctk b/x11/kickoff/files/patch-sctk new file mode 100644 index 000000000000..ed5aa00e138b --- /dev/null +++ b/x11/kickoff/files/patch-sctk @@ -0,0 +1,25 @@ +Backport https://github.com/Smithay/client-toolkit/commit/5cfd95021c05 +to ignore wl_surface::Event::preferred_buffer_scale after +https://invent.kde.org/plasma/kwin/-/commit/d2b0ed0c5a1e +https://github.com/swaywm/sway/commit/fc16fb65491b + +--- cargo-crates/smithay-client-toolkit-0.15.4/src/environment.rs.orig 1970-01-01 00:00:00 UTC ++++ cargo-crates/smithay-client-toolkit-0.15.4/src/environment.rs +@@ -283,6 +283,7 @@ impl> + AsRef(version, id)).clone()) + } + fn get(&self) -> Option> { +--- cargo-crates/smithay-client-toolkit-0.16.0/src/environment.rs.orig 1970-01-01 00:00:00 UTC ++++ cargo-crates/smithay-client-toolkit-0.16.0/src/environment.rs +@@ -283,6 +283,7 @@ impl> + AsRef(version, id)).clone()) + } + fn get(&self) -> Option> { diff --git a/x11/rio/Makefile b/x11/rio/Makefile index 2a6f239c6b21..b42395feae90 100644 --- a/x11/rio/Makefile +++ b/x11/rio/Makefile @@ -1,6 +1,7 @@ PORTNAME= rio DISTVERSIONPREFIX= v DISTVERSION= 0.0.19 +PORTREVISION= 1 CATEGORIES= x11 PKGNAMESUFFIX= -terminal-emulator diff --git a/x11/rio/files/patch-sctk b/x11/rio/files/patch-sctk new file mode 100644 index 000000000000..9d2cabb1bcb0 --- /dev/null +++ b/x11/rio/files/patch-sctk @@ -0,0 +1,15 @@ +Backport https://github.com/Smithay/client-toolkit/commit/5cfd95021c05 +to ignore wl_surface::Event::preferred_buffer_scale after +https://invent.kde.org/plasma/kwin/-/commit/d2b0ed0c5a1e +https://github.com/swaywm/sway/commit/fc16fb65491b + +--- cargo-crates/smithay-client-toolkit-0.16.0/src/environment.rs.orig 1970-01-01 00:00:00 UTC ++++ cargo-crates/smithay-client-toolkit-0.16.0/src/environment.rs +@@ -283,6 +283,7 @@ impl> + AsRef(version, id)).clone()) + } + fn get(&self) -> Option> { diff --git a/x11/wezterm/Makefile b/x11/wezterm/Makefile index 10a0f8d7e63c..c439afa52755 100644 --- a/x11/wezterm/Makefile +++ b/x11/wezterm/Makefile @@ -1,6 +1,6 @@ PORTNAME= wezterm DISTVERSION= 20230408-112425-69ae8472 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11 wayland MAINTAINER= ports@FreeBSD.org diff --git a/x11/wezterm/files/patch-sctk b/x11/wezterm/files/patch-sctk new file mode 100644 index 000000000000..9d2cabb1bcb0 --- /dev/null +++ b/x11/wezterm/files/patch-sctk @@ -0,0 +1,15 @@ +Backport https://github.com/Smithay/client-toolkit/commit/5cfd95021c05 +to ignore wl_surface::Event::preferred_buffer_scale after +https://invent.kde.org/plasma/kwin/-/commit/d2b0ed0c5a1e +https://github.com/swaywm/sway/commit/fc16fb65491b + +--- cargo-crates/smithay-client-toolkit-0.16.0/src/environment.rs.orig 1970-01-01 00:00:00 UTC ++++ cargo-crates/smithay-client-toolkit-0.16.0/src/environment.rs +@@ -283,6 +283,7 @@ impl> + AsRef(version, id)).clone()) + } + fn get(&self) -> Option> {