Attachment #236369 for bug #266232

View | Details | Raw Unified | Return to bug 266232
Collapse All | Expand All

Lines 1-5 Link Here

(-)b/editors/lapce/Makefile (-2 / +2 lines)
1	PORTNAME= lapce	1	PORTNAME= lapce
2	PORTVERSION= g20220826 # remove openssl-src-* from CARGO-CRATES each update	2	DISTVERSIONPREFIX= v
		3	DISTVERSION= 0.2.0 # remove openssl-src-* from CARGO-CRATES each update
3	CATEGORIES= editors	4	CATEGORIES= editors
4		5
5	MAINTAINER= eduardo@FreeBSD.org	6	MAINTAINER= eduardo@FreeBSD.org
Lines 18-24 LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ Link Here
18		19
19	USES= cargo gmake gnome localbase:ldflags perl5 pkgconfig ssl	20	USES= cargo gmake gnome localbase:ldflags perl5 pkgconfig ssl
20	USE_GITHUB= yes	21	USE_GITHUB= yes
21	GH_TAGNAME= 5abf778
22	USE_GNOME= atk gdkpixbuf2 gtk30 pango	22	USE_GNOME= atk gdkpixbuf2 gtk30 pango
23		23
24	PLIST_FILES= bin/lapce \	24	PLIST_FILES= bin/lapce \

Lines 13-21 CARGO_CRATES= Inflector-0.11.4 \ Link Here

(-)b/editors/lapce/Makefile.crates (-2 / +20 lines)
13	arrayref-0.3.6 \	13	arrayref-0.3.6 \
14	arrayvec-0.5.2 \	14	arrayvec-0.5.2 \
15	arrayvec-0.7.2 \	15	arrayvec-0.7.2 \
		16	async-channel-1.7.1 \
		17	async-task-4.3.0 \
16	async-trait-0.1.57 \	18	async-trait-0.1.57 \
17	atk-0.14.0 \	19	atk-0.14.0 \
18	atk-sys-0.14.0 \	20	atk-sys-0.14.0 \
		21	atomic-waker-1.0.0 \
19	atty-0.2.14 \	22	atty-0.2.14 \
20	autocfg-1.1.0 \	23	autocfg-1.1.0 \
21	backtrace-0.3.66 \	24	backtrace-0.3.66 \
Lines 27-32 CARGO_CRATES= Inflector-0.11.4 \ Link Here
27	bitmaps-2.1.0 \	30	bitmaps-2.1.0 \
28	block-0.1.6 \	31	block-0.1.6 \
29	block-buffer-0.9.0 \	32	block-buffer-0.9.0 \
		33	blocking-1.2.0 \
30	bstr-0.2.17 \	34	bstr-0.2.17 \
31	bumpalo-3.10.0 \	35	bumpalo-3.10.0 \
32	bytecount-0.6.3 \	36	bytecount-0.6.3 \
Lines 34-39 CARGO_CRATES= Inflector-0.11.4 \ Link Here
34	bytemuck_derive-1.2.0 \	38	bytemuck_derive-1.2.0 \
35	byteorder-1.4.3 \	39	byteorder-1.4.3 \
36	bytes-1.2.1 \	40	bytes-1.2.1 \
		41	cache-padded-1.2.0 \
37	cairo-rs-0.14.9 \	42	cairo-rs-0.14.9 \
38	cairo-sys-rs-0.14.9 \	43	cairo-sys-rs-0.14.9 \
39	cap-fs-ext-0.25.2 \	44	cap-fs-ext-0.25.2 \
Lines 47-57 CARGO_CRATES= Inflector-0.11.4 \ Link Here
47	cfg-if-1.0.0 \	52	cfg-if-1.0.0 \
48	cgl-0.3.2 \	53	cgl-0.3.2 \
49	chrono-0.4.22 \	54	chrono-0.4.22 \
		55	clap-3.2.17 \
		56	clap_derive-3.2.17 \
		57	clap_lex-0.2.4 \
50	cmake-0.1.48 \	58	cmake-0.1.48 \
51	cocoa-0.24.0 \	59	cocoa-0.24.0 \
52	cocoa-foundation-0.1.0 \	60	cocoa-foundation-0.1.0 \
53	color_quant-1.1.0 \	61	color_quant-1.1.0 \
54	combine-4.6.6 \	62	combine-4.6.6 \
		63	concurrent-queue-1.2.4 \
55	config-0.11.0 \	64	config-0.11.0 \
56	console_error_panic_hook-0.1.7 \	65	console_error_panic_hook-0.1.7 \
57	const-cstr-0.3.0 \	66	const-cstr-0.3.0 \
Lines 100-105 CARGO_CRATES= Inflector-0.11.4 \ Link Here
100	errno-0.2.8 \	109	errno-0.2.8 \
101	errno-dragonfly-0.1.2 \	110	errno-dragonfly-0.1.2 \
102	euclid-0.22.7 \	111	euclid-0.22.7 \
		112	event-listener-2.5.3 \
103	exr-1.4.2 \	113	exr-1.4.2 \
104	fallible-iterator-0.2.0 \	114	fallible-iterator-0.2.0 \
105	fastrand-1.8.0 \	115	fastrand-1.8.0 \
Lines 137-142 CARGO_CRATES= Inflector-0.11.4 \ Link Here
137	futures-core-0.3.23 \	147	futures-core-0.3.23 \
138	futures-executor-0.3.23 \	148	futures-executor-0.3.23 \
139	futures-io-0.3.23 \	149	futures-io-0.3.23 \
		150	futures-lite-1.12.0 \
140	futures-macro-0.3.23 \	151	futures-macro-0.3.23 \
141	futures-sink-0.3.23 \	152	futures-sink-0.3.23 \
142	futures-task-0.3.23 \	153	futures-task-0.3.23 \
Lines 200-207 CARGO_CRATES= Inflector-0.11.4 \ Link Here
200	inotify-0.9.6 \	211	inotify-0.9.6 \
201	inotify-sys-0.1.5 \	212	inotify-sys-0.1.5 \
202	instant-0.1.12 \	213	instant-0.1.12 \
		214	interprocess-1.1.1 \
203	intl-memoizer-0.5.1 \	215	intl-memoizer-0.5.1 \
204	intl_pluralrules-7.0.1 \	216	intl_pluralrules-7.0.1 \
		217	intmap-0.7.1 \
205	io-extras-0.15.0 \	218	io-extras-0.15.0 \
206	io-lifetimes-0.7.3 \	219	io-lifetimes-0.7.3 \
207	iovec-0.1.4 \	220	iovec-0.1.4 \
Lines 285-292 CARGO_CRATES= Inflector-0.11.4 \ Link Here
285	openssl-macros-0.1.0 \	298	openssl-macros-0.1.0 \
286	openssl-probe-0.1.5 \	299	openssl-probe-0.1.5 \
287	openssl-sys-0.9.75 \	300	openssl-sys-0.9.75 \
		301	os_str_bytes-6.3.0 \
