Skip to content

Commit

Permalink
x11-wm/sway-devel: unbreak Rust-based clients after edd477c
Browse files Browse the repository at this point in the history 
interface 'wl_surface' has no event 2

PR:		268810
  • Loading branch information
@jbeich
jbeich committed Sep 20, 2023
1 parent 14af59f commit 18741dd
Show file tree
Hide file tree
Showing 22 changed files with 186 additions and 9 deletions.
2 changes: 1 addition & 1 deletion audio/spotify-player/Makefile
View file
@@ -1,7 +1,7 @@
PORTNAME= spotify-player
DISTVERSIONPREFIX= v
DISTVERSION= 0.10.0
PORTREVISION= 7
PORTREVISION= 8
CATEGORIES= audio

MAINTAINER= jfree@FreeBSD.org
Expand Down
15 changes: 15 additions & 0 deletions audio/spotify-player/files/patch-sctk
View file
@@ -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>> {
2 changes: 1 addition & 1 deletion games/jumpy/Makefile
View file
@@ -1,7 +1,7 @@
PORTNAME= jumpy
DISTVERSIONPREFIX= v
DISTVERSION= 0.7.0
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= games wayland

MAINTAINER= jbeich@FreeBSD.org
Expand Down
15 changes: 15 additions & 0 deletions games/jumpy/files/patch-sctk
View file
@@ -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>> {
2 changes: 1 addition & 1 deletion games/punchy/Makefile
View file
@@ -1,7 +1,7 @@
PORTNAME= punchy
DISTVERSIONPREFIX= v
DISTVERSION= 0.3.0
PORTREVISION= 9
PORTREVISION= 10
CATEGORIES= games wayland

MAINTAINER= jbeich@FreeBSD.org
Expand Down
15 changes: 15 additions & 0 deletions games/punchy/files/patch-sctk
View file
@@ -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>> {
2 changes: 1 addition & 1 deletion games/veloren-weekly/Makefile
View file
@@ -1,6 +1,6 @@
PORTNAME= veloren
PORTVERSION= s20230913
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= games wayland
PKGNAMESUFFIX= -weekly

Expand Down
15 changes: 15 additions & 0 deletions games/veloren-weekly/files/patch-sctk
View file
@@ -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>> {
2 changes: 1 addition & 1 deletion misc/binocle/Makefile
View file
@@ -1,7 +1,7 @@
PORTNAME= binocle
DISTVERSIONPREFIX= v
DISTVERSION= 0.3.1
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= misc

MAINTAINER= yuri@FreeBSD.org
Expand Down
15 changes: 15 additions & 0 deletions misc/binocle/files/patch-sctk
View file
@@ -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>> {
2 changes: 1 addition & 1 deletion net/sniffnet/Makefile
View file
@@ -1,7 +1,7 @@
PORTNAME= sniffnet
DISTVERSIONPREFIX= v
DISTVERSION= 1.2.2
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= net

MAINTAINER= tagattie@FreeBSD.org
Expand Down
15 changes: 15 additions & 0 deletions net/sniffnet/files/patch-sctk
View file
@@ -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>> {
1 change: 1 addition & 0 deletions security/gpg-tui/Makefile
View file
@@ -1,6 +1,7 @@
PORTNAME= gpg-tui
DISTVERSIONPREFIX= v
DISTVERSION= 0.10.0
PORTREVISION= 1
CATEGORIES= security

MAINTAINER= se@FreeBSD.org
Expand Down
15 changes: 15 additions & 0 deletions security/gpg-tui/files/patch-sctk
View file
@@ -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>> {
2 changes: 1 addition & 1 deletion x11/alacritty/Makefile
View file
@@ -1,7 +1,7 @@
PORTNAME= alacritty
DISTVERSIONPREFIX= v
DISTVERSION= 0.12.2
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= x11 wayland

MAINTAINER= vishwin@FreeBSD.org
Expand Down
15 changes: 15 additions & 0 deletions x11/alacritty/files/patch-sctk
View file
@@ -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>> {
2 changes: 1 addition & 1 deletion x11/kickoff/Makefile
View file
@@ -1,7 +1,7 @@
PORTNAME= kickoff
DISTVERSIONPREFIX= v
DISTVERSION= 0.7.0
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= x11 wayland

MAINTAINER= ports@FreeBSD.org
Expand Down
25 changes: 25 additions & 0 deletions x11/kickoff/files/patch-sctk
View file
@@ -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>> {
1 change: 1 addition & 0 deletions x11/rio/Makefile
View file
@@ -1,6 +1,7 @@
PORTNAME= rio
DISTVERSIONPREFIX= v
DISTVERSION= 0.0.19
PORTREVISION= 1
CATEGORIES= x11
PKGNAMESUFFIX= -terminal-emulator

Expand Down
15 changes: 15 additions & 0 deletions x11/rio/files/patch-sctk
View file
@@ -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>> {
2 changes: 1 addition & 1 deletion x11/wezterm/Makefile
View file
@@ -1,6 +1,6 @@
PORTNAME= wezterm
DISTVERSION= 20230408-112425-69ae8472
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= x11 wayland

MAINTAINER= ports@FreeBSD.org
Expand Down
15 changes: 15 additions & 0 deletions x11/wezterm/files/patch-sctk
View file
@@ -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>> {

0 comments on commit 18741dd

Please sign in to comment.