From bece019c4a2764a6611917aa907d016e5006e905 Mon Sep 17 00:00:00 2001 From: Sonny Piers Date: Mon, 27 Apr 2026 22:07:59 +0200 Subject: [PATCH 1/2] GNOME 50 --- .gitignore | 1 + Makefile | 6 +++--- build-aux/re.sonny.Workbench.Devel.json | 2 +- build-aux/re.sonny.Workbench.json | 2 +- data/app.metainfo.xml | 8 ++++++++ demos | 2 +- meson.build | 2 +- src/main.js | 1 - src/style-dark.css | 9 --------- src/style.css | 12 ++++++++++++ 10 files changed, 28 insertions(+), 17 deletions(-) delete mode 100644 src/style-dark.css diff --git a/.gitignore b/.gitignore index bed8347dd..116b3114d 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ __pycache__ .idea target +.foundry diff --git a/Makefile b/Makefile index 72e026c5b..b71ce5284 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ SHELL:=/bin/bash -O globstar setup: flatpak remote-add --user --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo - flatpak install --or-update --user --noninteractive flathub org.gnome.Sdk//49 org.flatpak.Builder org.freedesktop.Sdk.Extension.rust-stable//25.08 org.freedesktop.Sdk.Extension.vala//25.08 org.freedesktop.Sdk.Extension.llvm21//25.08 org.freedesktop.Sdk.Extension.node24//25.08 org.freedesktop.Sdk.Extension.typescript//25.08 + flatpak install --or-update --user --noninteractive flathub org.gnome.Sdk//50 org.flatpak.Builder org.freedesktop.Sdk.Extension.rust-stable//25.08 org.freedesktop.Sdk.Extension.vala//25.08 org.freedesktop.Sdk.Extension.llvm21//25.08 org.freedesktop.Sdk.Extension.node24//25.08 org.freedesktop.Sdk.Extension.typescript//25.08 # flatpak remote-add --user --if-not-exists flathub-beta https://flathub.org/beta-repo/flathub-beta.flatpakrepo # flatpak remote-add --user --if-not-exists gnome-nightly https://nightly.gnome.org/gnome-nightly.flatpakrepo # flatpak install --or-update --user --noninteractive gnome-nightly org.gnome.Sdk//master @@ -73,14 +73,14 @@ ci: setup build test # make sure to test without the sdk extensions installed sandbox: setup flatpak run org.flatpak.Builder --ccache --user --install --force-clean flatpak build-aux/re.sonny.Workbench.Devel.json -# flatpak remove --noninteractive org.freedesktop.Sdk.Extension.rust-stable//24.08 org.freedesktop.Sdk.Extension.vala//24.08 org.freedesktop.Sdk.Extension.llvm20//24.08 +# flatpak remove --noninteractive org.freedesktop.Sdk.Extension.rust-stable//25.08 org.freedesktop.Sdk.Extension.vala//25.08 org.freedesktop.Sdk.Extension.llvm20//25.08 flatpak run --command="bash" re.sonny.Workbench.Devel flatpak: flatpak run org.flatpak.Builder --ccache --force-clean flatpak build-aux/re.sonny.Workbench.Devel.json # This is what Flathub does - consider moving to lint flatpak run --env=G_DEBUG=fatal-criticals --command=appstream-util org.flatpak.Builder validate flatpak/files/share/appdata/re.sonny.Workbench.Devel.appdata.xml - flatpak run --command="desktop-file-validate" --filesystem=host:ro org.freedesktop.Sdk//24.08 flatpak/files/share/applications/re.sonny.Workbench.Devel.desktop + flatpak run --command="desktop-file-validate" --filesystem=host:ro org.freedesktop.Sdk//25.08 flatpak/files/share/applications/re.sonny.Workbench.Devel.desktop # appstreamcli validate --override=release-time-missing=info /path/to/your/app.metainfo.xml flatpak run org.flatpak.Builder --run flatpak build-aux/re.sonny.Workbench.Devel.json bash diff --git a/build-aux/re.sonny.Workbench.Devel.json b/build-aux/re.sonny.Workbench.Devel.json index 5deba30c1..a39db132f 100644 --- a/build-aux/re.sonny.Workbench.Devel.json +++ b/build-aux/re.sonny.Workbench.Devel.json @@ -2,7 +2,7 @@ "$schema": "https://raw.githubusercontent.com/flatpak/flatpak-builder/main/data/flatpak-manifest.schema.json", "id": "re.sonny.Workbench.Devel", "runtime": "org.gnome.Sdk", - "runtime-version": "49", + "runtime-version": "50", "sdk": "org.gnome.Sdk", "sdk-extensions": [ "org.freedesktop.Sdk.Extension.vala", diff --git a/build-aux/re.sonny.Workbench.json b/build-aux/re.sonny.Workbench.json index 56477881b..68e25f5cb 100644 --- a/build-aux/re.sonny.Workbench.json +++ b/build-aux/re.sonny.Workbench.json @@ -2,7 +2,7 @@ "$schema": "https://raw.githubusercontent.com/flatpak/flatpak-builder/main/data/flatpak-manifest.schema.json", "id": "re.sonny.Workbench", "runtime": "org.gnome.Sdk", - "runtime-version": "49", + "runtime-version": "50", "sdk": "org.gnome.Sdk", "sdk-extensions": [ "org.freedesktop.Sdk.Extension.vala", diff --git a/data/app.metainfo.xml b/data/app.metainfo.xml index 18e23836e..994a2733c 100644 --- a/data/app.metainfo.xml +++ b/data/app.metainfo.xml @@ -43,6 +43,14 @@ + + +
    +
  • Use GNOME 50
    • +