288	pango-0.14.8 \	302	pango-0.14.8 \
289	pango-sys-0.14.0 \	303	pango-sys-0.14.0 \
		304	parking-2.0.0 \
290	parking_lot-0.11.2 \	305	parking_lot-0.11.2 \
291	parking_lot-0.12.1 \	306	parking_lot-0.12.1 \
292	parking_lot_core-0.8.5 \	307	parking_lot_core-0.8.5 \
Lines 383-388 CARGO_CRATES= Inflector-0.11.4 \ Link Here
383	smallvec-1.9.0 \	398	smallvec-1.9.0 \
384	socket2-0.4.4 \	399	socket2-0.4.4 \
385	spin-0.9.4 \	400	spin-0.9.4 \
		401	spinning-0.1.0 \
386	spsc-buffer-0.1.1 \	402	spsc-buffer-0.1.1 \
387	stable_deref_trait-1.2.0 \	403	stable_deref_trait-1.2.0 \
388	static_assertions-1.1.0 \	404	static_assertions-1.1.0 \
Lines 401-406 CARGO_CRATES= Inflector-0.11.4 \ Link Here
401	target-lexicon-0.12.4 \	417	target-lexicon-0.12.4 \
402	tempfile-3.3.0 \	418	tempfile-3.3.0 \
403	termcolor-1.1.3 \	419	termcolor-1.1.3 \
		420	textwrap-0.15.0 \
404	thiserror-1.0.32 \	421	thiserror-1.0.32 \
405	thiserror-impl-1.0.32 \	422	thiserror-impl-1.0.32 \
406	thread-id-4.0.0 \	423	thread-id-4.0.0 \
Lines 478-483 CARGO_CRATES= Inflector-0.11.4 \ Link Here
478	version_check-0.9.4 \	495	version_check-0.9.4 \
479	vte-0.10.1 \	496	vte-0.10.1 \
480	vte_generate_state_changes-0.1.1 \	497	vte_generate_state_changes-0.1.1 \
		498	waker-fn-1.1.0 \
481	walkdir-2.3.2 \	499	walkdir-2.3.2 \
482	want-0.3.0 \	500	want-0.3.0 \
483	wasi-0.10.0+wasi-snapshot-preview1 \	501	wasi-0.10.0+wasi-snapshot-preview1 \
Lines 551-558 CARGO_CRATES= Inflector-0.11.4 \ Link Here
551	zstd-sys-2.0.1+zstd.1.5.2 \	569	zstd-sys-2.0.1+zstd.1.5.2 \
552	tree-sitter-wgsl@git+https://github.com/szebniok/tree-sitter-wgsl?branch=master\#272e89ef2aeac74178edb9db4a83c1ffef80a463 \	570	tree-sitter-wgsl@git+https://github.com/szebniok/tree-sitter-wgsl?branch=master\#272e89ef2aeac74178edb9db4a83c1ffef80a463 \
553	psp-types@git+https://github.com/lapce/psp-types\#0a18e1d285b6e1791e440728c633ef84ed99d1e0 \	571	psp-types@git+https://github.com/lapce/psp-types\#0a18e1d285b6e1791e440728c633ef84ed99d1e0 \
554	druid,druid-derive,druid-shell@git+https://github.com/lapce/druid?branch=shell_opengl\#85d503a79df7581d1a144f97ee1cc369788b55b8 \
555	tree-sitter-glimmer@git+https://github.com/VixieTSQ/tree-sitter-glimmer\#7281caca2ba114e1960c5d944a37860ef0841426 \	572	tree-sitter-glimmer@git+https://github.com/VixieTSQ/tree-sitter-glimmer\#7281caca2ba114e1960c5d944a37860ef0841426 \
		573	druid,druid-derive,druid-shell@git+https://github.com/lapce/druid?branch=shell_opengl\#3e53ab2159b7154fea77731ff7633970a40cb7b4 \
		574	tree-sitter-yaml@git+https://github.com/panekj/tree-sitter-yaml?branch=master\#80c8d76847f03e772c5c524cf29bafb56858a8d1 \
556	tree-sitter-ruby@git+https://github.com/Liberatys/tree-sitter-ruby.git?branch=chore/allow-range-of-tree-sitter\#26086eeb072266abf51273af631a2cb62d0fd1e8 \	575	tree-sitter-ruby@git+https://github.com/Liberatys/tree-sitter-ruby.git?branch=chore/allow-range-of-tree-sitter\#26086eeb072266abf51273af631a2cb62d0fd1e8 \
557	wasi-experimental-http-wasmtime@git+https://github.com/lapce/wasi-experimental-http\#3685f0893ef19c1cca5b16a11ba01ff7ade14a5f \	576	wasi-experimental-http-wasmtime@git+https://github.com/lapce/wasi-experimental-http\#3685f0893ef19c1cca5b16a11ba01ff7ade14a5f \
558	tree-sitter-haxe@git+https://github.com/VixieTSQ/tree-sitter-haxe\#a3e23bc0f84a53371eb5d86229782ec6c21d3729 \	577	tree-sitter-haxe@git+https://github.com/VixieTSQ/tree-sitter-haxe\#a3e23bc0f84a53371eb5d86229782ec6c21d3729 \
Lines 568-574 CARGO_CRATES= Inflector-0.11.4 \ Link Here
568	tree-sitter-ocaml@git+https://github.com/tree-sitter/tree-sitter-ocaml\#cc26b1ef111100f26a137bcbcd39fd4e35be9a59 \	587	tree-sitter-ocaml@git+https://github.com/tree-sitter/tree-sitter-ocaml\#cc26b1ef111100f26a137bcbcd39fd4e35be9a59 \
569	tree-sitter-hcl@git+https://github.com/VixieTSQ/tree-sitter-hcl\#f4aa4553344e03e149ec459549a7f686d6846626 \	588	tree-sitter-hcl@git+https://github.com/VixieTSQ/tree-sitter-hcl\#f4aa4553344e03e149ec459549a7f686d6846626 \
570	tree-sitter-zig@git+https://github.com/maxxnino/tree-sitter-zig?branch=main\#8d3224c3bd0890fe08358886ebf54fca2ed448a6 \	589	tree-sitter-zig@git+https://github.com/maxxnino/tree-sitter-zig?branch=main\#8d3224c3bd0890fe08358886ebf54fca2ed448a6 \
571	tree-sitter-yaml@git+https://github.com/panekj/tree-sitter-yaml?branch=master\#faed130c65531addfa3edf855e1d417b96c7f163 \
572	tree-sitter-haskell@git+https://github.com/tree-sitter/tree-sitter-haskell\#972156b37ee6f4a8b51a6f67f76aecc6fa13714c \	590	tree-sitter-haskell@git+https://github.com/tree-sitter/tree-sitter-haskell\#972156b37ee6f4a8b51a6f67f76aecc6fa13714c \
573	piet-wgpu@git+https://github.com/lapce/piet-wgpu?branch=shell_opengl\#f863b3e49175d1811e6008cea2ca1bd282fc5bed \	591	piet-wgpu@git+https://github.com/lapce/piet-wgpu?branch=shell_opengl\#f863b3e49175d1811e6008cea2ca1bd282fc5bed \
574	tree-sitter-scss@git+https://github.com/VixieTSQ/tree-sitter-scss?branch=patch-1\#3aac3391ede5098edbf4cc8a9f6d0cfdfe28e5dc \	592	tree-sitter-scss@git+https://github.com/VixieTSQ/tree-sitter-scss?branch=patch-1\#3aac3391ede5098edbf4cc8a9f6d0cfdfe28e5dc \




