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 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/modules/gom.json b/build-aux/modules/gom.json index a95970ed0..ec35f92d6 100644 --- 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 index 33b1a8aac..26fc883a0 100644 --- 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 index 5e2c958e0..6b8b3847c 100644 --- 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 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..e9eac2d64 100644 --- a/data/app.metainfo.xml +++ b/data/app.metainfo.xml @@ -43,6 +43,25 @@ + + +
    +
  • Use GNOME 50
    • +
  • Fix runnng Rust projects
    • +
+

Library:

+
    +
  • Correct network permission check
    • +
+

Dependencies:

+
    +
  • Update libshumate to 1.6.1
    • +
  • Update vte to 0.84.0
    • +
  • Update gom to 0.5.6
    • +
+ + +
    diff --git a/demos b/demos index 5efa50c46..b74e83e57 160000 --- a/demos +++ b/demos @@ -1 +1 @@ -Subproject commit 5efa50c4692da433fdd9ce696b329ebcea03fb1b +Subproject commit b74e83e5759e4c1aaa9f61d3400a83ca94d82a01 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/Library/Library.blp b/src/Library/Library.blp index 0fba3c33b..59913f75a 100644 --- 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 can be used freely under the terms of CC0 1.0"); + label: _( + "All examples are dedicated to the public domain\nand can be used freely under the terms of CC0 1.0" + ); use-markup: true; styles [ diff --git a/src/PanelUI.js b/src/PanelUI.js index 3161b579a..b123c3c69 100644 --- 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://jwestman.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 index 7ce97b23b..6dfd2f1b9 100644 --- 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/cli/blueprint.js b/src/cli/blueprint.js index 8da9964a3..42de8e31d 100644 --- 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: ", - // https://gitlab.gnome.org/jwestman/blueprint-compiler/-/issues/139 + // https://gitlab.gnome.org/GNOME/blueprint-compiler/-/work_items/139 "unsupported XML tag: ", ].includes(err.message) ) { 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; + } +} diff --git a/src/window.blp b/src/window.blp index 80a85c65d..2857a2826 100644 --- 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://gitlab.gnome.org/jwestman/blueprint-compiler"; + target: "https://gnome.pages.gitlab.gnome.org/blueprint-compiler"; } } diff --git a/troll b/troll index 8b0275948..438252e82 160000 --- a/troll +++ b/troll @@ -1 +1 @@ -Subproject commit 8b0275948eedec9ed0378f9bdda1aa4aac3062ba +Subproject commit 438252e827f80f93d4385baa3e956390e3ddb04f