diff --git a/mission-center.be0 b/mission-center.be0 index 69e4de0af..342d1effd 100755 --- a/mission-center.be0 +++ b/mission-center.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION mission-center-1.2.0-0 +# BEE_VERSION mission-center-1.2.0-1 # Mission Center, a GTK4/libadwaita system monitor for GNOME # (https://missioncenter.io/, https://gitlab.com/mission-center-devs/mission-center) @@ -57,6 +57,21 @@ # mirrors that exact tarball; mee_build() pre-seeds it (patched, with the # same patches build.rs would apply) at the cache path build.rs computes, # so its "already there" check short-circuits before any network call. +# +# * magpie's own network monitoring (subprojects/magpie/platform-linux/src/ +# network/) hard-depends on org.freedesktop.NetworkManager over D-Bus for +# everything except raw byte counters: if NetworkManager isn't installed +# or isn't running (true of this repository -- there is no +# NetworkManager.be0), NetworkCache::new() gives up and the Network page +# shows nothing at all. PATCHURL[0] replaces every NM-only piece with its +# native-Linux equivalent instead: MAC/kind/state from sysfs +# (/sys/class/net//{address,type,wireless,operstate,...}), IPv4/IPv6 +# addresses via getifaddrs(3), and SSID/frequency/bitrate/signal strength +# via nl80211 (generic netlink, the `neli-wifi` crate) -- the same +# mechanism `iw`/wpa_supplicant/NetworkManager itself use. This also drops +# the module's zbus/system-bus dependency entirely. SRCURL[6] is a second +# `cargo vendor` pass over magpie that additionally covers the new +# neli/neli-wifi dependency the patch adds to platform-linux/Cargo.toml. #SRCURL[0]="https://gitlab.com/mission-center-devs/mission-center/-/archive/v1.2.0/mission-center-v1.2.0.tar.gz" SRCURL[0]="https://beehive.molgen.mpg.de/4ed03428021bedec7aa69686fb021e46/mission-center-1.2.0.tar.gz" @@ -73,14 +88,17 @@ SRCURL[3]="https://beehive.molgen.mpg.de/c51bb52eb3e5e24c1960adc3a276ca87/bluepr # private libadwaita, see ghostty.be0 SRCURL[4]="https://beehive.molgen.mpg.de/7cabde6b8ca6a4865dde66b09b60240f/libadwaita-1.9.4.tar.xz" -# `cargo vendor` output, see above +# `cargo vendor` output, see above. magpie's includes neli/neli-wifi, added +# by PATCHURL[0] below. SRCURL[5]="https://beehive.molgen.mpg.de/e846bf25e5585587a59fc945f479c4f1/mission-center-1.2.0-cargo-vendor.tar.xz" -SRCURL[6]="https://beehive.molgen.mpg.de/590cfb1f5d2e4f7367be57ae2218f585/magpie-a5272b3c-cargo-vendor.tar.xz" +SRCURL[6]="https://beehive.molgen.mpg.de/40c77fd051691eee6a99a0815d24967a/magpie-a5272b3c-cargo-vendor-no-networkmanager.tar.xz" #SRCURL[7]="https://github.com/Syllo/nvtop/archive/3d4a953da02bc18886734613bb9f60ff80669de7.tar.gz" SRCURL[7]="https://beehive.molgen.mpg.de/d4534c6a691048bb12425cb169efb651/nvtop-3d4a953da02bc18886734613bb9f60ff80669de7.tar.gz" -# PATCHURL+=() +# replaces magpie's NetworkManager-only network monitoring with native +# sysfs/getifaddrs/nl80211 code, see the long comment up top +PATCHURL+=("https://beehive.molgen.mpg.de/d2d395d2450c535746aadf89410555f2/network-no-networkmanager.patch") # build_in_sourcedir @@ -116,9 +134,12 @@ mee_extract() { # consumed directly from there by mee_build(), see above. } -#mee_patch() { -# bee_patch "${@}" -#} +mee_patch() { + # the patch targets the magpie subproject's own paths (platform-linux/...), + # not mission-center's own source root, so it can't go through the + # default bee_patch (which applies with cwd=${S}) + (cd ${S}/subprojects/magpie && patch -p1 -i "${1}") +} mee_configure() { p=/pkg/rustc-1.97.0-0/profile; [ -e $p ] && . $p