diff -ruN ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid/examples/markdown_preview.rs ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid/examples/markdown_preview.rs
--- ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid/examples/markdown_preview.rs	2022-08-30 12:25:50.000000000 +0100
+++ ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid/examples/markdown_preview.rs	2022-09-05 12:03:16.089187000 +0100
@@ -239,7 +239,7 @@
     {
         base = base.entry(druid::platform_menus::mac::application::default())
-        any(target_os = "linux", target_os = "openbsd")
+        any(target_os = "freebsd", target_os = "linux", target_os = "openbsd")
     ),
     target_os = "macos"
 ))]
@@ -57,7 +57,7 @@ pub fn code_to_location(code: Code) -> Location {
     }
-    #[cfg(any(target_os = "windows", target_os = "linux", target_os = "openbsd"))]
+    #[cfg(any(target_os = "windows", target_os = "freebsd", target_os = "linux", target_os = "openbsd"))]
     {
         base = base.entry(druid::platform_menus::win::file::default());
     }
diff -ruN ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid/examples/multiwin.rs ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid/examples/multiwin.rs
--- ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid/examples/multiwin.rs	2022-08-30 12:25:50.000000000 +0100
+++ ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid/examples/multiwin.rs	2022-09-05 12:03:39.328247000 +0100
@@ -200,7 +200,7 @@
     {
         base = druid::platform_menus::mac::menu_bar();
     }
-    #[cfg(any(target_os = "windows", target_os = "linux", target_os = "openbsd"))]
+    #[cfg(any(target_os = "windows", target_os = "freebsd", target_os = "linux", target_os = "openbsd"))]
     {
         base = base.entry(druid::platform_menus::win::file::default());
     }
diff -ruN ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid/examples/textbox.rs ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid/examples/textbox.rs
--- ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid/examples/textbox.rs	2022-08-30 12:25:50.000000000 +0100
+++ ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid/examples/textbox.rs	2022-09-05 12:03:29.140275000 +0100
@@ -98,7 +98,7 @@
     {
         base = base.entry(druid::platform_menus::mac::application::default())
     }
-    #[cfg(any(target_os = "windows", target_os = "linux", target_os = "openbsd"))]
+    #[cfg(any(target_os = "windows", target_os = "freebsd", target_os = "linux", target_os = "openbsd"))]
     {
         base = base.entry(druid::platform_menus::win::file::default());
     }
diff -ruN ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid/src/menu/mod.rs ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid/src/menu/mod.rs
--- ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid/src/menu/mod.rs	2022-08-30 12:25:50.000000000 +0100
+++ ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid/src/menu/mod.rs	2022-09-05 12:03:02.905122000 +0100
@@ -170,7 +170,7 @@
         #[cfg(target_os = "macos")]
         return Some(MenuManager::new(|_, _, _| sys::mac::application::default()));
 
-        #[cfg(any(target_os = "windows", target_os = "linux", target_os = "openbsd"))]
+        #[cfg(any(target_os = "windows", target_os = "freebsd", target_os = "linux", target_os = "openbsd"))]
         return None;
 ///
 /// In theory, the hardware keycode is device dependent, but in
--- ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid-shell/src/backend/shared/mod.rs.orig	2022-08-22 14:59:41.906063000 +0200
+++ ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid-shell/src/backend/shared/mod.rs	2022-08-22 15:00:56.908906000 +0200
@@ -15,7 +15,7 @@ cfg_if::cfg_if! {
 //! Logic that is shared by more than one backend.
 
         // we want to explicitly handle all platforms; log if a platform is missing.
diff -ruN ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid/src/widget/textbox.rs ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid/src/widget/textbox.rs
--- ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid/src/widget/textbox.rs	2022-08-30 12:25:50.000000000 +0100
+++ ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid/src/widget/textbox.rs	2022-09-05 12:02:53.957452000 +0100
@@ -34,6 +34,7 @@
 
 const CURSOR_BLINK_DURATION: Duration = Duration::from_millis(500);
 const MAC_OR_LINUX_OR_OBSD: bool = cfg!(any(
+    target_os = "freebsd",
     target_os = "macos",
     target_os = "linux",
     target_os = "openbsd"
diff -ruN ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid-shell/Cargo.toml ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid-shell/Cargo.toml
--- ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid-shell/Cargo.toml	2022-08-30 12:25:50.000000000 +0100
+++ ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid-shell/Cargo.toml	2022-09-05 12:07:27.797905000 +0100
@@ -101,7 +101,7 @@
 bitflags = "1.2.1"
 cgl = "0.3"
 
-[target.'cfg(any(target_os="linux", target_os="openbsd"))'.dependencies]
+[target.'cfg(any(target_os ="freebsd", target_os="linux", target_os="openbsd"))'.dependencies]
 gl_loader = "0.1.2"
 ashpd = { version = "0.3.0", optional = true }
 # TODO(x11/dependencies): only use feature "xcb" if using X11
diff -ruN ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid-shell/build.rs ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid-shell/build.rs
--- ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid-shell/build.rs	2022-08-30 12:25:50.000000000 +0100
+++ ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid-shell/build.rs	2022-09-05 12:02:40.562752000 +0100
@@ -7,7 +7,8 @@
     use std::env;
     use std::path::PathBuf;
 
-    if env::var("CARGO_CFG_TARGET_OS").unwrap() != "linux"
+    if env::var("CARGO_CFG_TARGET_OS").unwrap() != "freebsd"
+        && env::var("CARGO_CFG_TARGET_OS").unwrap() != "linux"
         && env::var("CARGO_CFG_TARGET_OS").unwrap() != "openbsd"
     {
         return;
diff -ruN ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid-shell/src/backend/mod.rs ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid-shell/src/backend/mod.rs
--- ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid-shell/src/backend/mod.rs	2022-08-30 12:25:50.000000000 +0100
+++ ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid-shell/src/backend/mod.rs	2022-09-05 12:00:26.214282000 +0100
@@ -28,36 +28,36 @@
 #[cfg(target_os = "macos")]
 pub(crate) mod shared;
 

 ))]
 pub(crate) mod shared;
 
diff -ruN ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid-shell/src/backend/shared/keyboard.rs ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid-shell/src/backend/shared/keyboard.rs
--- ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid-shell/src/backend/shared/keyboard.rs	2022-08-30 12:25:50.000000000 +0100
+++ ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid-shell/src/backend/shared/keyboard.rs	2022-09-05 11:59:19.998724000 +0100
@@ -20,7 +20,7 @@
 #[cfg(any(
     all(
         any(feature = "x11", feature = "wayland"),
-        any(target_os = "linux", target_os = "openbsd")
+        any(target_os = "freebsd", target_os = "linux", target_os = "openbsd")
     ),
     target_os = "macos"
 ))]
