summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2023-08-03 00:39:51 +0000
committerJan Beich <jbeich@FreeBSD.org>2023-09-20 16:42:48 +0200
commit5c9692ca786cc9e0c9c9ff9c67cab97cb68b422b (patch)
treef86ec56f7bded877b9dcf2b08af0459fcc076315
parentcomms/gnuradio: Fix crash with GNU Radio buffers (diff)
x11-wm/sway-devel: unbreak Rust-based clients after edd477c5e7a4
interface 'wl_surface' has no event 2 PR: 268810 (cherry picked from commit 18741dd85a2e8e88c89e2fcbaa7c71d48f4d3740)
Diffstat
-rw-r--r--audio/spotify-player/Makefile2
-rw-r--r--audio/spotify-player/files/patch-sctk15
-rw-r--r--games/jumpy/Makefile2
-rw-r--r--games/jumpy/files/patch-sctk15
-rw-r--r--games/punchy/Makefile2
-rw-r--r--games/punchy/files/patch-sctk15
-rw-r--r--games/veloren-weekly/Makefile1
-rw-r--r--games/veloren-weekly/files/patch-sctk15
-rw-r--r--misc/binocle/Makefile2
-rw-r--r--misc/binocle/files/patch-sctk15
-rw-r--r--net/sniffnet/Makefile1
-rw-r--r--net/sniffnet/files/patch-sctk15
-rw-r--r--security/gpg-tui/Makefile2
-rw-r--r--security/gpg-tui/files/patch-sctk15
-rw-r--r--x11/alacritty/Makefile1
-rw-r--r--x11/alacritty/files/patch-sctk15
-rw-r--r--x11/kickoff/Makefile2
-rw-r--r--x11/kickoff/files/patch-sctk25
-rw-r--r--x11/wezterm/Makefile2
-rw-r--r--x11/wezterm/files/patch-sctk15
20 files changed, 170 insertions, 7 deletions
diff --git a/audio/spotify-player/Makefile b/audio/spotify-player/Makefile
index 20f475fe48f4..64ac633ab07d 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= 4
+PORTREVISION= 5
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<I: Interface + Clone + From<Proxy<I>> + AsRef<Pro
+ version: u32,
+ _: DispatchData,
+ ) {
++ let version = I::VERSION.min(version);
+ self.global = Some((*registry.bind::<I>(version, id)).clone())
+ }
+ fn get(&self) -> Option<Attached<I>> {
diff --git a/games/jumpy/Makefile b/games/jumpy/Makefile
index 8c0dcbf12417..ee7f585a62dc 100644
--- a/games/jumpy/Makefile
+++ b/games/jumpy/Makefile
@@ -1,7 +1,7 @@
PORTNAME= jumpy
DISTVERSIONPREFIX= v
DISTVERSION= 0.7.0
-PORTREVISION= 1
+PORTREVISION= 2
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<I: Interface + Clone + From<Proxy<I>> + AsRef<Pro
+ version: u32,
+ _: DispatchData,
+ ) {
++ let version = I::VERSION.min(version);
+ self.global = Some((*registry.bind::<I>(version, id)).clone())
+ }
+ fn get(&self) -> Option<Attached<I>> {
diff --git a/games/punchy/Makefile b/games/punchy/Makefile
index 1ceaa1a65cc0..197aade7faec 100644
--- a/games/punchy/Makefile
+++ b/games/punchy/Makefile
@@ -1,7 +1,7 @@
PORTNAME= punchy
DISTVERSIONPREFIX= v
DISTVERSION= 0.3.0
-PORTREVISION= 6
+PORTREVISION= 7
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<I: Interface + Clone + From<Proxy<I>> + AsRef<Pro
+ version: u32,
+ _: DispatchData,
+ ) {
++ let version = I::VERSION.min(version);
+ self.global = Some((*registry.bind::<I>(version, id)).clone())
+ }
+ fn get(&self) -> Option<Attached<I>> {
diff --git a/games/veloren-weekly/Makefile b/games/veloren-weekly/Makefile
index 9b3d1bf66104..965e5492cccc 100644
--- a/games/veloren-weekly/Makefile
+++ b/games/veloren-weekly/Makefile
@@ -1,5 +1,6 @@
PORTNAME= veloren
PORTVERSION= s20230913
+PORTREVISION= 1
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<I: Interface + Clone + From<Proxy<I>> + AsRef<Pro
+ version: u32,
+ _: DispatchData,
+ ) {
++ let version = I::VERSION.min(version);
+ self.global = Some((*registry.bind::<I>(version, id)).clone())
+ }
+ fn get(&self) -> Option<Attached<I>> {
diff --git a/misc/binocle/Makefile b/misc/binocle/Makefile
index 1c7b081e6628..9682b5311dd4 100644
--- a/misc/binocle/Makefile
+++ b/misc/binocle/Makefile
@@ -1,7 +1,7 @@
PORTNAME= binocle
DISTVERSIONPREFIX= v
DISTVERSION= 0.3.1
-PORTREVISION= 2
+PORTREVISION= 3
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<I: Interface + Clone + From<Proxy<I>> + AsRef<Pro
+ version: u32,
+ _: DispatchData,
+ ) {
++ let version = I::VERSION.min(version);
+ self.global = Some((*registry.bind::<I>(version, id)).clone())
+ }
+ fn get(&self) -> Option<Attached<I>> {
diff --git a/net/sniffnet/Makefile b/net/sniffnet/Makefile
index 4cced921ea9b..abe74e9f012d 100644
--- a/net/sniffnet/Makefile
+++ b/net/sniffnet/Makefile
@@ -1,6 +1,7 @@
PORTNAME= sniffnet
DISTVERSIONPREFIX= v
DISTVERSION= 1.2.1
+PORTREVISION= 1
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<I: Interface + Clone + From<Proxy<I>> + AsRef<Pro
+ version: u32,
+ _: DispatchData,
+ ) {
++ let version = I::VERSION.min(version);
+ self.global = Some((*registry.bind::<I>(version, id)).clone())
+ }
+ fn get(&self) -> Option<Attached<I>> {
diff --git a/security/gpg-tui/Makefile b/security/gpg-tui/Makefile
index 59daa808604a..f76b0729c072 100644
--- a/security/gpg-tui/Makefile
+++ b/security/gpg-tui/Makefile
@@ -1,7 +1,7 @@
PORTNAME= gpg-tui
DISTVERSIONPREFIX= v
DISTVERSION= 0.9.6
-PORTREVISION= 1
+PORTREVISION= 2
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<I: Interface + Clone + From<Proxy<I>> + AsRef<Pro
+ version: u32,
+ _: DispatchData,
+ ) {
++ let version = I::VERSION.min(version);
+ self.global = Some((*registry.bind::<I>(version, id)).clone())
+ }
+ fn get(&self) -> Option<Attached<I>> {
diff --git a/x11/alacritty/Makefile b/x11/alacritty/Makefile
index 9edb12cf3e1e..0379355b0864 100644
--- a/x11/alacritty/Makefile
+++ b/x11/alacritty/Makefile
@@ -1,6 +1,7 @@
PORTNAME= alacritty
DISTVERSIONPREFIX= v
DISTVERSION= 0.12.2
+PORTREVISION= 1
CATEGORIES= x11 wayland
MAINTAINER= mikael@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<I: Interface + Clone + From<Proxy<I>> + AsRef<Pro
+ version: u32,
+ _: DispatchData,
+ ) {
++ let version = I::VERSION.min(version);
+ self.global = Some((*registry.bind::<I>(version, id)).clone())
+ }
+ fn get(&self) -> Option<Attached<I>> {
diff --git a/x11/kickoff/Makefile b/x11/kickoff/Makefile
index 0085f6628cb6..55478536e015 100644
--- a/x11/kickoff/Makefile
+++ b/x11/kickoff/Makefile
@@ -1,7 +1,7 @@
PORTNAME= kickoff
DISTVERSIONPREFIX= v
DISTVERSION= 0.7.0
-PORTREVISION= 3
+PORTREVISION= 4
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<I: Interface + Clone + From<Proxy<I>> + AsRef<Pro
+ version: u32,
+ _: DispatchData,
+ ) {
++ let version = I::VERSION.min(version);
+ self.global = Some((*registry.bind::<I>(version, id)).clone())
+ }
+ fn get(&self) -> Option<Attached<I>> {
+--- 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<I: Interface + Clone + From<Proxy<I>> + AsRef<Pro
+ version: u32,
+ _: DispatchData,
+ ) {
++ let version = I::VERSION.min(version);
+ self.global = Some((*registry.bind::<I>(version, id)).clone())
+ }
+ fn get(&self) -> Option<Attached<I>> {
diff --git a/x11/wezterm/Makefile b/x11/wezterm/Makefile
index dd1d2f8de2cf..eac98125a225 100644
--- a/x11/wezterm/Makefile
+++ b/x11/wezterm/Makefile
@@ -1,6 +1,6 @@
PORTNAME= wezterm
DISTVERSION= 20230408-112425-69ae8472
-PORTREVISION= 2
+PORTREVISION= 3
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<I: Interface + Clone + From<Proxy<I>> + AsRef<Pro
+ version: u32,
+ _: DispatchData,
+ ) {
++ let version = I::VERSION.min(version);
+ self.global = Some((*registry.bind::<I>(version, id)).clone())
+ }
+ fn get(&self) -> Option<Attached<I>> {
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 14:11:03 +0000