From 1ab31843d1c406a2900a819b8e2b7f9cab0a4409 Mon Sep 17 00:00:00 2001 From: thelamer Date: Mon, 6 Apr 2026 16:01:34 -0400 Subject: [PATCH 1/2] rebase xfce-ubuntu to resolute --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- package_versions.txt | 58 ++++++++++++++++---------------- root/defaults/startwm_wayland.sh | 10 +----- 4 files changed, 32 insertions(+), 40 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3533dd551..dc8e360c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-selkies:ubuntunoble +FROM ghcr.io/linuxserver/baseimage-selkies:ubunturesolute # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 081bd551b..6143a033e 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-selkies:arm64v8-ubuntunoble +FROM ghcr.io/linuxserver/baseimage-selkies:arm64v8-ubunturesolute # set version label ARG BUILD_DATE diff --git a/package_versions.txt b/package_versions.txt index e2e68ec50..9f259a944 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -10,15 +10,15 @@ apt 2. apt-transport-https 2.8.3 deb apt-utils 2.8.3 deb at-spi2-common 2.52.0-1build1 deb -attrs 25.4.0 python +attrs 26.1.0 python autocommand 2.2.2 python backports-tarfile 1.2.0 python base-files 13ubuntu10.4 deb base-passwd 3.6.3build1 deb bash 5.2.21-2ubuntu4 deb -binutils 2.42-4ubuntu2.8 deb -binutils-common 2.42-4ubuntu2.8 deb -binutils-x86-64-linux-gnu 2.42-4ubuntu2.8 deb +binutils 2.42-4ubuntu2.10 deb +binutils-common 2.42-4ubuntu2.10 deb +binutils-x86-64-linux-gnu 2.42-4ubuntu2.10 deb blinker 1.7.0 python breeze-cursor-theme 4:5.27.12-0ubuntu0.1 deb bsdextrautils 2.39.3-9ubuntu6.5 deb @@ -78,7 +78,7 @@ dnspython 2. docker-buildx-plugin 0.31.1-1~ubuntu.24.04~noble deb docker-ce 5:29.3.0-1~ubuntu.24.04~noble deb docker-ce-cli 5:29.3.0-1~ubuntu.24.04~noble deb -docker-compose-plugin 5.1.0-1~ubuntu.24.04~noble deb +docker-compose-plugin 5.1.1-1~ubuntu.24.04~noble deb dpkg 1.22.6ubuntu6.5 deb dunst 1.9.2-1build2 deb e2fsprogs 1.47.0-2.4~exp1ubuntu4.1 deb @@ -186,8 +186,8 @@ github.com/containerd/cgroups/v3 v3 github.com/containerd/cgroups/v3 v3.1.3 go-module github.com/containerd/console v1.0.5 go-module (+6 duplicates) github.com/containerd/containerd/api v1.10.0 go-module (+5 duplicates) -github.com/containerd/containerd/v2 v2.2.1 go-module (+2 duplicates) -github.com/containerd/containerd/v2 v2.2.2 go-module (+2 duplicates) +github.com/containerd/containerd/v2 v2.2.1 go-module (+1 duplicate) +github.com/containerd/containerd/v2 v2.2.2 go-module (+3 duplicates) github.com/containerd/continuity v0.4.5 go-module (+5 duplicates) github.com/containerd/errdefs v1.0.0 go-module (+5 duplicates) github.com/containerd/errdefs/pkg v0.3.0 go-module (+5 duplicates) @@ -227,7 +227,7 @@ github.com/docker/cli v2 github.com/docker/cli v29.2.1+incompatible go-module github.com/docker/cli-docs-tool v0.11.0 go-module github.com/docker/cli/cmd/docker UNKNOWN go-module -github.com/docker/compose/v5 v5.1.0 go-module +github.com/docker/compose/v5 v5.1.1 go-module github.com/docker/distribution v2.8.3+incompatible go-module github.com/docker/docker v28.5.2+incompatible go-module (+1 duplicate) github.com/docker/docker-credential-helpers v0.9.5 go-module (+1 duplicate) @@ -378,10 +378,9 @@ github.com/moby/go-archive v0 github.com/moby/ipvs v1.1.0 go-module github.com/moby/locker v1.0.1 go-module (+4 duplicates) github.com/moby/moby/api v1.52.0 go-module -github.com/moby/moby/api v1.53.0 go-module -github.com/moby/moby/api v1.54.0 go-module +github.com/moby/moby/api v1.54.0 go-module (+1 duplicate) github.com/moby/moby/client v0.2.1 go-module -github.com/moby/moby/client v0.2.2 go-module +github.com/moby/moby/client v0.3.0 go-module github.com/moby/moby/v2 v29.3.0 go-module (+1 duplicate) github.com/moby/patternmatcher v0.6.0 go-module (+2 duplicates) github.com/moby/policy-helpers v0.0.0-20251206004813-9fcc1a9ec5c9 go-module @@ -566,11 +565,13 @@ golang.org/x/oauth2 v0 golang.org/x/oauth2 v0.33.0 go-module golang.org/x/oauth2 v0.35.0 go-module golang.org/x/sync v0.18.0 go-module (+2 duplicates) -golang.org/x/sync v0.19.0 go-module (+2 duplicates) +golang.org/x/sync v0.19.0 go-module (+1 duplicate) +golang.org/x/sync v0.20.0 go-module golang.org/x/sys v0.30.0 go-module golang.org/x/sys v0.38.0 go-module (+2 duplicates) golang.org/x/sys v0.39.0 go-module -golang.org/x/sys v0.41.0 go-module (+2 duplicates) +golang.org/x/sys v0.41.0 go-module (+1 duplicate) +golang.org/x/sys v0.42.0 go-module golang.org/x/term v0.37.0 go-module golang.org/x/term v0.38.0 go-module (+1 duplicate) golang.org/x/term v0.40.0 go-module @@ -623,7 +624,7 @@ idna 3. ifaddr 0.2.0 python importlib-metadata 8.7.1 python init-system-helpers 1.66ubuntu1 deb -intel-media-va-driver 24.1.0+dfsg1-1ubuntu0.1 deb +intel-media-va-driver 24.1.0+dfsg1-1ubuntu0.2 deb iproute2 6.1.0-1ubuntu6.2 deb iptables 1.8.10-3ubuntu2 deb iso-codes 4.16.0-1 deb @@ -675,7 +676,7 @@ libavcodec60 7: libavutil58 7:6.1.1-3ubuntu5 deb libayatana-ido3-0.4-0 0.10.1-1build2 deb libayatana-indicator3-7 0.9.4-1build1 deb -libbinutils 2.42-4ubuntu2.8 deb +libbinutils 2.42-4ubuntu2.10 deb libblkid1 2.39.3-9ubuntu6.5 deb libbpf1 1:1.3.0-2build2 deb libbrotli1 1.1.0-2build2 deb @@ -698,8 +699,8 @@ libcom-err2 1. libcrypt-dev 1:4.4.36-4build1 deb libcrypt1 1:4.4.36-4build1 deb libcryptsetup12 2:2.7.0-1ubuntu4.2 deb -libctf-nobfd0 2.42-4ubuntu2.8 deb -libctf0 2.42-4ubuntu2.8 deb +libctf-nobfd0 2.42-4ubuntu2.10 deb +libctf0 2.42-4ubuntu2.10 deb libcups2t64 2.4.7-1.2ubuntu7.9 deb libcurl3t64-gnutls 8.5.0-2ubuntu10.8 deb libcurl4t64 8.5.0-2ubuntu10.8 deb @@ -777,7 +778,7 @@ libgmp10 2: libgnutls30t64 3.8.3-1.1ubuntu3.5 deb libgomp1 14.2.0-4ubuntu2~24.04.1 deb libgpg-error0 1.47-3build2.1 deb -libgprofng0 2.42-4ubuntu2.8 deb +libgprofng0 2.42-4ubuntu2.10 deb libgraphite2-3 1.3.14-2build1 deb libgs-common 10.02.1~dfsg1-0ubuntu7.8 deb libgs10 10.02.1~dfsg1-0ubuntu7.8 deb @@ -811,11 +812,11 @@ libicu74 74 libid3tag0 0.15.1b-14build1 deb libidn12 1.42-1build1 deb libidn2-0 2.3.7-2build1.1 deb -libigdgmm12 22.3.17+ds1-1 deb +libigdgmm12 22.3.17+ds1-1ubuntu1 deb libijs-0.35 0.35-15.1build1 deb libimlib2t64 1.12.1-1.1build2 deb -libinput-bin 1.25.0-1ubuntu3.2 deb -libinput10 1.25.0-1ubuntu3.2 deb +libinput-bin 1.25.0-1ubuntu3.3 deb +libinput10 1.25.0-1ubuntu3.3 deb libip4tc2 1.8.10-3ubuntu2 deb libip6tc2 1.8.10-3ubuntu2 deb libisl23 0.26-3build1.1 deb @@ -936,7 +937,7 @@ libsemanage2 3. libsensors-config 1:3.6.0-9build1 deb libsensors5 1:3.6.0-9build1 deb libsepol2 3.5-2build1 deb -libsframe1 2.42-4ubuntu2.8 deb +libsframe1 2.42-4ubuntu2.10 deb libsharpyuv0 1.3.2-0.4build3 deb libshine3 3.1.1-2build1 deb libslang2 2.3.3-3build2 deb @@ -953,7 +954,7 @@ libspeex1 1. libspeexdsp1 1.2.1-1ubuntu3 deb libsqlite3-0 3.45.1-1ubuntu2.5 deb libss2 1.47.0-2.4~exp1ubuntu4.1 deb -libssh-4 0.10.6-2ubuntu0.3 deb +libssh-4 0.10.6-2ubuntu0.4 deb libssl3t64 3.0.13-0ubuntu3.7 deb libstartup-notification0 0.12-6build3 deb libstdc++-13-dev 13.3.0-6ubuntu2~24.04.1 deb @@ -970,7 +971,7 @@ libthai-data 0. libthai0 0.1.29-2build1 deb libtheora0 1.1.1+dfsg.1-16.1build3 deb libthunarx-3-0 4.18.8-1build3 deb -libtiff6 4.5.1+git230720-4ubuntu2.4 deb +libtiff6 4.5.1+git230720-4ubuntu2.5 deb libtinfo6 6.4+20240113-1ubuntu2 deb libtirpc-common 1.3.4+ds-1.1build1 deb libtirpc3t64 1.3.4+ds-1.1build1 deb @@ -1161,7 +1162,7 @@ pygobject 3. pyjwt 2.7.0 python pylibsrtp 1.0.0 python pynput 1.8.1 python -pyopenssl 25.3.0 python +pyopenssl 26.0.0 python pyparsing 3.1.1 python python-apt 2.7.7+ubuntu5.2 python python-apt-common 2.7.7ubuntu5.2 deb @@ -1170,7 +1171,7 @@ python3 3. python3-apt 2.7.7ubuntu5.2 deb python3-blinker 1.7.0-1 deb python3-cffi-backend 1.16.0-2build1 deb -python3-cryptography 41.0.7-4ubuntu0.3 deb +python3-cryptography 41.0.7-4ubuntu0.4 deb python3-dbus 1.3.2-5build3 deb python3-distro 1.9.0-1 deb python3-gi 3.48.2-1 deb @@ -1213,8 +1214,8 @@ six 1. software-properties-common 0.99.49.4 deb ssl-cert 1.1.2ubuntu1 deb stdlib go1.25.6 go-module -stdlib go1.25.7 go-module (+3 duplicates) -stdlib go1.25.8 go-module (+3 duplicates) +stdlib go1.25.7 go-module (+2 duplicates) +stdlib go1.25.8 go-module (+4 duplicates) stterm 0.9-1 deb sudo 1.9.15p5-3ubuntu5.24.04.2 deb systemd 255.4-1ubuntu8.12 deb @@ -1243,7 +1244,6 @@ websockets 16 wheel 0.46.3 python wl-clipboard 2.2.1-1build1 deb wlr-randr 0.3.0-1 deb -wtype 0.4-3 deb x11-apps 7.7+11build3 deb x11-common 1:7.7+23ubuntu3 deb x11-session-utils 7.7+6build2 deb diff --git a/root/defaults/startwm_wayland.sh b/root/defaults/startwm_wayland.sh index 846e806b5..2474d5ec7 100755 --- a/root/defaults/startwm_wayland.sh +++ b/root/defaults/startwm_wayland.sh @@ -1,12 +1,4 @@ #!/bin/bash -# Default settings -if [ ! -d "${HOME}"/.config/xfce4/xfconf/xfce-perchannel-xml ]; then - mkdir -p "${HOME}"/.config/xfce4/xfconf/xfce-perchannel-xml - cp /defaults/xfce/* "${HOME}"/.config/xfce4/xfconf/xfce-perchannel-xml/ -fi - # Start DE -WAYLAND_DISPLAY=wayland-1 Xwayland :1 & -sleep 2 -exec dbus-launch --exit-with-session /usr/bin/xfce4-session > /dev/null 2>&1 +WAYLAND_DISPLAY=wayland-1 startxfce4 --wayland > /dev/null 2>&1 From c43b2364ae337230f992e4917ec06b501e164e05 Mon Sep 17 00:00:00 2001 From: thelamer Date: Mon, 6 Apr 2026 16:28:02 -0400 Subject: [PATCH 2/2] use proper header --- root/defaults/startwm_wayland.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/defaults/startwm_wayland.sh b/root/defaults/startwm_wayland.sh index 2474d5ec7..176ce6f95 100755 --- a/root/defaults/startwm_wayland.sh +++ b/root/defaults/startwm_wayland.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/with-contenv bash # Start DE WAYLAND_DISPLAY=wayland-1 startxfce4 --wayland > /dev/null 2>&1