@@ -57,7 +57,7 @@
     }
 }
 
-#[cfg(any(target_os = "linux", target_os = "openbsd"))]
+#[cfg(any(target_os = "freebsd", target_os = "linux", target_os = "openbsd"))]
 /// Map hardware keycode to code.
 ///
 /// In theory, the hardware keycode is device dependent, but in
diff -ruN ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid-shell/src/backend/shared/mod.rs ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid-shell/src/backend/shared/mod.rs
--- ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid-shell/src/backend/shared/mod.rs	2022-08-30 12:25:50.000000000 +0100
+++ ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid-shell/src/backend/shared/mod.rs	2022-09-05 12:00:02.809946000 +0100
@@ -15,7 +15,7 @@
 //! Logic that is shared by more than one backend.
 
 cfg_if::cfg_if! {
-    if #[cfg(any(target_os = "macos", target_os = "linux", target_os = "openbsd"))] {
+    if #[cfg(any(target_os = "freebsd", target_os = "macos", target_os = "linux", target_os = "openbsd"))] {
         mod keyboard;
         pub use keyboard::*;
     }
diff -ruN ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid-shell/src/clipboard.rs ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid-shell/src/clipboard.rs
--- ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid-shell/src/clipboard.rs	2022-08-30 12:25:50.000000000 +0100
+++ ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid-shell/src/clipboard.rs	2022-09-05 12:01:09.188366000 +0100
@@ -226,7 +226,7 @@
     } else {
         impl ClipboardFormat {
             cfg_if::cfg_if! {
-                if #[cfg(any(target_os = "linux", target_os = "openbsd"))] {
+                if #[cfg(any(target_os = "freebsd", target_os = "linux", target_os = "openbsd"))] {
                     // trial and error; this is the most supported string type for gtk?
                     pub const TEXT: &'static str = "UTF8_STRING";
                 } else {
diff -ruN ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid-shell/src/dialog.rs ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid-shell/src/dialog.rs
--- ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid-shell/src/dialog.rs	2022-08-30 12:25:50.000000000 +0100
+++ ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid-shell/src/dialog.rs	2022-09-05 12:00:45.943691000 +0100
@@ -38,7 +38,7 @@
 
 /// Type of file dialog.
 #[cfg(not(any(

     feature = "wayland"
 )))]
 #[derive(Clone, Copy, PartialEq)]
diff -ruN ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid-shell/src/lib.rs ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid-shell/src/lib.rs
--- ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid-shell/src/lib.rs	2022-08-30 12:25:50.000000000 +0100
+++ ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid-shell/src/lib.rs	2022-09-05 12:00:56.778285000 +0100
@@ -38,7 +38,7 @@
 // Rename `gtk_rs` back to `gtk`.
 // This allows us to use `gtk` as the feature name.

 extern crate gtk_rs as gtk;
 
 // Reexport the version of `image` we are using.
