Merge branch 'main' into foundry

sonnyp · sonnyp · commit 2580c295c8e5 · 2026-05-19T23:51:42.000+02:00
diff --git 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
diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@ ROOT := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
 
 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
@@ -71,13 +71,13 @@ 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/modules/gom.json b/build-aux/modules/gom.json
@@ -5,8 +5,8 @@
   "sources": [
     {
       "type": "archive",
-      "url": "https://download.gnome.org/sources/gom/0.5/gom-0.5.4.tar.xz",
-      "sha256": "57ba806fe080a937d5664178d21bad7653b2c561ea128187a7b10bc1762b7f65"
+      "url": "https://download.gnome.org/sources/gom/0.5/gom-0.5.6.tar.xz",
+      "sha256": "4d7a5e268698c8e7e40603e36e9e3a2b76133931ce1b637c1136301491b54cc3"
     }
   ]
 }
diff --git a/build-aux/modules/libshumate.json b/build-aux/modules/libshumate.json
@@ -5,32 +5,20 @@
   "sources": [
     {
       "type": "archive",
-      "url": "https://download.gnome.org/sources/libshumate/1.5/libshumate-1.5.1.tar.xz",
-      "sha256": "daadf8b700134388c7e933e0b623586aaa7f2fbe8b3a6259387513303b9876e6"
+      "url": "https://download.gnome.org/sources/libshumate/1.6/libshumate-1.6.1.tar.xz",
+      "sha256": "b36aad34500791785f546684d0f2ed644e4819ff4e85ae67a2245f159eccb2d4"
     }
   ],
   "modules": [
-    {
-      "name": "protobuf",
-      "buildsystem": "autotools",
-      "config-opts": ["DIST_LANG=cpp"],
-      "cleanup": ["/bin/protoc*", "/lib/libprotoc*", "/lib/libprotobuf-lite*"],
-      "sources": [
-        {
-          "type": "archive",
-          "url": "https://github.com/protocolbuffers/protobuf/releases/download/v3.17.3/protobuf-all-3.17.3.tar.gz",
-          "sha256": "77ad26d3f65222fd96ccc18b055632b0bfedf295cb748b712a98ba1ac0b704b2"
-        }
-      ]
-    },
     {
       "name": "protobuf-c",
       "buildsystem": "autotools",
+      "config-opts": ["--disable-protoc"],
       "sources": [
         {
           "type": "archive",
-          "url": "https://github.com/protobuf-c/protobuf-c/releases/download/v1.4.0/protobuf-c-1.4.0.tar.gz",
-          "sha256": "26d98ee9bf18a6eba0d3f855ddec31dbe857667d269bc0b6017335572f85bbcb"
+          "url": "https://github.com/protobuf-c/protobuf-c/releases/download/v1.5.2/protobuf-c-1.5.2.tar.gz",
+          "sha256": "e2c86271873a79c92b58fef7ebf8de1aa0df4738347a8bd5d4e65a80a16d0d24"
         }
       ]
     }
diff --git a/build-aux/modules/vte.json b/build-aux/modules/vte.json
@@ -3,6 +3,7 @@
   "buildsystem": "meson",
   "config-opts": [
     "--libdir=/app/lib",
+    "-Dapp=false",
     "-Ddocs=false",
     "-Dgtk3=false",
     "-Dgtk4=true",
@@ -12,8 +13,8 @@
   "sources": [
     {
       "type": "archive",
-      "url": "https://download.gnome.org/sources/vte/0.82/vte-0.82.1.tar.xz",
-      "sha256": "79376d70402d271e2d38424418e1aea72357934d272e321e3906b71706a78e3a"
+      "url": "https://download.gnome.org/sources/vte/0.84/vte-0.84.0.tar.xz",
+      "sha256": "0414e31583836aeb7878da25f67c515f7e8879917ecc37c92e26b83e8d8fc3e3"
     }
   ],
   "modules": [
@@ -23,8 +24,8 @@
       "sources": [
         {
           "type": "archive",
-          "url": "https://github.com/fastfloat/fast_float/archive/refs/tags/v6.1.6.tar.gz",
-          "sha256": "4458aae4b0eb55717968edda42987cabf5f7fc737aee8fede87a70035dba9ab0"
+          "url": "https://github.com/fastfloat/fast_float/archive/refs/tags/v8.2.5.tar.gz",
+          "sha256": "17c7fb14499fcf42c3f5d143df0fbe22172e92749ec5f75ef13224005421a654"
         }
       ]
     }
diff --git 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
@@ -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
@@ -43,6 +43,25 @@
   </screenshots>
   <content_rating type="oars-1.1" />
   <releases>
+    <release version="50.0" date="2026-05-01">
+      <description translatable="no">
+        <ul>
+          <li>Use GNOME 50</li>
+          <li>Fix runnng Rust projects</li>
+        </ul>
+        <p>Library:</p>
+        <ul>
+          <li>Correct network permission check</li>
+        </ul>
+        <p>Dependencies:</p>
+        <ul>
+          <li>Update libshumate to 1.6.1</li>
+          <li>Update vte to 0.84.0</li>
+          <li>Update gom to 0.5.6</li>
+        </ul>
+      </description>
+    </release>
+
     <release version="49.0" date="2025-10-13">
       <description translatable="no">
         <ul>
diff --git a/demos b/demos
@@ -1 +1 @@
-Subproject commit 5efa50c4692da433fdd9ce696b329ebcea03fb1b
+Subproject commit b74e83e5759e4c1aaa9f61d3400a83ca94d82a01
diff --git 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/Library/Library.blp b/src/Library/Library.blp
@@ -115,7 +115,9 @@ Adw.Window window {
             }
 
             Label {
-              label: _("All examples are dedicated to the public domain\nand <b>can be used freely</b> under the terms of <a href=\"https://creativecommons.org/publicdomain/zero/1.0/\">CC0 1.0</a>");
+              label: _(
+                "All examples are dedicated to the public domain\nand <b>can be used freely</b> under the terms of <a href=\"https://creativecommons.org/publicdomain/zero/1.0/\">CC0 1.0</a>"
+              );
               use-markup: true;
 
               styles [
diff --git a/src/PanelUI.js b/src/PanelUI.js
@@ -84,7 +84,7 @@ export default function PanelUI({
   );
   button_blueprint_documentation.connect("clicked", () => {
     new Gtk.UriLauncher({
-      uri: "https://gnome.pages.gitlab.gnome.org/blueprint-compiler/",
+      uri: "https://gnome.pages.gitlab.gnome.org/blueprint-compiler",
     })
       .launch(application.get_active_window(), null)
       .catch(console.error);
diff --git a/src/Permissions/Permissions.blp b/src/Permissions/Permissions.blp
@@ -42,7 +42,9 @@ Adw.Dialog dialog {
           }
 
           Label {
-            label: _("Workbench needs additional permissions. Please run the following command in a terminal and restart Workbench.");
+            label: _(
+              "Workbench needs additional permissions. Please run the following command in a terminal and restart Workbench."
+            );
             wrap: true;
             justify: center;
           }
diff --git a/src/Permissions/Permissions.js b/src/Permissions/Permissions.js
@@ -62,6 +62,12 @@ const missing_permissions = (() => {
   );
 })();
 
+export function hasNetworkPermission() {
+  const flatpak_info = getFlatpakInfo();
+  const shared = flatpak_info.get_string_list("Context", "shared");
+  return shared.includes("network");
+}
+
 export function needsAdditionalPermissions({ demo }) {
   if (!demo["flatpak-finish-args"]) return false;
   return missing_permissions;
diff --git a/src/cli/blueprint.js b/src/cli/blueprint.js
@@ -45,9 +45,9 @@ export default async function blueprint({ file, lspc }) {
     if (!(err instanceof LSPError)) throw err;
     if (
       ![
-        // https://gitlab.gnome.org/jwestman/blueprint-compiler/-/issues/128
+        // https://gitlab.gnome.org/GNOME/blueprint-compiler/-/work_items/128
         "unsupported XML tag: <condition>",
-        // https://gitlab.gnome.org/jwestman/blueprint-compiler/-/issues/139
+        // https://gitlab.gnome.org/GNOME/blueprint-compiler/-/work_items/139
         "unsupported XML tag: <items>",
       ].includes(err.message)
     ) {
diff --git 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/sessions.js b/src/sessions.js
@@ -3,6 +3,7 @@ import GLib from "gi://GLib";
 import Gtk from "gi://Gtk";
 import Gdk from "gi://Gdk";
 
+import { rmrf } from "../troll/src/util.js";
 import {
   data_dir,
   ensureDir,
@@ -11,7 +12,6 @@ import {
   settings as global_settings,
   copyDirectory,
   decode,
-  removeDirectory,
 } from "./util.js";
 import { languages } from "./common.js";
 import { createElement as xml } from "./langs/xml/xml.js";
@@ -90,7 +90,7 @@ export async function createSessionFromDemo(demo) {
 }
 
 export async function deleteSession(session) {
-  return removeDirectory(session.file);
+  return rmrf(session.file);
 }
 
 export async function saveSessionAsProject(session, destination) {
diff --git a/src/style-dark.css b/src/style-dark.css
diff --git 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;
+  }
+}
diff --git a/src/util.js b/src/util.js
@@ -164,19 +164,6 @@ export function quitOnLastWindowClose(self) {
   return false;
 }
 
-export function removeDirectory(file) {
-  // There is no method to recursively delete a folder so we trash instead
-  // https://github.com/flatpak/xdg-desktop-portal/issues/630 :/
-  // portal.trash_file(file.get_path(), null).catch(console.error);
-  try {
-    file.trash(null);
-  } catch (err) {
-    if (!err.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.EXISTS)) {
-      throw err;
-    }
-  }
-}
-
 export async function copy(filename, source_dir, dest_dir, flags) {
   const file = source_dir.get_child(filename);
   const dest_file = dest_dir.get_child(file.get_basename());
diff --git a/src/window.blp b/src/window.blp
@@ -414,7 +414,9 @@ Adw.ApplicationWindow window {
 
                 child: Adw.StatusPage {
                   title: _("Windowed Preview");
-                  description: _("This interface can only be previewed as a separate window.\nWe recommend using “Always on Top”.");
+                  description: _(
+                    "This interface can only be previewed as a separate window.\nWe recommend using “Always on Top”."
+                  );
                   icon-name: "re.sonny.Workbench-multitasking-windows-symbolic";
 
                   Box {
@@ -437,7 +439,9 @@ Adw.ApplicationWindow window {
 
                 child: Adw.StatusPage {
                   title: _("Windowed Preview");
-                  description: _("This interface can only be previewed as a separate window.\nWe recommend using “Always on Top”.");
+                  description: _(
+                    "This interface can only be previewed as a separate window.\nWe recommend using “Always on Top”."
+                  );
                   icon-name: "re.sonny.Workbench-multitasking-windows-symbolic";
 
                   Box {
@@ -649,7 +653,7 @@ menu menu_app {
         item {
           label: _("Blueprint");
           action: "app.open_uri";
-          target: "https://gnome.pages.gitlab.gnome.org/blueprint-compiler/";
+          target: "https://gnome.pages.gitlab.gnome.org/blueprint-compiler";
         }
       }
 
diff --git a/src/window.js b/src/window.js
@@ -34,7 +34,11 @@ import {
   isTypeScriptEnabled,
   isValaAvailable,
 } from "./Extensions/Extensions.js";
-import { Permissions } from "./Permissions/Permissions.js";
+import {
+  hasNetworkPermission,
+  Permissions,
+  showPermissionsDialog,
+} from "./Permissions/Permissions.js";
 import { JavaScriptDocument } from "./langs/javascript/JavaScriptDocument.js";
 import { BlueprintDocument } from "./langs/blueprint/BlueprintDocument.js";
 import { CssDocument } from "./langs/css/CssDocument.js";
@@ -328,6 +332,10 @@ export default function Window({ application, session }) {
       }
     } else if (language === "Rust") {
       compiler_rust = compiler_rust || RustCompiler({ session });
+      // Rust needs cargo to download dependencies
+      if (!hasNetworkPermission()) {
+        return showPermissionsDialog({ window });
+      }
       const success = await compiler_rust.compile();
       if (success) {
         await previewer.useExternal("rust");
@@ -483,15 +491,15 @@ async function onCloseSession({ session, window }) {
   }
 
   if (!session.settings.get_boolean("edited")) {
-    await deleteSession(session);
+    await deleteSession(session).catch(console.error);
     return close(window);
   }
 
   const [response, location] = await promptSessionClose({ window });
   if (response === "cancel") return;
 
   if (response === "discard") {
-    await deleteSession(session);
+    await deleteSession(session).catch(console.error);
   } else if (response === "save") {
     await saveSessionAsProject(session, location);
   }
diff --git a/troll b/troll
@@ -1 +1 @@
-Subproject commit 8b0275948eedec9ed0378f9bdda1aa4aac3062ba
+Subproject commit 37b53b29db0b6496f31e13c7f843100db31c9eb1

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@`
`5`	`5`	`"sources": [`
`6`	`6`	`{`
`7`	`7`	`"type": "archive",`
`8`		`- "url": "https://download.gnome.org/sources/gom/0.5/gom-0.5.4.tar.xz",`
`9`		`- "sha256": "57ba806fe080a937d5664178d21bad7653b2c561ea128187a7b10bc1762b7f65"`
	`8`	`+ "url": "https://download.gnome.org/sources/gom/0.5/gom-0.5.6.tar.xz",`
	`9`	`+ "sha256": "4d7a5e268698c8e7e40603e36e9e3a2b76133931ce1b637c1136301491b54cc3"`
`10`	`10`	`}`
`11`	`11`	`]`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,32 +5,20 @@`
`5`	`5`	`"sources": [`
`6`	`6`	`{`
`7`	`7`	`"type": "archive",`
`8`		`- "url": "https://download.gnome.org/sources/libshumate/1.5/libshumate-1.5.1.tar.xz",`
`9`		`- "sha256": "daadf8b700134388c7e933e0b623586aaa7f2fbe8b3a6259387513303b9876e6"`
	`8`	`+ "url": "https://download.gnome.org/sources/libshumate/1.6/libshumate-1.6.1.tar.xz",`
	`9`	`+ "sha256": "b36aad34500791785f546684d0f2ed644e4819ff4e85ae67a2245f159eccb2d4"`
`10`	`10`	`}`
`11`	`11`	`],`
`12`	`12`	`"modules": [`
`13`		`- {`
`14`		`- "name": "protobuf",`
`15`		`- "buildsystem": "autotools",`
`16`		`- "config-opts": ["DIST_LANG=cpp"],`
`17`		`- "cleanup": ["/bin/protoc", "/lib/libprotoc", "/lib/libprotobuf-lite*"],`
`18`		`- "sources": [`
`19`		`- {`
`20`		`- "type": "archive",`
`21`		`- "url": "https://github.com/protocolbuffers/protobuf/releases/download/v3.17.3/protobuf-all-3.17.3.tar.gz",`
`22`		`- "sha256": "77ad26d3f65222fd96ccc18b055632b0bfedf295cb748b712a98ba1ac0b704b2"`
`23`		`- }`
`24`		`- ]`
`25`		`- },`
`26`	`13`	`{`
`27`	`14`	`"name": "protobuf-c",`
`28`	`15`	`"buildsystem": "autotools",`
	`16`	`+ "config-opts": ["--disable-protoc"],`
`29`	`17`	`"sources": [`
`30`	`18`	`{`
`31`	`19`	`"type": "archive",`
`32`		`- "url": "https://github.com/protobuf-c/protobuf-c/releases/download/v1.4.0/protobuf-c-1.4.0.tar.gz",`
`33`		`- "sha256": "26d98ee9bf18a6eba0d3f855ddec31dbe857667d269bc0b6017335572f85bbcb"`
	`20`	`+ "url": "https://github.com/protobuf-c/protobuf-c/releases/download/v1.5.2/protobuf-c-1.5.2.tar.gz",`
	`21`	`+ "sha256": "e2c86271873a79c92b58fef7ebf8de1aa0df4738347a8bd5d4e65a80a16d0d24"`
`34`	`22`	`}`
`35`	`23`	`]`
`36`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`"buildsystem": "meson",`
`4`	`4`	`"config-opts": [`
`5`	`5`	`"--libdir=/app/lib",`
	`6`	`+ "-Dapp=false",`
`6`	`7`	`"-Ddocs=false",`
`7`	`8`	`"-Dgtk3=false",`
`8`	`9`	`"-Dgtk4=true",`
`@@ -12,8 +13,8 @@`
`12`	`13`	`"sources": [`
`13`	`14`	`{`
`14`	`15`	`"type": "archive",`
`15`		`- "url": "https://download.gnome.org/sources/vte/0.82/vte-0.82.1.tar.xz",`
`16`		`- "sha256": "79376d70402d271e2d38424418e1aea72357934d272e321e3906b71706a78e3a"`
	`16`	`+ "url": "https://download.gnome.org/sources/vte/0.84/vte-0.84.0.tar.xz",`
	`17`	`+ "sha256": "0414e31583836aeb7878da25f67c515f7e8879917ecc37c92e26b83e8d8fc3e3"`
`17`	`18`	`}`
`18`	`19`	`],`
`19`	`20`	`"modules": [`
`@@ -23,8 +24,8 @@`
`23`	`24`	`"sources": [`
`24`	`25`	`{`
`25`	`26`	`"type": "archive",`
`26`		`- "url": "https://github.com/fastfloat/fast_float/archive/refs/tags/v6.1.6.tar.gz",`
`27`		`- "sha256": "4458aae4b0eb55717968edda42987cabf5f7fc737aee8fede87a70035dba9ab0"`
	`27`	`+ "url": "https://github.com/fastfloat/fast_float/archive/refs/tags/v8.2.5.tar.gz",`
	`28`	`+ "sha256": "17c7fb14499fcf42c3f5d143df0fbe22172e92749ec5f75ef13224005421a654"`
`28`	`29`	`}`
`29`	`30`	`]`
`30`	`31`	`}`