Merge branch 'more-ci' into 'master'

Add xfce4-full group, Add more packages to CI

See merge request redox-os/redox!2185

config/x11.toml

@@ -19,7 +19,7 @@ libxcursor = {} # loaded dynamically
 mesa-demos-x11 = {}
 #firefox = {}
 #webkitgtk3 = {} # not compiling
-xfce4-common = {}
+xfce4-full = {}
 x11-full = {}
 zenity = {}
 

config/x86_64/ci.toml

@@ -23,6 +23,7 @@ redox-tests = {}
 x11-minimal = {}
 x11-full = {}
 xfce4-common = {}
+xfce4-full = {}
 
 # Normal packages below
 
@@ -36,6 +37,7 @@ bash = {}
 bash-completion = {}
 binutils = {}
 bootloader = {}
+boxedwine = {}
 bottom = {}
 bzip2 = {}
 ca-certificates = {}
@@ -43,6 +45,7 @@ cairo = {}
 cairo-demo = {}
 cbindgen = {}
 classicube = {}
+clang21 = {}
 cleye = {}
 cmake = {}
 cmatrix = {}
@@ -95,6 +98,8 @@ gnu-binutils = {}
 gnu-grep = {}
 gnu-make = {}
 goaccess = {}
+gobject-introspection = {}
+gitoxide = {}
 gstreamer = {}
 harfbuzz = {}
 hicolor-icon-theme = {}
@@ -155,6 +160,7 @@ mesa = {}
 mesa-glu = {}
 mesa-demos-x11 = {}
 mgba = {}
+miniserve = {}
 mpc = {}
 nano = {}
 nasm = {}
@@ -210,6 +216,7 @@ procedural-wallpapers-rs = {}
 profiled = {}
 profiling-kernel = {}
 python312 = {}
+qemu = {}
 quakespasm = {}
 readline = {}
 redox-fatfs = {}
@@ -252,6 +259,7 @@ sopwith = {}
 sqlite3 = {}
 strace = {}
 syobonaction = {}
+tcl = {}
 terminfo = {}
 timidity = {}
 tmux = {}
@@ -288,13 +296,11 @@ zstd = {}
 #freeglut = {}
 #friar = {} # mio patch
 #game-2048 = {} # rustc-serialize
-#gitoxide = {} # needs -fPIC
 #hematite = {} # needs crate patches for redox-unix
 #ibm-plex = {}
 #iced = {}
 #libcosmic = {}
 #mdp = {} # gcc hangs
-#miniserve = {} # libc ifaddrs
 #mupen64plus = {}
 #noto-color-emoji = {}
 #orbcalculator = {}
@@ -303,7 +309,6 @@ zstd = {}
 #pathfinder = {} # servo-fontconfig
 #pciids = {}
 #pop-wallpapers = {}
-#qemu = {} # can be built, but not working
 #retroarch = {} # cannot locate GL
 #rust-cairo = {} # linking errors
 #rust-cairo-demo = {} # linking errors

recipes/dev/gitoxide/recipe.toml

@@ -1,14 +1,13 @@
 [source]
 git = "https://github.com/Byron/gitoxide.git"
+rev = "v0.54.0"
 shallow_clone = true
+patches = [
+    "redox.patch"
+]
 
 [build]
 dependencies = [
     "openssl3",
 ]
-template = "custom"
+template = "cargo"
-script = """
-export OPENSSL_DIR="${COOKBOOK_SYSROOT}"
-export OPENSSL_STATIC="true"
-cookbook_cargo
-"""

recipes/dev/gitoxide/redox.patch

@@ -0,0 +1,16 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index 23147e56..520fbed3 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -206,11 +206,9 @@ zlib-rs = { opt-level = 3 }
+ 
+ [profile.release]
+ overflow-checks = false
+-lto = "thin"
+ # This bloats files but assures destructors are called, important for tempfiles. One day I hope we
+ # can wire up the 'abrt' signal handler so tempfiles will be removed in case of panics.
+ panic = "unwind"
+-incremental = false
+ 
+ # This profile is currently used in building releases for GitHub.
+ # It may be removed at any time and should not otherwise be relied on.

recipes/groups/xfce4-common/recipe.toml

@@ -1,17 +1,12 @@
 [package]
 dependencies = [
-    "mousepad",
     "thunar",
     "tumbler",
     "xfconf",
-    "xfdashboard",
     "xfdesktop",
     "xfce4-appfinder",
-    "xfce4-notifyd",
     "xfce4-session",
     "xfce4-panel",
-    "xfce4-power-manager",
     "xfce4-settings",
-    "xfce4-terminal",
     "xfwm4",
 ]

recipes/groups/xfce4-full/recipe.toml

@@ -0,0 +1,12 @@
+[package]
+dependencies = [
+    "mousepad",
+    "parole",
+    "ristretto",
+    "xfdashboard",
+    "xfce4-screenshooter",
+    "xfce4-notifyd",
+    "xfce4-power-manager",
+    "xfce4-terminal",
+    "xfce4-common",
+]

recipes/wip/net/http/miniserve/recipe.toml

@@ -1,6 +1,10 @@
 #TODO compiled but not tested
 [source]
 git = "https://github.com/svenstaro/miniserve"
+rev = "v0.35.0"
+patches = [
+    "redox.patch"
+]
 shallow_clone = true
 [build]
 template = "cargo"

recipes/wip/net/http/miniserve/redox.patch

@@ -1,5 +1,5 @@
 diff --git a/Cargo.toml b/Cargo.toml
-index 68f26c9..98c4dde 100644
+index 8349e40..f4eab7f 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
 @@ -39,7 +39,6 @@ futures = "0.3"
@@ -21,7 +21,7 @@ index 68f26c9..98c4dde 100644
  default = ["tls"]
  # This feature allows us to use rustls only on architectures supported by ring.
 diff --git a/src/main.rs b/src/main.rs
-index aea9ed9..3c91968 100644
+index b26a3e0..13fe122 100644
 --- a/src/main.rs
 +++ b/src/main.rs
 @@ -193,6 +193,7 @@ async fn run(miniserve_config: MiniserveConfig) -> Result<(), StartupError> {