diff -ruN ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid-shell/src/platform/mod.rs ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid-shell/src/platform/mod.rs
--- ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid-shell/src/platform/mod.rs	2022-08-30 12:25:50.000000000 +0100
+++ ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid-shell/src/platform/mod.rs	2022-09-05 12:01:26.654371000 +0100
     } else {
         impl ClipboardFormat {
             cfg_if::cfg_if! {
-                if #[cfg(any(target_os = "linux", target_os = "openbsd"))] {
+                if #[cfg(any(target_os = "freebsd", target_os = "linux", target_os = "openbsd"))] {
                     // trial and error; this is the most supported string type for gtk?
                     pub const TEXT: &'static str = "UTF8_STRING";
                 } else {
--- ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid-shell/src/platform/mod.rs.orig	2022-08-22 14:59:41.913493000 +0200
+++ ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid-shell/src/platform/mod.rs	2022-08-22 15:03:00.893578000 +0200
@@ -14,7 +14,7 @@
 
 //! Platorm specific extensions.

 pub mod linux;
 
 #[cfg(any(doc, target_os = "macos"))]
--- ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid-shell/Cargo.toml.orig	2022-08-22 14:59:41.915001000 +0200
+++ ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid-shell/Cargo.toml	2022-08-22 15:03:23.037710000 +0200
@@ -101,7 +101,7 @@ cgl = "0.3"
 bitflags = "1.2.1"
 cgl = "0.3"
 
-[target.'cfg(any(target_os="linux", target_os="openbsd"))'.dependencies]
+[target.'cfg(any(target_os = "freebsd", target_os="linux", target_os="openbsd"))'.dependencies]
 gl_loader = "0.1.2"
 ashpd = { version = "0.3.0", optional = true }
 # TODO(x11/dependencies): only use feature "xcb" if using X11
--- ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid-shell/build.rs.orig	2022-08-22 14:59:41.916305000 +0200
+++ ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid-shell/build.rs	2022-08-22 15:04:05.021937000 +0200
@@ -7,7 +7,8 @@ fn main() {
     use std::env;
     use std::path::PathBuf;
 
-    if env::var("CARGO_CFG_TARGET_OS").unwrap() != "linux"
+    if env::var("CARGO_CFG_TARGET_OS").unwrap() != "freebsd"
+        && env::var("CARGO_CFG_TARGET_OS").unwrap() != "linux"
         && env::var("CARGO_CFG_TARGET_OS").unwrap() != "openbsd"
     {
         return;
--- ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid/src/widget/textbox.rs.orig	2022-08-22 14:59:41.917875000 +0200
+++ ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid/src/widget/textbox.rs	2022-08-22 15:04:22.638401000 +0200
@@ -34,6 +34,7 @@ const MAC_OR_LINUX_OR_OBSD: bool = cfg!(any(
 
 const CURSOR_BLINK_DURATION: Duration = Duration::from_millis(500);
 const MAC_OR_LINUX_OR_OBSD: bool = cfg!(any(
+    target_os = "freebsd",
     target_os = "macos",
     target_os = "linux",
     target_os = "openbsd"
--- ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid/src/menu/mod.rs.orig	2022-08-22 14:59:41.919526000 +0200
+++ ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid/src/menu/mod.rs	2022-08-22 15:04:44.110525000 +0200
@@ -170,7 +170,7 @@ impl<T: Data> MenuManager<T> {
         #[cfg(target_os = "macos")]
         return Some(MenuManager::new(|_, _, _| sys::mac::application::default()));
 
-        #[cfg(any(target_os = "windows", target_os = "linux", target_os = "openbsd"))]
+        #[cfg(any(target_os = "windows", target_os = "freebsd", target_os = "linux", target_os = "openbsd"))]
         return None;
 
         // we want to explicitly handle all platforms; log if a platform is missing.
--- ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid/examples/markdown_preview.rs.orig	2022-08-22 14:59:41.920963000 +0200
+++ ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid/examples/markdown_preview.rs	2022-08-22 15:05:24.670324000 +0200
@@ -239,7 +239,7 @@ fn make_menu<T: Data>(_window_id: Option<WindowId>, _a
     {
         base = base.entry(druid::platform_menus::mac::application::default())
     }
-    #[cfg(any(target_os = "windows", target_os = "linux", target_os = "openbsd"))]
+    #[cfg(any(target_os = "windows", target_os = "freebsd", target_os = "linux", target_os = "openbsd"))]
     {
         base = base.entry(druid::platform_menus::win::file::default());
     }
--- ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid/examples/textbox.rs.orig	2022-08-22 14:59:41.922304000 +0200
+++ ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid/examples/textbox.rs	2022-08-22 15:05:03.838164000 +0200
@@ -98,7 +98,7 @@ fn make_menu<T: Data>(_window: Option<WindowId>, _data
     {
         base = base.entry(druid::platform_menus::mac::application::default())
     }
-    #[cfg(any(target_os = "windows", target_os = "linux", target_os = "openbsd"))]
+    #[cfg(any(target_os = "windows", target_os = "freebsd", target_os = "linux", target_os = "openbsd"))]
     {
         base = base.entry(druid::platform_menus::win::file::default());
     }
--- ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid/examples/multiwin.rs.orig	2022-08-22 14:59:41.923677000 +0200
+++ ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid/examples/multiwin.rs	2022-08-22 15:05:14.078523000 +0200
@@ -200,7 +200,7 @@ fn make_menu(_: Option<WindowId>, state: &State, _: &E
     {
         base = druid::platform_menus::mac::menu_bar();
     }
-    #[cfg(any(target_os = "windows", target_os = "linux", target_os = "openbsd"))]
+    #[cfg(any(target_os = "windows", target_os = "freebsd", target_os = "linux", target_os = "openbsd"))]
     {
         base = base.entry(druid::platform_menus::win::file::default());
     }

Return to bug 266232

Lines 1-37 Link Here

(-)b/editors/lapce/files/patch-druid (-126 / +140 lines)
1	--- ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid-shell/src/backend/shared/keyboard.rs.orig 2022-08-22 14:59:41.904511000 +0200	1	diff -ruN ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid/examples/markdown_preview.rs ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid/examples/markdown_preview.rs
2	+++ ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid-shell/src/backend/shared/keyboard.rs 2022-08-22 15:00:38.861126000 +0200	2	--- ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid/examples/markdown_preview.rs 2022-08-30 12:25:50.000000000 +0100
3	@@ -20,7 +20,7 @@ use keyboard_types::{Code, Location};	3	+++ ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid/examples/markdown_preview.rs 2022-09-05 12:03:16.089187000 +0100
4	#[cfg(any(	4	@@ -239,7 +239,7 @@
5	all(	5	{
6	any(feature = "x11", feature = "wayland"),	6	base = base.entry(druid::platform_menus::mac::application::default())
7	- any(target_os = "linux", target_os = "openbsd")
8	+ any(target_os = "freebsd", target_os = "linux", target_os = "openbsd")
9	),
10	target_os = "macos"
11	))]
12	@@ -57,7 +57,7 @@ pub fn code_to_location(code: Code) -> Location {
13	}	7	}
14	}	8	- #[cfg(any(target_os = "windows", target_os = "linux", target_os = "openbsd"))]
		9	+ #[cfg(any(target_os = "windows", target_os = "freebsd", target_os = "linux", target_os = "openbsd"))]
		10	{
		11	base = base.entry(druid::platform_menus::win::file::default());
		12	}
		13	diff -ruN ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid/examples/multiwin.rs ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid/examples/multiwin.rs
		14	--- ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid/examples/multiwin.rs 2022-08-30 12:25:50.000000000 +0100
		15	+++ ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid/examples/multiwin.rs 2022-09-05 12:03:39.328247000 +0100
		16	@@ -200,7 +200,7 @@
		17	{
		18	base = druid::platform_menus::mac::menu_bar();
		19	}
		20	- #[cfg(any(target_os = "windows", target_os = "linux", target_os = "openbsd"))]
		21	+ #[cfg(any(target_os = "windows", target_os = "freebsd", target_os = "linux", target_os = "openbsd"))]
		22	{
		23	base = base.entry(druid::platform_menus::win::file::default());
		24	}
		25	diff -ruN ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid/examples/textbox.rs ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid/examples/textbox.rs
		26	--- ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid/examples/textbox.rs 2022-08-30 12:25:50.000000000 +0100
		27	+++ ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid/examples/textbox.rs 2022-09-05 12:03:29.140275000 +0100
		28	@@ -98,7 +98,7 @@
		29	{
		30	base = base.entry(druid::platform_menus::mac::application::default())
		31	}
		32	- #[cfg(any(target_os = "windows", target_os = "linux", target_os = "openbsd"))]
		33	+ #[cfg(any(target_os = "windows", target_os = "freebsd", target_os = "linux", target_os = "openbsd"))]
		34	{
		35	base = base.entry(druid::platform_menus::win::file::default());
		36	}
		37	diff -ruN ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid/src/menu/mod.rs ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid/src/menu/mod.rs
		38	--- ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid/src/menu/mod.rs 2022-08-30 12:25:50.000000000 +0100
		39	+++ ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid/src/menu/mod.rs 2022-09-05 12:03:02.905122000 +0100
		40	@@ -170,7 +170,7 @@
		41	#[cfg(target_os = "macos")]
		42	return Some(MenuManager::new(\|_, _, _\| sys::mac::application::default()));
15		43
16	-#[cfg(any(target_os = "linux", target_os = "openbsd"))]	44	- #[cfg(any(target_os = "windows", target_os = "linux", target_os = "openbsd"))]
17	+#[cfg(any(target_os = "freebsd", target_os = "linux", target_os = "openbsd"))]	45	+ #[cfg(any(target_os = "windows", target_os = "freebsd", target_os = "linux", target_os = "openbsd"))]
18	/// Map hardware keycode to code.	46	return None;
19	///
20	/// In theory, the hardware keycode is device dependent, but in
21	--- ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid-shell/src/backend/shared/mod.rs.orig 2022-08-22 14:59:41.906063000 +0200
22	+++ ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid-shell/src/backend/shared/mod.rs 2022-08-22 15:00:56.908906000 +0200
23	@@ -15,7 +15,7 @@ cfg_if::cfg_if! {
24	//! Logic that is shared by more than one backend.
25		47
26	cfg_if::cfg_if! {	48	// we want to explicitly handle all platforms; log if a platform is missing.
27	- if #[cfg(any(target_os = "macos", target_os = "linux", target_os = "openbsd"))] {	49	diff -ruN ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid/src/widget/textbox.rs ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid/src/widget/textbox.rs
28	+ if #[cfg(any(target_os = "freebsd", target_os = "macos", target_os = "linux", target_os = "openbsd"))] {	50	--- ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid/src/widget/textbox.rs 2022-08-30 12:25:50.000000000 +0100
29	mod keyboard;	51	+++ ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid/src/widget/textbox.rs 2022-09-05 12:02:53.957452000 +0100
30	pub use keyboard::*;	52	@@ -34,6 +34,7 @@
31	}	53
32	--- ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid-shell/src/backend/mod.rs.orig 2022-08-22 14:59:41.907594000 +0200	54	const CURSOR_BLINK_DURATION: Duration = Duration::from_millis(500);
33	+++ ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid-shell/src/backend/mod.rs 2022-08-22 15:01:57.581204000 +0200	55	const MAC_OR_LINUX_OR_OBSD: bool = cfg!(any(
34	@@ -28,36 +28,36 @@ pub(crate) mod shared;	56	+ target_os = "freebsd",
		57	target_os = "macos",
		58	target_os = "linux",
		59	target_os = "openbsd"
		60	diff -ruN ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid-shell/Cargo.toml ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid-shell/Cargo.toml
		61	--- ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid-shell/Cargo.toml 2022-08-30 12:25:50.000000000 +0100
		62	+++ ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid-shell/Cargo.toml 2022-09-05 12:07:27.797905000 +0100
		63	@@ -101,7 +101,7 @@
		64	bitflags = "1.2.1"
		65	cgl = "0.3"
		66
		67	-[target.'cfg(any(target_os="linux", target_os="openbsd"))'.dependencies]
		68	+[target.'cfg(any(target_os ="freebsd", target_os="linux", target_os="openbsd"))'.dependencies]
		69	gl_loader = "0.1.2"
		70	ashpd = { version = "0.3.0", optional = true }
		71	# TODO(x11/dependencies): only use feature "xcb" if using X11
		72	diff -ruN ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid-shell/build.rs ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid-shell/build.rs
		73	--- ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid-shell/build.rs 2022-08-30 12:25:50.000000000 +0100
		74	+++ ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid-shell/build.rs 2022-09-05 12:02:40.562752000 +0100
		75	@@ -7,7 +7,8 @@
		76	use std::env;
		77	use std::path::PathBuf;
		78
		79	- if env::var("CARGO_CFG_TARGET_OS").unwrap() != "linux"
		80	+ if env::var("CARGO_CFG_TARGET_OS").unwrap() != "freebsd"
		81	+ && env::var("CARGO_CFG_TARGET_OS").unwrap() != "linux"
		82	&& env::var("CARGO_CFG_TARGET_OS").unwrap() != "openbsd"
		83	{
		84	return;
		85	diff -ruN ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid-shell/src/backend/mod.rs ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid-shell/src/backend/mod.rs
		86	--- ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid-shell/src/backend/mod.rs 2022-08-30 12:25:50.000000000 +0100
		87	+++ ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid-shell/src/backend/mod.rs 2022-09-05 12:00:26.214282000 +0100
		88	@@ -28,36 +28,36 @@
35	#[cfg(target_os = "macos")]	89	#[cfg(target_os = "macos")]
36	pub(crate) mod shared;	90	pub(crate) mod shared;
37		91
Lines 77-85 Link Here
77	))]	131	))]
78	pub(crate) mod shared;	132	pub(crate) mod shared;
79		133
80	--- ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid-shell/src/dialog.rs.orig 2022-08-22 14:59:41.909107000 +0200	134	diff -ruN ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid-shell/src/backend/shared/keyboard.rs ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid-shell/src/backend/shared/keyboard.rs
81	+++ ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid-shell/src/dialog.rs 2022-08-22 15:02:20.045602000 +0200	135	--- ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid-shell/src/backend/shared/keyboard.rs 2022-08-30 12:25:50.000000000 +0100
82	@@ -38,7 +38,7 @@ pub struct FileInfo {	136	+++ ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid-shell/src/backend/shared/keyboard.rs 2022-09-05 11:59:19.998724000 +0100
		137	@@ -20,7 +20,7 @@
		138	#[cfg(any(
		139	all(
		140	any(feature = "x11", feature = "wayland"),
		141	- any(target_os = "linux", target_os = "openbsd")
		142	+ any(target_os = "freebsd", target_os = "linux", target_os = "openbsd")
		143	),
		144	target_os = "macos"
		145	))]
		146	@@ -57,7 +57,7 @@
		147	}
		148	}
		149
		150	-#[cfg(any(target_os = "linux", target_os = "openbsd"))]
		151	+#[cfg(any(target_os = "freebsd", target_os = "linux", target_os = "openbsd"))]
		152	/// Map hardware keycode to code.
		153	///
		154	/// In theory, the hardware keycode is device dependent, but in
		155	diff -ruN ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid-shell/src/backend/shared/mod.rs ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid-shell/src/backend/shared/mod.rs
		156	--- ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid-shell/src/backend/shared/mod.rs 2022-08-30 12:25:50.000000000 +0100
		157	+++ ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid-shell/src/backend/shared/mod.rs 2022-09-05 12:00:02.809946000 +0100
		158	@@ -15,7 +15,7 @@
		159	//! Logic that is shared by more than one backend.
		160
		161	cfg_if::cfg_if! {
		162	- if #[cfg(any(target_os = "macos", target_os = "linux", target_os = "openbsd"))] {
		163	+ if #[cfg(any(target_os = "freebsd", target_os = "macos", target_os = "linux", target_os = "openbsd"))] {
		164	mod keyboard;
		165	pub use keyboard::*;
		166	}
		167	diff -ruN ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid-shell/src/clipboard.rs ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid-shell/src/clipboard.rs
		168	--- ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid-shell/src/clipboard.rs 2022-08-30 12:25:50.000000000 +0100
		169	+++ ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid-shell/src/clipboard.rs 2022-09-05 12:01:09.188366000 +0100
		170	@@ -226,7 +226,7 @@
		171	} else {
		172	impl ClipboardFormat {
		173	cfg_if::cfg_if! {
		174	- if #[cfg(any(target_os = "linux", target_os = "openbsd"))] {
		175	+ if #[cfg(any(target_os = "freebsd", target_os = "linux", target_os = "openbsd"))] {
		176	// trial and error; this is the most supported string type for gtk?
		177	pub const TEXT: &'static str = "UTF8_STRING";
		178	} else {
		179	diff -ruN ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid-shell/src/dialog.rs ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid-shell/src/dialog.rs
		180	--- ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid-shell/src/dialog.rs 2022-08-30 12:25:50.000000000 +0100
		181	+++ ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid-shell/src/dialog.rs 2022-09-05 12:00:45.943691000 +0100
		182	@@ -38,7 +38,7 @@
83		183
84	/// Type of file dialog.	184	/// Type of file dialog.
85	#[cfg(not(any(	185	#[cfg(not(any(
Lines 88-95 Link Here
88	feature = "wayland"	188	feature = "wayland"
89	)))]	189	)))]
90	#[derive(Clone, Copy, PartialEq)]	190	#[derive(Clone, Copy, PartialEq)]
91	--- ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid-shell/src/lib.rs.orig 2022-08-22 14:59:41.910601000 +0200	191	diff -ruN ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid-shell/src/lib.rs ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid-shell/src/lib.rs
92	+++ ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid-shell/src/lib.rs 2022-08-22 15:02:41.085484000 +0200	192	--- ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid-shell/src/lib.rs 2022-08-30 12:25:50.000000000 +0100
		193	+++ ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid-shell/src/lib.rs 2022-09-05 12:00:56.778285000 +0100
