fix build

andamira · Jan 30, 2025 · 5ed558a · 5ed558a
1 parent 82c4a35
commit 5ed558a
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 0 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -72,6 +72,10 @@ jobs:
           sudo apt update
           # for alsa-sys, gilrs:
           sudo apt install -y libasound2-dev libudev-dev
+          # for fltk:
+          sudo apt install -y libpango1.0-dev libxft-dev # libxext-dev libxft-dev \
+            # libxinerama-dev libxcursor-dev libxrender-dev libxfixes-dev libpng-dev \
+            # libgl1-mesa-dev libglu1-mesa-dev
           # for sdl2:
           sudo apt install -y libsdl2-dev libsdl2-gfx-dev libsdl2-image-dev \
             libsdl2-mixer-dev libsdl2-ttf-dev

diff --git a/.github/workflows/test-arches-miri.yml b/.github/workflows/test-arches-miri.yml
@@ -34,6 +34,10 @@ jobs:
           sudo apt update
           # for alsa-sys, gilrs:
           sudo apt install -y libasound2-dev libudev-dev
+          # for fltk:
+          sudo apt install -y libpango1.0-dev libxft-dev # libxext-dev libxft-dev \
+            # libxinerama-dev libxcursor-dev libxrender-dev libxfixes-dev libpng-dev \
+            # libgl1-mesa-dev libglu1-mesa-dev
           # for sdl2:
           sudo apt install -y libsdl2-dev libsdl2-gfx-dev libsdl2-image-dev \
             libsdl2-mixer-dev libsdl2-ttf-dev

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -34,6 +34,10 @@ jobs:
           sudo apt update
           # for alsa-sys, gilrs:
           sudo apt install -y libasound2-dev libudev-dev
+          # for fltk:
+          sudo apt install -y libpango1.0-dev libxft-dev # libxext-dev libxft-dev \
+            # libxinerama-dev libxcursor-dev libxrender-dev libxfixes-dev libpng-dev \
+            # libgl1-mesa-dev libglu1-mesa-dev
           # for sdl2:
           sudo apt install -y libsdl2-dev libsdl2-gfx-dev libsdl2-image-dev \
             libsdl2-mixer-dev libsdl2-ttf-dev

diff --git a/Cargo.toml b/Cargo.toml
@@ -643,6 +643,9 @@ features = ["bracketed-paste", "events"]
 version = "1.5" # ✓ https://github.com/fltk-rs/fltk-rs/blob/master/CHANGELOG.md
 optional = true # unsafe
 default-features = false # 23 https://docs.rs/crate/fltk/latest/features
+# https://github.com/fltk-rs/fltk-rs/blob/master/FAQ.md
+# features = ["fltk-bundled"] # IMPROVE: feature-gate
+# INSTALL: libpango1.0-dev libxft-dev
 
 [dependencies.gilrs] # https://crates.io/crates/gilrs
 version = "0.11" # ✗ https://gitlab.com/gilrs-project/gilrs/-/commits/master?ref_type=HEADS
@@ -928,6 +931,7 @@ lto = "thin"
 [package.metadata.docs.rs]
 # ==============================================================================
 # https://docs.rs/about/metadata
+# https://github.com/rust-lang/crates-build-env/blob/master/linux/packages.txt
 #
 # Maximum build limits (https://docs.rs/crate/devela/latest/builds)
 # 6.44 GB RAM, 15 minutes, 102.4 kB log, no-network, 10 targets.

diff --git a/src/ui/service/cap/definitions.rs b/src/ui/service/cap/definitions.rs
@@ -3,6 +3,9 @@
 //!
 //
 
+#[cfg(feature = "alloc")]
+use crate::String;
+
 /// The capabilities supported by a [`UiService`][crate::UiService].
 #[derive(Clone, Debug, Default, PartialEq, Eq)]
 pub struct UiCap {

diff --git a/utils/check.rs b/utils/check.rs
@@ -107,6 +107,8 @@ const DEP_NO_CROSS_COMPILE_STD: &[&str] = &[
 const DEP_NO_CROSS_COMPILE_EVER: &[&str] = &[
     // IMPROVE: allow activating `windows` feature
     "dep_crossterm",
+    // (windows, linux, macos) https://github.com/fltk-rs/fltk-rs/blob/master/FAQ.md
+    "dep_fltk",
     // because of pkg-config & libudev-sys
     // SEE: https://gitlab.com/gilrs-project/gilrs/-/issues/86
     "dep_gilrs",