mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-22 06:15:58 +00:00
cleanup (#764)
This commit is contained in:
1 parent
4163b31b02
commit
83ec5708ed
852 files changed
+4844
-46144
No files matched your search
@@ -1,6 +1,4 @@
|
||||
#!/bin/bash
|
||||
# Build the pinned KWin executable with the nested-scale patch on native aarch64 Linux.
|
||||
# Its dependencies come from signature-checked Arch Linux ARM packages in a disposable chroot.
|
||||
set -euo pipefail
|
||||
out=$(realpath -m "${1:?out dir}")
|
||||
here=$(cd "$(dirname "$0")" && pwd)
|
||||
@@ -20,7 +18,6 @@ for repo in core extra alarm; do
|
||||
done
|
||||
touch "$work/runtime.txt"
|
||||
python3 "$here/closure.py" "$work/db" "$work/runtime.txt" "$here/kwin-build-seeds.txt" > "$work/packages.txt"
|
||||
# Refuse a repository whose KWin headers/libraries have moved beyond the pinned source.
|
||||
grep -Eq '^extra/kwin-6\.7\.5-[0-9]+-aarch64\.pkg\.tar\.' "$work/packages.txt"
|
||||
export work mirror builder here
|
||||
download() {
|
||||
@@ -56,8 +53,6 @@ sudo cp "$work/root/build/out/bin/kwin_wayland" "$out/kwin_wayland"
|
||||
sudo cp "$work/root/build/out/bin/libkwin.so.$version" "$out/libkwin.so.$version"
|
||||
sudo chown "$(id -u):$(id -g)" "$out/kwin_wayland" "$out/libkwin.so.$version"
|
||||
strip --strip-unneeded "$out/kwin_wayland" "$out/libkwin.so.$version"
|
||||
# The backend lives in libkwin, not the small launcher. Catch accidentally shipping only the
|
||||
# executable, which boots successfully but still loads the distribution's unpatched backend.
|
||||
grep -aq DROIDDECK_NESTED_SCALE "$out/libkwin.so.$version"
|
||||
{
|
||||
echo "KWin $version source sha256 $source_sha"
|
||||
|
||||
@@ -1,24 +1,4 @@
|
||||
#!/bin/bash
|
||||
# Builds the KDE Plasma desktop package for the Linux runtime: the closure of seeds.txt over Arch
|
||||
# Linux ARM's aarch64 repositories, minus what the runtime image already carries, plus overlay/,
|
||||
# as a zstd tarball that extracts over the rootfs (DesktopCatalog's "tar" kind).
|
||||
#
|
||||
# tools/desktop-kde/build.sh <out dir>
|
||||
#
|
||||
# The runtime's own packages (runtime-packages.txt, "name version" from its pacman db) are not
|
||||
# shipped again, except where something in the closure asks for a version of one the runtime does
|
||||
# not have (a versioned dependency on it, or on a library it provides): then the repository's
|
||||
# build comes along and replaces it. Nothing is deleted on extraction, so a library whose soname
|
||||
# moved keeps its old file for what the runtime linked against it.
|
||||
#
|
||||
# Every package is fetched over HTTPS and must carry a valid signature by the Arch Linux ARM Build
|
||||
# System key (archlinuxarm-builder.gpg; primary fingerprint pinned below, as archlinuxarm.org
|
||||
# publishes it and archlinuxarm-keyring trusts it) and match the sha256 the repository database
|
||||
# gives for it; anything else stops the build. The repository databases themselves are not signed
|
||||
# by Arch Linux ARM, so they decide only which signed packages are taken. desktop-kde.packages.txt
|
||||
# lists every package taken, with its sha256: what a release was built from.
|
||||
#
|
||||
# Needs curl, gpgv, tar, xz, zstd, python3.
|
||||
set -euo pipefail
|
||||
out=${1:?out dir}
|
||||
here=$(cd "$(dirname "$0")" && pwd)
|
||||
@@ -27,7 +7,6 @@ case $mirror in https://*) ;; *) echo "ALARM_MIRROR must be https" >&2; exit 1 ;
|
||||
builder=68B3537F39A313B3E574D06777193F152BDBE6A6
|
||||
fetch() { curl -fsSL --proto '=https' --proto-redir '=https' --retry 6 --retry-delay 5 --retry-all-errors -o "$1" "$2"; }
|
||||
work=$(mktemp -d); mkdir -p "$out" "$work/db" "$work/root"
|
||||
# PKG_CACHE keeps the downloaded packages between builds (a local rebuild after an overlay change).
|
||||
pkgs=${PKG_CACHE:-$work/pkgs}; mkdir -p "$pkgs"
|
||||
trap 'rm -rf "$work"' EXIT
|
||||
|
||||
@@ -56,24 +35,19 @@ done < "$work/pkglist.txt"
|
||||
|
||||
cp -a "$here/overlay/." "$work/root/"
|
||||
|
||||
# Same-version KWin, built by build-kwin.sh with the nested desktop scale patch.
|
||||
if [ -n "${KDE_KWIN_OVERRIDE:-}" ]; then
|
||||
install -m 755 "$KDE_KWIN_OVERRIDE/kwin_wayland" "$work/root/usr/bin/kwin_wayland"
|
||||
install -m 755 "$KDE_KWIN_OVERRIDE/libkwin.so.6.7.5" "$work/root/usr/lib/libkwin.so.6.7.5"
|
||||
fi
|
||||
|
||||
# Weight that no desktop on a phone reads.
|
||||
rm -rf "$work/root/usr/share/doc" "$work/root/usr/share/man" "$work/root/usr/share/info" \
|
||||
"$work/root/usr/share/gtk-doc" "$work/root/usr/include" "$work/root/usr/lib/pkgconfig" \
|
||||
"$work/root/usr/lib/cmake" "$work/root/usr/share/help"
|
||||
# English only, on purpose: the desktop session runs in C.UTF-8 and nothing hands the app's language
|
||||
# to KDE, so other translations would be weight no one sees. They come back with localizing the
|
||||
# desktop itself (LANGUAGE from the app's language at session start).
|
||||
find "$work/root/usr/share/locale" -mindepth 1 -maxdepth 1 -type d ! -name 'en*' -exec rm -rf {} + 2>/dev/null || true
|
||||
find "$work/root/usr/lib" -name '*.a' -delete
|
||||
chmod -R u+rwX "$work/root"
|
||||
|
||||
sed 's#^[a-z]*/##' "$work/pkglist.txt" > "$out/desktop-kde.packages.txt" # "file sha256", each verified above
|
||||
sed 's#^[a-z]*/##' "$work/pkglist.txt" > "$out/desktop-kde.packages.txt"
|
||||
tar -C "$work/root" --zstd -cf "$out/desktop-kde.tar.zst" .
|
||||
sha256sum "$out/desktop-kde.tar.zst" | awk '{print $1}' > "$out/desktop-kde.sha256"
|
||||
ls -l "$out/desktop-kde.tar.zst"
|
||||
@@ -15,7 +15,6 @@ REPOS = ("core", "extra", "alarm")
|
||||
|
||||
|
||||
def vercmp_part(a, b):
|
||||
# rpmvercmp, as pacman compares version strings.
|
||||
if a == b:
|
||||
return 0
|
||||
sa = re.findall(r"\d+|[a-zA-Z]+", a)
|
||||
@@ -104,14 +103,11 @@ def main():
|
||||
def resolve(dep):
|
||||
"""The package to take for a dependency string, and whether the runtime's copy serves."""
|
||||
name, op, want = parse_dep(dep)
|
||||
# A runtime package that is the dependency or provides it, at a version that serves.
|
||||
if name in runtime and satisfies(runtime[name], op, want):
|
||||
return name, True
|
||||
candidates = providers.get(name, [])
|
||||
for real, _ in candidates:
|
||||
if real in runtime:
|
||||
# A provided name (a soname, mostly): the runtime's build serves as long as it is
|
||||
# the repository's own, or nothing asks for a particular version.
|
||||
if not op or runtime[real] == pkgs[real]["version"]:
|
||||
return real, True
|
||||
if satisfies_provider(real, name, op, want):
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
# Native build tools and KWin's Arch makedepends; dependencies are resolved and signature-checked.
|
||||
kwin
|
||||
base-devel
|
||||
cmake
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
# Application packages from steamdeck-desktop-r1's desktop.packages.txt.
|
||||
# Keep dependencies and shared apps/icons (Firefox, mpv, Breeze, xdg-utils and portals).
|
||||
labwc
|
||||
lxqt-panel
|
||||
lxqt-config
|
||||
|
||||
-1
@@ -1,4 +1,3 @@
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
<svg id="svg2" height="64" style="" viewBox="0 0 64 64" width="64" xmlns="http://www.w3.org/2000/svg" sodipodi:docname="deck_icon.svg" inkscape:version="1.2-dev (d2dd25d878, 2022-02-01, custom)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg">
|
||||
<path id="path42220" d="m 32 4 v 10 a 18 18 0 0 1 18 18 a 18 18 0 0 1 -18 18 v 10 a 28 28 0 0 0 28 -28 a 28 28 0 0 0 -28 -28 z" style="fill:#fff;fill-rule:evenodd"/>
|
||||
<circle id="path43518" cx="32" cy="32" r="14" style="fill:#1a9fff;fill-rule:evenodd"/>
|
||||
|
||||
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
-1
@@ -1,4 +1,3 @@
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
<svg id="svg2" height="64" style="" viewBox="0 0 64 64" width="64" xmlns="http://www.w3.org/2000/svg" sodipodi:docname="start.svg" inkscape:version="1.2-dev (d2dd25d878, 2022-02-01, custom)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg">
|
||||
<style type="text/css" id="current-color-scheme">
|
||||
.ColorScheme-Text {
|
||||
|
||||
|
Before Width: | Height: | Size: 1020 B After Width: | Height: | Size: 962 B |
-3
@@ -1,5 +1,3 @@
|
||||
// The first desktop: DroidDeck's wallpaper, and SteamOS's Plasma's default bottom panel with the Steam Deck
|
||||
// launcher icon, Steam, the file manager, the browser and Konsole pinned to the task manager.
|
||||
var desktops = desktopsForActivity(currentActivity());
|
||||
for (var i = 0; i < desktops.length; i++) {
|
||||
desktops[i].wallpaperPlugin = "org.kde.image";
|
||||
@@ -36,7 +34,6 @@ if (trayId) {
|
||||
trayContainment.currentConfigGroup = ["General"];
|
||||
trayContainment.writeConfig("scaleIconsToFit", true);
|
||||
}
|
||||
// The runtime has no locale of its own (C.UTF-8), whose short date reads "9 10 2026".
|
||||
var clock = panel.addWidget("org.kde.plasma.digitalclock");
|
||||
clock.currentConfigGroup = ["Appearance"];
|
||||
clock.writeConfig("dateFormat", "isoDate");
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="1920" height="1080" viewBox="0 0 1920 1080">
|
||||
<!-- DroidDeck's desktop wallpaper: the mark (artwork/droiddeck-mark.svg) on deep navy. -->
|
||||
<defs>
|
||||
<radialGradient id="bg" cx="960" cy="540" r="1150" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0" stop-color="#14213a"/>
|
||||
|
||||
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.4 KiB |
@@ -28,7 +28,7 @@
|
||||
- // intentionally ignored, as it would get overwritten
|
||||
- // with the fractional scale protocol anyways
|
||||
- // next.scale = props->scale.value_or(m_state.scale);
|
||||
+ // DroidDeck owns the outer window size; Display Settings owns the inner UI scale.
|
||||
+
|
||||
+ if (qEnvironmentVariableIsSet("DROIDDECK_NESTED_SCALE")) {
|
||||
+ next.scale = props->scale.value_or(m_state.scale);
|
||||
+ next.scaleSetting = props->scaleSetting.value_or(m_state.scaleSetting);
|
||||
@@ -53,7 +53,7 @@
|
||||
|
||||
void init(const QSize &pixelSize, qreal scale, bool fullscreen);
|
||||
|
||||
+ // The outer window scale, independent of the desktop UI scale in DroidDeck.
|
||||
+
|
||||
+ qreal presentationScale() const;
|
||||
bool isReady() const;
|
||||
KWayland::Client::Surface *surface() const;
|
||||
|
||||
@@ -68,7 +68,6 @@ def main():
|
||||
cache, out, legacy_cache = map(pathlib.Path, sys.argv[5:8])
|
||||
here = pathlib.Path(__file__).resolve().parent
|
||||
seeds = {line.strip() for line in (here / 'seeds.txt').read_text().splitlines() if line.strip() and not line.startswith('#')} - SHARED_SEEDS
|
||||
# Published source package hashes; the caller places this beside the verified cache.
|
||||
packages = dict(line.split() for line in (cache / 'desktop-kde.packages.txt').read_text().splitlines())
|
||||
selected = set()
|
||||
found = set()
|
||||
@@ -86,8 +85,6 @@ def main():
|
||||
selected.update(str(p.relative_to(here / 'overlay')) for p in (here / 'overlay').rglob('*') if p.is_file())
|
||||
inventories = [inventory(p, pin[1]) for p, pin in zip(archives, PINS)]
|
||||
out.mkdir(parents=True, exist_ok=True)
|
||||
# The old runtime's pacman database omits some gamescope dependencies (e.g. libseat).
|
||||
# Own only the LXQt application packages, never their dependency closure.
|
||||
legacy_seeds = {line.strip() for line in (here / 'lxqt-applications.txt').read_text().splitlines()
|
||||
if line.strip() and not line.startswith('#')}
|
||||
legacy_selected = set()
|
||||
|
||||
@@ -1,6 +1,3 @@
|
||||
# The desktop: KDE Plasma, as SteamOS's desktop mode has it - KWin nested as a client of the app's
|
||||
# compositor, Plasma's shell on it, and the apps SteamOS puts on its desktop. One package name per
|
||||
# line; build.sh takes the closure over Arch Linux ARM at build time, minus what the runtime has.
|
||||
kwin
|
||||
plasma-workspace
|
||||
plasma-desktop
|
||||
|
||||
Reference in new issue
Block a user