93	@@ -38,7 +38,7 @@	194	@@ -38,7 +38,7 @@
94	// Rename `gtk_rs` back to `gtk`.	195	// Rename `gtk_rs` back to `gtk`.
95	// This allows us to use `gtk` as the feature name.	196	// This allows us to use `gtk` as the feature name.
Lines 99-117 Link Here
99	extern crate gtk_rs as gtk;	200	extern crate gtk_rs as gtk;
100		201
101	// Reexport the version of `image` we are using.	202	// Reexport the version of `image` we are using.
102	--- ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid-shell/src/clipboard.rs.orig 2022-08-22 14:59:41.912090000 +0200	203	diff -ruN ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid-shell/src/platform/mod.rs ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid-shell/src/platform/mod.rs
103	+++ ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid-shell/src/clipboard.rs 2022-08-22 15:00:06.556769000 +0200	204	--- ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4.orig/druid-shell/src/platform/mod.rs 2022-08-30 12:25:50.000000000 +0100
104	@@ -226,7 +226,7 @@ cfg_if::cfg_if! {	205	+++ ../druid-3e53ab2159b7154fea77731ff7633970a40cb7b4/druid-shell/src/platform/mod.rs 2022-09-05 12:01:26.654371000 +0100
105	} else {
106	impl ClipboardFormat {
107	cfg_if::cfg_if! {
108	- if #[cfg(any(target_os = "linux", target_os = "openbsd"))] {
109	+ if #[cfg(any(target_os = "freebsd", target_os = "linux", target_os = "openbsd"))] {
110	// trial and error; this is the most supported string type for gtk?
111	pub const TEXT: &'static str = "UTF8_STRING";
112	} else {
113	--- ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid-shell/src/platform/mod.rs.orig 2022-08-22 14:59:41.913493000 +0200
114	+++ ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid-shell/src/platform/mod.rs 2022-08-22 15:03:00.893578000 +0200
115	@@ -14,7 +14,7 @@	206	@@ -14,7 +14,7 @@
116		207
117	//! Platorm specific extensions.	208	//! Platorm specific extensions.
Lines 121-200 Link Here
121	pub mod linux;	212	pub mod linux;
122		213
123	#[cfg(any(doc, target_os = "macos"))]	214	#[cfg(any(doc, target_os = "macos"))]
124	--- ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid-shell/Cargo.toml.orig 2022-08-22 14:59:41.915001000 +0200
125	+++ ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid-shell/Cargo.toml 2022-08-22 15:03:23.037710000 +0200
126	@@ -101,7 +101,7 @@ cgl = "0.3"
127	bitflags = "1.2.1"
128	cgl = "0.3"
129
130	-[target.'cfg(any(target_os="linux", target_os="openbsd"))'.dependencies]
131	+[target.'cfg(any(target_os = "freebsd", target_os="linux", target_os="openbsd"))'.dependencies]
132	gl_loader = "0.1.2"
133	ashpd = { version = "0.3.0", optional = true }
134	# TODO(x11/dependencies): only use feature "xcb" if using X11
135	--- ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid-shell/build.rs.orig 2022-08-22 14:59:41.916305000 +0200
136	+++ ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid-shell/build.rs 2022-08-22 15:04:05.021937000 +0200
137	@@ -7,7 +7,8 @@ fn main() {
138	use std::env;
139	use std::path::PathBuf;
140
141	- if env::var("CARGO_CFG_TARGET_OS").unwrap() != "linux"
142	+ if env::var("CARGO_CFG_TARGET_OS").unwrap() != "freebsd"
143	+ && env::var("CARGO_CFG_TARGET_OS").unwrap() != "linux"
144	&& env::var("CARGO_CFG_TARGET_OS").unwrap() != "openbsd"
145	{
146	return;
147	--- ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid/src/widget/textbox.rs.orig 2022-08-22 14:59:41.917875000 +0200
148	+++ ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid/src/widget/textbox.rs 2022-08-22 15:04:22.638401000 +0200
149	@@ -34,6 +34,7 @@ const MAC_OR_LINUX_OR_OBSD: bool = cfg!(any(
150
151	const CURSOR_BLINK_DURATION: Duration = Duration::from_millis(500);
152	const MAC_OR_LINUX_OR_OBSD: bool = cfg!(any(
153	+ target_os = "freebsd",
154	target_os = "macos",
155	target_os = "linux",
156	target_os = "openbsd"
157	--- ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid/src/menu/mod.rs.orig 2022-08-22 14:59:41.919526000 +0200
158	+++ ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid/src/menu/mod.rs 2022-08-22 15:04:44.110525000 +0200
159	@@ -170,7 +170,7 @@ impl<T: Data> MenuManager<T> {
160	#[cfg(target_os = "macos")]
161	return Some(MenuManager::new(\|_, _, _\| sys::mac::application::default()));
162
163	- #[cfg(any(target_os = "windows", target_os = "linux", target_os = "openbsd"))]
164	+ #[cfg(any(target_os = "windows", target_os = "freebsd", target_os = "linux", target_os = "openbsd"))]
165	return None;
166
167	// we want to explicitly handle all platforms; log if a platform is missing.
168	--- ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid/examples/markdown_preview.rs.orig 2022-08-22 14:59:41.920963000 +0200
169	+++ ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid/examples/markdown_preview.rs 2022-08-22 15:05:24.670324000 +0200
170	@@ -239,7 +239,7 @@ fn make_menu<T: Data>(_window_id: Option<WindowId>, _a
171	{
172	base = base.entry(druid::platform_menus::mac::application::default())
173	}
174	- #[cfg(any(target_os = "windows", target_os = "linux", target_os = "openbsd"))]
175	+ #[cfg(any(target_os = "windows", target_os = "freebsd", target_os = "linux", target_os = "openbsd"))]
176	{
177	base = base.entry(druid::platform_menus::win::file::default());
178	}
179	--- ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid/examples/textbox.rs.orig 2022-08-22 14:59:41.922304000 +0200
180	+++ ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid/examples/textbox.rs 2022-08-22 15:05:03.838164000 +0200
181	@@ -98,7 +98,7 @@ fn make_menu<T: Data>(_window: Option<WindowId>, _data
182	{
183	base = base.entry(druid::platform_menus::mac::application::default())
184	}
185	- #[cfg(any(target_os = "windows", target_os = "linux", target_os = "openbsd"))]
186	+ #[cfg(any(target_os = "windows", target_os = "freebsd", target_os = "linux", target_os = "openbsd"))]
187	{
188	base = base.entry(druid::platform_menus::win::file::default());
189	}
190	--- ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid/examples/multiwin.rs.orig 2022-08-22 14:59:41.923677000 +0200
191	+++ ../druid-85d503a79df7581d1a144f97ee1cc369788b55b8/druid/examples/multiwin.rs 2022-08-22 15:05:14.078523000 +0200
192	@@ -200,7 +200,7 @@ fn make_menu(_: Option<WindowId>, state: &State, _: &E
193	{
194	base = druid::platform_menus::mac::menu_bar();
195	}
196	- #[cfg(any(target_os = "windows", target_os = "linux", target_os = "openbsd"))]
197	+ #[cfg(any(target_os = "windows", target_os = "freebsd", target_os = "linux", target_os = "openbsd"))]
198	{
199	base = base.entry(druid::platform_menus::win::file::default());
200	}

Lines 1-4 Link Here

(-)b/editors/lapce/distinfo (-7 / +43 lines)
1	TIMESTAMP = 1661590395	1	TIMESTAMP = 1662375248
2	SHA256 (rust/crates/Inflector-0.11.4.crate) = fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3	2	SHA256 (rust/crates/Inflector-0.11.4.crate) = fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3
3	SIZE (rust/crates/Inflector-0.11.4.crate) = 17438	3	SIZE (rust/crates/Inflector-0.11.4.crate) = 17438
4	SHA256 (rust/crates/addr2line-0.17.0.crate) = b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b	4	SHA256 (rust/crates/addr2line-0.17.0.crate) = b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b
Lines 29-40 SHA256 (rust/crates/arrayvec-0.5.2.crate) = 23b62fc65de8e4e7f52534fb52b0f3ed0474 Link Here
29	SIZE (rust/crates/arrayvec-0.5.2.crate) = 27838	29	SIZE (rust/crates/arrayvec-0.5.2.crate) = 27838
30	SHA256 (rust/crates/arrayvec-0.7.2.crate) = 8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6	30	SHA256 (rust/crates/arrayvec-0.7.2.crate) = 8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6
31	SIZE (rust/crates/arrayvec-0.7.2.crate) = 29341	31	SIZE (rust/crates/arrayvec-0.7.2.crate) = 29341
		32	SHA256 (rust/crates/async-channel-1.7.1.crate) = e14485364214912d3b19cc3435dde4df66065127f05fa0d75c712f36f12c2f28
		33	SIZE (rust/crates/async-channel-1.7.1.crate) = 12855
		34	SHA256 (rust/crates/async-task-4.3.0.crate) = 7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524
		35	SIZE (rust/crates/async-task-4.3.0.crate) = 29544
32	SHA256 (rust/crates/async-trait-0.1.57.crate) = 76464446b8bc32758d7e88ee1a804d9914cd9b1cb264c029899680b0be29826f	36	SHA256 (rust/crates/async-trait-0.1.57.crate) = 76464446b8bc32758d7e88ee1a804d9914cd9b1cb264c029899680b0be29826f
33	SIZE (rust/crates/async-trait-0.1.57.crate) = 26793	37	SIZE (rust/crates/async-trait-0.1.57.crate) = 26793
34	SHA256 (rust/crates/atk-0.14.0.crate) = a83b21d2aa75e464db56225e1bda2dd5993311ba1095acaa8fa03d1ae67026ba	38	SHA256 (rust/crates/atk-0.14.0.crate) = a83b21d2aa75e464db56225e1bda2dd5993311ba1095acaa8fa03d1ae67026ba
35	SIZE (rust/crates/atk-0.14.0.crate) = 35031	39	SIZE (rust/crates/atk-0.14.0.crate) = 35031
36	SHA256 (rust/crates/atk-sys-0.14.0.crate) = badcf670157c84bb8b1cf6b5f70b650fed78da2033c9eed84c4e49b11cbe83ea	40	SHA256 (rust/crates/atk-sys-0.14.0.crate) = badcf670157c84bb8b1cf6b5f70b650fed78da2033c9eed84c4e49b11cbe83ea
37	SIZE (rust/crates/atk-sys-0.14.0.crate) = 21815	41	SIZE (rust/crates/atk-sys-0.14.0.crate) = 21815
		42	SHA256 (rust/crates/atomic-waker-1.0.0.crate) = 065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a
		43	SIZE (rust/crates/atomic-waker-1.0.0.crate) = 11771
38	SHA256 (rust/crates/atty-0.2.14.crate) = d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8	44	SHA256 (rust/crates/atty-0.2.14.crate) = d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8
39	SIZE (rust/crates/atty-0.2.14.crate) = 5470	45	SIZE (rust/crates/atty-0.2.14.crate) = 5470
40	SHA256 (rust/crates/autocfg-1.1.0.crate) = d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa	46	SHA256 (rust/crates/autocfg-1.1.0.crate) = d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa
Lines 57-62 SHA256 (rust/crates/block-0.1.6.crate) = 0d8c1fef690941d3e7788d328517591fecc684c Link Here
57	SIZE (rust/crates/block-0.1.6.crate) = 4077	63	SIZE (rust/crates/block-0.1.6.crate) = 4077
58	SHA256 (rust/crates/block-buffer-0.9.0.crate) = 4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4	64	SHA256 (rust/crates/block-buffer-0.9.0.crate) = 4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4
59	SIZE (rust/crates/block-buffer-0.9.0.crate) = 7108	65	SIZE (rust/crates/block-buffer-0.9.0.crate) = 7108
		66	SHA256 (rust/crates/blocking-1.2.0.crate) = c6ccb65d468978a086b69884437ded69a90faab3bbe6e67f242173ea728acccc
		67	SIZE (rust/crates/blocking-1.2.0.crate) = 18494
60	SHA256 (rust/crates/bstr-0.2.17.crate) = ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223	68	SHA256 (rust/crates/bstr-0.2.17.crate) = ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223
61	SIZE (rust/crates/bstr-0.2.17.crate) = 330350	69	SIZE (rust/crates/bstr-0.2.17.crate) = 330350
62	SHA256 (rust/crates/bumpalo-3.10.0.crate) = 37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3	70	SHA256 (rust/crates/bumpalo-3.10.0.crate) = 37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3
Lines 71-76 SHA256 (rust/crates/byteorder-1.4.3.crate) = 14c189c53d098945499cdfa7ecc63567cf3 Link Here
71	SIZE (rust/crates/byteorder-1.4.3.crate) = 22512	79	SIZE (rust/crates/byteorder-1.4.3.crate) = 22512
72	SHA256 (rust/crates/bytes-1.2.1.crate) = ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db	80	SHA256 (rust/crates/bytes-1.2.1.crate) = ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db
73	SIZE (rust/crates/bytes-1.2.1.crate) = 54857	81	SIZE (rust/crates/bytes-1.2.1.crate) = 54857
		82	SHA256 (rust/crates/cache-padded-1.2.0.crate) = c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c
		83	SIZE (rust/crates/cache-padded-1.2.0.crate) = 9125