summaryrefslogtreecommitdiff
path: root/x11/ashell/files
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--x11/ashell/files/extra-patch-iced184
-rw-r--r--x11/ashell/files/iced/patch-core_src_window_settings.rs19
-rw-r--r--x11/ashell/files/iced/patch-wgpu_src_window.rs13
-rw-r--r--x11/ashell/files/iced/patch-wgpu_src_window_x11.rs19
-rw-r--r--x11/ashell/files/iced/patch-winit_Cargo.toml11
-rw-r--r--x11/ashell/files/iced/patch-winit_src_clipboard.rs11
-rw-r--r--x11/ashell/files/iced/patch-winit_src_conversion.rs11
-rw-r--r--x11/ashell/files/iced/patch-winit_src_platform__specific_mod.rs89
-rw-r--r--x11/ashell/files/iced/patch-winit_src_program.rs11
9 files changed, 184 insertions, 184 deletions
diff --git a/x11/ashell/files/extra-patch-iced b/x11/ashell/files/extra-patch-iced
deleted file mode 100644
index 5284f3883af3..000000000000
--- a/x11/ashell/files/extra-patch-iced
+++ /dev/null
@@ -1,184 +0,0 @@
---- core/src/window/settings.rs.orig 2025-08-12 05:43:56.930387000 +0900
-+++ core/src/window/settings.rs 2025-08-12 05:51:27.392929000 +0900
-@@ -7,7 +7,7 @@
- #[path = "settings/macos.rs"]
- mod platform;
-
--#[cfg(target_os = "linux")]
-+#[cfg(any(target_os = "linux", target_os = "freebsd"))]
- #[path = "settings/linux.rs"]
- mod platform;
-
-@@ -19,6 +19,7 @@
- target_os = "windows",
- target_os = "macos",
- target_os = "linux",
-+ target_os = "freebsd",
- target_arch = "wasm32"
- )))]
- #[path = "settings/other.rs"]
---- wgpu/src/window.rs.orig 2025-08-12 05:53:26.460947000 +0900
-+++ wgpu/src/window.rs 2025-08-12 05:53:47.980178000 +0900
-@@ -17,8 +17,8 @@
- fn ids_from_dev(dev: u64) -> Option<(u16, u16)> {
- let path = PathBuf::from(format!(
- "/sys/dev/char/{}:{}/device",
-- major(dev),
-- minor(dev)
-+ major(dev.try_into().unwrap()),
-+ minor(dev.try_into().unwrap())
- ));
- let vendor = {
- let path = path.join("vendor");
---- wgpu/src/window/x11.rs.orig 2025-08-12 05:52:34.754698000 +0900
-+++ wgpu/src/window/x11.rs 2025-08-12 05:53:01.710865000 +0900
-@@ -145,7 +145,7 @@
- let stat =
- stat(Path::new("/dev/dri").join(device)).ok()?;
- let dev = stat.st_rdev;
-- return super::ids_from_dev(dev);
-+ return super::ids_from_dev(dev.into());
- }
- }
- }
-@@ -166,6 +166,6 @@
- let device_fd = dri3.device_fd;
- let stat = fstat(device_fd).ok()?;
- let dev = stat.st_rdev;
-- super::ids_from_dev(dev)
-+ super::ids_from_dev(dev.into())
- }
- }
---- winit/Cargo.toml.orig 2025-08-12 05:44:28.568644000 +0900
-+++ winit/Cargo.toml 2025-08-12 05:44:49.450272000 +0900
-@@ -56,7 +56,7 @@
- sysinfo.workspace = true
- sysinfo.optional = true
-
--[target.'cfg(target_os = "linux")'.dependencies]
-+[target.'cfg(any(target_os = "linux", target_os = "freebsd"))'.dependencies]
- raw-window-handle = { version = "0.6", optional = true }
- cctk.workspace = true
- cctk.optional = true
---- winit/src/clipboard.rs.orig 2025-08-12 05:45:04.844075000 +0900
-+++ winit/src/clipboard.rs 2025-08-12 05:45:26.719351000 +0900
-@@ -91,7 +91,7 @@
- })
- .unwrap_or(State::Unavailable);
-
-- #[cfg(target_os = "linux")]
-+ #[cfg(any(target_os = "linux", target_os = "freebsd"))]
- if let State::Connected { clipboard, .. } = &state {
- clipboard.init_dnd(Box::new(sender));
- }
---- winit/src/conversion.rs.orig 2025-08-12 05:45:36.250589000 +0900
-+++ winit/src/conversion.rs 2025-08-12 05:45:58.385240000 +0900
-@@ -106,7 +106,7 @@
- );
- }
-
-- #[cfg(target_os = "linux")]
-+ #[cfg(any(target_os = "linux", target_os = "freebsd"))]
- {
- #[cfg(feature = "x11")]
- {
---- winit/src/platform_specific/mod.rs.orig 2025-08-12 05:46:10.694807000 +0900
-+++ winit/src/platform_specific/mod.rs 2025-08-12 05:48:45.008556000 +0900
-@@ -10,19 +10,19 @@
- };
- use winit::raw_window_handle::HasWindowHandle;
-
--#[cfg(all(feature = "wayland", target_os = "linux"))]
-+#[cfg(all(feature = "wayland", any(target_os = "linux", target_os = "freebsd")))]
- pub mod wayland;
-
--#[cfg(all(feature = "wayland", target_os = "linux"))]
-+#[cfg(all(feature = "wayland", any(target_os = "linux", target_os = "freebsd")))]
- pub use wayland::*;
--#[cfg(all(feature = "wayland", target_os = "linux"))]
-+#[cfg(all(feature = "wayland", any(target_os = "linux", target_os = "freebsd")))]
- use wayland_backend::client::Backend;
-
- use crate::{program::WindowManager, Program};
-
- #[derive(Debug)]
- pub enum Event {
-- #[cfg(all(feature = "wayland", target_os = "linux"))]
-+ #[cfg(all(feature = "wayland", any(target_os = "linux", target_os = "freebsd")))]
- Wayland(sctk_event::SctkEvent),
- }
-
-@@ -48,7 +48,7 @@
-
- #[derive(Debug, Default)]
- pub struct PlatformSpecific {
-- #[cfg(all(feature = "wayland", target_os = "linux"))]
-+ #[cfg(all(feature = "wayland", any(target_os = "linux", target_os = "freebsd")))]
- wayland: WaylandSpecific,
- }
-
-@@ -58,7 +58,7 @@
- action: iced_runtime::platform_specific::Action,
- ) {
- match action {
-- #[cfg(all(feature = "wayland", target_os = "linux"))]
-+ #[cfg(all(feature = "wayland", any(target_os = "linux", target_os = "freebsd")))]
- iced_runtime::platform_specific::Action::Wayland(a) => {
- self.send_wayland(wayland::Action::Action(a));
- }
-@@ -66,7 +66,7 @@
- }
-
- pub(crate) fn clear_subsurface_list(&mut self) {
-- #[cfg(all(feature = "wayland", target_os = "linux"))]
-+ #[cfg(all(feature = "wayland", any(target_os = "linux", target_os = "freebsd")))]
- {
- self.wayland.clear_subsurface_list();
- }
-@@ -77,7 +77,7 @@
- id: window::Id,
- window: &dyn HasWindowHandle,
- ) {
-- #[cfg(all(feature = "wayland", target_os = "linux"))]
-+ #[cfg(all(feature = "wayland", any(target_os = "linux", target_os = "freebsd")))]
- {
- use cctk::sctk::reexports::client::{
- protocol::wl_surface::WlSurface, Proxy,
-@@ -128,7 +128,7 @@
- pub(crate) fn create_surface(
- &mut self,
- ) -> Option<Box<dyn HasWindowHandle + Send + Sync + 'static>> {
-- #[cfg(all(feature = "wayland", target_os = "linux"))]
-+ #[cfg(all(feature = "wayland", any(target_os = "linux", target_os = "freebsd")))]
- {
- return self.wayland.create_surface();
- }
-@@ -144,7 +144,7 @@
- data: &[u8],
- offset: Vector,
- ) {
-- #[cfg(all(feature = "wayland", target_os = "linux"))]
-+ #[cfg(all(feature = "wayland", any(target_os = "linux", target_os = "freebsd")))]
- {
- return self.wayland.update_surface_shm(
- surface, width, height, scale, data, offset,
-@@ -183,7 +183,7 @@
- C: Compositor<Renderer = P::Renderer>,
- {
- match e {
-- #[cfg(all(feature = "wayland", target_os = "linux"))]
-+ #[cfg(all(feature = "wayland", any(target_os = "linux", target_os = "freebsd")))]
- Event::Wayland(e) => {
- platform_specific.wayland.handle_event(
- e,
---- winit/src/program.rs.orig 2025-08-12 05:49:03.664542000 +0900
-+++ winit/src/program.rs 2025-08-12 05:49:23.665007000 +0900
-@@ -773,7 +773,7 @@
-
- let mut platform_specific_handler =
- crate::platform_specific::PlatformSpecific::default();
-- #[cfg(all(feature = "wayland", target_os = "linux"))]
-+ #[cfg(all(feature = "wayland", any(target_os = "linux", target_os = "freebsd")))]
- if is_wayland {
- platform_specific_handler = platform_specific_handler.with_wayland(
- control_sender.clone(),
diff --git a/x11/ashell/files/iced/patch-core_src_window_settings.rs b/x11/ashell/files/iced/patch-core_src_window_settings.rs
new file mode 100644
index 000000000000..69cfd050e40b
--- /dev/null
+++ b/x11/ashell/files/iced/patch-core_src_window_settings.rs
@@ -0,0 +1,19 @@
+--- core/src/window/settings.rs.orig 2025-09-19 07:04:16 UTC
++++ core/src/window/settings.rs
+@@ -7,7 +7,7 @@ mod platform;
+ #[path = "settings/macos.rs"]
+ mod platform;
+
+-#[cfg(target_os = "linux")]
++#[cfg(any(target_os = "linux", target_os = "freebsd"))]
+ #[path = "settings/linux.rs"]
+ mod platform;
+
+@@ -19,6 +19,7 @@ mod platform;
+ target_os = "windows",
+ target_os = "macos",
+ target_os = "linux",
++ target_os = "freebsd",
+ target_arch = "wasm32"
+ )))]
+ #[path = "settings/other.rs"]
diff --git a/x11/ashell/files/iced/patch-wgpu_src_window.rs b/x11/ashell/files/iced/patch-wgpu_src_window.rs
new file mode 100644
index 000000000000..c185be3fdf87
--- /dev/null
+++ b/x11/ashell/files/iced/patch-wgpu_src_window.rs
@@ -0,0 +1,13 @@
+--- wgpu/src/window.rs.orig 2025-09-19 07:04:16 UTC
++++ wgpu/src/window.rs
+@@ -17,8 +17,8 @@ fn ids_from_dev(dev: u64) -> Option<(u16, u16)> {
+ fn ids_from_dev(dev: u64) -> Option<(u16, u16)> {
+ let path = PathBuf::from(format!(
+ "/sys/dev/char/{}:{}/device",
+- major(dev),
+- minor(dev)
++ major(dev.try_into().unwrap()),
++ minor(dev.try_into().unwrap())
+ ));
+ let vendor = {
+ let path = path.join("vendor");
diff --git a/x11/ashell/files/iced/patch-wgpu_src_window_x11.rs b/x11/ashell/files/iced/patch-wgpu_src_window_x11.rs
new file mode 100644
index 000000000000..6cf65d257aa8
--- /dev/null
+++ b/x11/ashell/files/iced/patch-wgpu_src_window_x11.rs
@@ -0,0 +1,19 @@
+--- wgpu/src/window/x11.rs.orig 2025-09-19 07:04:16 UTC
++++ wgpu/src/window/x11.rs
+@@ -145,7 +145,7 @@ pub fn get_x11_device_ids<W: Window>(window: &W) -> Op
+ let stat =
+ stat(Path::new("/dev/dri").join(device)).ok()?;
+ let dev = stat.st_rdev;
+- return super::ids_from_dev(dev);
++ return super::ids_from_dev(dev.into());
+ }
+ }
+ }
+@@ -166,6 +166,6 @@ pub fn get_x11_device_ids<W: Window>(window: &W) -> Op
+ let device_fd = dri3.device_fd;
+ let stat = fstat(device_fd).ok()?;
+ let dev = stat.st_rdev;
+- super::ids_from_dev(dev)
++ super::ids_from_dev(dev.into())
+ }
+ }
diff --git a/x11/ashell/files/iced/patch-winit_Cargo.toml b/x11/ashell/files/iced/patch-winit_Cargo.toml
new file mode 100644
index 000000000000..a2d1009620b5
--- /dev/null
+++ b/x11/ashell/files/iced/patch-winit_Cargo.toml
@@ -0,0 +1,11 @@
+--- winit/Cargo.toml.orig 2025-09-19 07:04:16 UTC
++++ winit/Cargo.toml
+@@ -56,7 +56,7 @@ sysinfo.optional = true
+ sysinfo.workspace = true
+ sysinfo.optional = true
+
+-[target.'cfg(target_os = "linux")'.dependencies]
++[target.'cfg(any(target_os = "linux", target_os = "freebsd"))'.dependencies]
+ raw-window-handle = { version = "0.6", optional = true }
+ cctk.workspace = true
+ cctk.optional = true
diff --git a/x11/ashell/files/iced/patch-winit_src_clipboard.rs b/x11/ashell/files/iced/patch-winit_src_clipboard.rs
new file mode 100644
index 000000000000..7c1260fff897
--- /dev/null
+++ b/x11/ashell/files/iced/patch-winit_src_clipboard.rs
@@ -0,0 +1,11 @@
+--- winit/src/clipboard.rs.orig 2025-09-19 07:04:16 UTC
++++ winit/src/clipboard.rs
+@@ -91,7 +91,7 @@ impl Clipboard {
+ })
+ .unwrap_or(State::Unavailable);
+
+- #[cfg(target_os = "linux")]
++ #[cfg(any(target_os = "linux", target_os = "freebsd"))]
+ if let State::Connected { clipboard, .. } = &state {
+ clipboard.init_dnd(Box::new(sender));
+ }
diff --git a/x11/ashell/files/iced/patch-winit_src_conversion.rs b/x11/ashell/files/iced/patch-winit_src_conversion.rs
new file mode 100644
index 000000000000..68944941bc47
--- /dev/null
+++ b/x11/ashell/files/iced/patch-winit_src_conversion.rs
@@ -0,0 +1,11 @@
+--- winit/src/conversion.rs.orig 2025-09-19 07:04:16 UTC
++++ winit/src/conversion.rs
+@@ -105,7 +105,7 @@ pub fn window_attributes(
+ );
+ }
+
+- #[cfg(target_os = "linux")]
++ #[cfg(any(target_os = "linux", target_os = "freebsd"))]
+ {
+ #[cfg(feature = "x11")]
+ {
diff --git a/x11/ashell/files/iced/patch-winit_src_platform__specific_mod.rs b/x11/ashell/files/iced/patch-winit_src_platform__specific_mod.rs
new file mode 100644
index 000000000000..1c197d196569
--- /dev/null
+++ b/x11/ashell/files/iced/patch-winit_src_platform__specific_mod.rs
@@ -0,0 +1,89 @@
+--- winit/src/platform_specific/mod.rs.orig 2025-09-19 07:04:16 UTC
++++ winit/src/platform_specific/mod.rs
+@@ -10,19 +10,19 @@ use winit::raw_window_handle::HasWindowHandle;
+ };
+ use winit::raw_window_handle::HasWindowHandle;
+
+-#[cfg(all(feature = "wayland", target_os = "linux"))]
++#[cfg(all(feature = "wayland", any(target_os = "linux", target_os = "freebsd")))]
+ pub mod wayland;
+
+-#[cfg(all(feature = "wayland", target_os = "linux"))]
++#[cfg(all(feature = "wayland", any(target_os = "linux", target_os = "freebsd")))]
+ pub use wayland::*;
+-#[cfg(all(feature = "wayland", target_os = "linux"))]
++#[cfg(all(feature = "wayland", any(target_os = "linux", target_os = "freebsd")))]
+ use wayland_backend::client::Backend;
+
+ use crate::{program::WindowManager, Program};
+
+ #[derive(Debug)]
+ pub enum Event {
+- #[cfg(all(feature = "wayland", target_os = "linux"))]
++ #[cfg(all(feature = "wayland", any(target_os = "linux", target_os = "freebsd")))]
+ Wayland(sctk_event::SctkEvent),
+ }
+
+@@ -48,7 +48,7 @@ pub struct PlatformSpecific {
+
+ #[derive(Debug, Default)]
+ pub struct PlatformSpecific {
+- #[cfg(all(feature = "wayland", target_os = "linux"))]
++ #[cfg(all(feature = "wayland", any(target_os = "linux", target_os = "freebsd")))]
+ wayland: WaylandSpecific,
+ }
+
+@@ -58,7 +58,7 @@ impl PlatformSpecific {
+ action: iced_runtime::platform_specific::Action,
+ ) {
+ match action {
+- #[cfg(all(feature = "wayland", target_os = "linux"))]
++ #[cfg(all(feature = "wayland", any(target_os = "linux", target_os = "freebsd")))]
+ iced_runtime::platform_specific::Action::Wayland(a) => {
+ self.send_wayland(wayland::Action::Action(a));
+ }
+@@ -76,7 +76,7 @@ impl PlatformSpecific {
+ }
+
+ pub(crate) fn clear_subsurface_list(&mut self) {
+- #[cfg(all(feature = "wayland", target_os = "linux"))]
++ #[cfg(all(feature = "wayland", any(target_os = "linux", target_os = "freebsd")))]
+ {
+ self.wayland.clear_subsurface_list();
+ }
+@@ -87,7 +87,7 @@ impl PlatformSpecific {
+ id: window::Id,
+ window: &dyn HasWindowHandle,
+ ) {
+- #[cfg(all(feature = "wayland", target_os = "linux"))]
++ #[cfg(all(feature = "wayland", any(target_os = "linux", target_os = "freebsd")))]
+ {
+ use cctk::sctk::reexports::client::{
+ protocol::wl_surface::WlSurface, Proxy,
+@@ -138,7 +138,7 @@ impl PlatformSpecific {
+ pub(crate) fn create_surface(
+ &mut self,
+ ) -> Option<Box<dyn HasWindowHandle + Send + Sync + 'static>> {
+- #[cfg(all(feature = "wayland", target_os = "linux"))]
++ #[cfg(all(feature = "wayland", any(target_os = "linux", target_os = "freebsd")))]
+ {
+ return self.wayland.create_surface();
+ }
+@@ -154,7 +154,7 @@ impl PlatformSpecific {
+ data: &[u8],
+ offset: Vector,
+ ) {
+- #[cfg(all(feature = "wayland", target_os = "linux"))]
++ #[cfg(all(feature = "wayland", any(target_os = "linux", target_os = "freebsd")))]
+ {
+ return self.wayland.update_surface_shm(
+ surface, width, height, scale, data, offset,
+@@ -193,7 +193,7 @@ pub(crate) fn handle_event<'a, P, C>(
+ C: Compositor<Renderer = P::Renderer>,
+ {
+ match e {
+- #[cfg(all(feature = "wayland", target_os = "linux"))]
++ #[cfg(all(feature = "wayland", any(target_os = "linux", target_os = "freebsd")))]
+ Event::Wayland(e) => {
+ platform_specific.wayland.handle_event(
+ e,
diff --git a/x11/ashell/files/iced/patch-winit_src_program.rs b/x11/ashell/files/iced/patch-winit_src_program.rs
new file mode 100644
index 000000000000..c9f71c7515ca
--- /dev/null
+++ b/x11/ashell/files/iced/patch-winit_src_program.rs
@@ -0,0 +1,11 @@
+--- winit/src/program.rs.orig 2025-09-19 07:04:16 UTC
++++ winit/src/program.rs
+@@ -773,7 +773,7 @@ async fn run_instance<'a, P, C>(
+
+ let mut platform_specific_handler =
+ crate::platform_specific::PlatformSpecific::default();
+- #[cfg(all(feature = "wayland", target_os = "linux"))]
++ #[cfg(all(feature = "wayland", any(target_os = "linux", target_os = "freebsd")))]
+ if is_wayland {
+ platform_specific_handler = platform_specific_handler.with_wayland(
+ control_sender.clone(),
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-13 20:11:00 +0000