+ + +
    diff --git a/demos b/demos index 5efa50c46..06e0ae3cd 160000 --- a/demos +++ b/demos @@ -1 +1 @@ -Subproject commit 5efa50c4692da433fdd9ce696b329ebcea03fb1b +Subproject commit 06e0ae3cd80b4df90b37d1d68556ffafaf791638 diff --git a/meson.build b/meson.build index c393af06c..6b7329699 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project( 'Workbench', ['vala', 'c', 'rust'], - version: '49.0', + version: '50.0', meson_version: '>= 1.0.0', license: 'GPL-3.0-only', default_options: [ diff --git a/src/main.js b/src/main.js index ed6f30e73..af52f675d 100644 --- a/src/main.js +++ b/src/main.js @@ -6,7 +6,6 @@ pkg.initGettext(); import "./language-specs/blueprint.lang"; import "./style.css"; -import "./style-dark.css"; import "./libworkbench/workbench-preview-window.blp"; export function main(argv) { diff --git a/src/style-dark.css b/src/style-dark.css deleted file mode 100644 index 2c529b136..000000000 --- a/src/style-dark.css +++ /dev/null @@ -1,9 +0,0 @@ -#panel_code, -#panel_style, -#panel_ui { - background-color: #262626; -} - -#toolbar_devtools { - background-color: #262626; -} diff --git a/src/style.css b/src/style.css index 6101ac9cc..3c02fc3ad 100644 --- a/src/style.css +++ b/src/style.css @@ -52,3 +52,15 @@ button.pill.small { #toolbar_devtools { background-color: #fcfcfc; } + +@media (prefers-color-scheme: dark) { + #panel_code, + #panel_style, + #panel_ui { + background-color: #262626; + } + + #toolbar_devtools { + background-color: #262626; + } +} From 8c2ea8136668c91eeb141f7bbb3b045a38e88a53 Mon Sep 17 00:00:00 2001 From: Sonny Piers Date: Mon, 27 Apr 2026 22:40:17 +0200 Subject: [PATCH 2/2] f --- .github/workflows/CI.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml index 3899fabbd..468e9794f 100644 --- a/.github/workflows/CI.yaml +++ b/.github/workflows/CI.yaml @@ -22,6 +22,7 @@ jobs: - name: Install host dependencies run: | + sudo apt-get update sudo apt-get install flatpak mutter flatpak-builder # Restore caches