Switch back devel to 46 again

.github/workflows/CI.yaml

@@ -22,8 +22,7 @@ jobs:
 
       - name: Install host dependencies
         run: |
-          sudo apt-get update
-          sudo apt-get install flatpak mutter
+          sudo apt-get install flatpak mutter flatpak-builder
 
       # Restore caches
       - name: Restore Flatpak dependencies

.github/workflows/deploy.yaml

@@ -16,12 +16,14 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
+
       - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
         name: "Build"
         with:
           bundle: re.sonny.Workbench.Devel.flatpak
           manifest-path: build-aux/re.sonny.Workbench.Devel.json
           cache-key: flatpak-builder-${{ github.sha }}
+
       - uses: flatpak/flatpak-github-actions/flat-manager@v6
         name: "Deploy"
         with:

Makefile

@@ -5,19 +5,22 @@ 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//46 org.flatpak.Builder org.freedesktop.Sdk.Extension.rust-stable//23.08 org.freedesktop.Sdk.Extension.vala//23.08 org.freedesktop.Sdk.Extension.llvm18//23.08 org.freedesktop.Sdk.Extension.node20//23.08 org.freedesktop.Sdk.Extension.typescript//23.08
-	flatpak remote-add --user --if-not-exists flathub-beta https://flathub.org/beta-repo/flathub-beta.flatpakrepo
-	flatpak install --or-update --user --noninteractive flathub-beta org.freedesktop.Sdk.Extension.rust-stable//24.08beta org.freedesktop.Sdk.Extension.vala//24.08beta org.freedesktop.Sdk.Extension.llvm18//24.08beta org.freedesktop.Sdk.Extension.node20//24.08beta org.freedesktop.Sdk.Extension.typescript//24.08beta
-	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
+# flatpak remote-add --user --if-not-exists flathub-beta https://flathub.org/beta-repo/flathub-beta.flatpakrepo
+# flatpak install --or-update --user --noninteractive flathub-beta org.freedesktop.Sdk.Extension.rust-stable//24.08beta org.freedesktop.Sdk.Extension.vala//24.08beta org.freedesktop.Sdk.Extension.llvm18//24.08beta org.freedesktop.Sdk.Extension.node20//24.08beta org.freedesktop.Sdk.Extension.typescript//24.08beta
+# 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
 	git submodule update --init
 	npm install --no-fund
 	@echo "✅ You can use "make build" to build Workbench"
 
 stable:
-	flatpak run org.flatpak.Builder --delete-build-dirs --disable-updates --build-only --ccache --force-clean flatpak build-aux/re.sonny.Workbench.json
+# flatpak --user run org.flatpak.Builder --delete-build-dirs --disable-updates --build-only --ccache --force-clean flatpak build-aux/re.sonny.Workbench.json
+	flatpak-builder --delete-build-dirs --disable-updates --build-only --ccache --force-clean flatpak build-aux/re.sonny.Workbench.json
 
 devel:
-	flatpak run org.flatpak.Builder --delete-build-dirs --disable-updates --build-only --ccache --force-clean flatpak build-aux/re.sonny.Workbench.Devel.json
+# flatpak --user run org.flatpak.Builder --delete-build-dirs --disable-updates --build-only --ccache --force-clean flatpak build-aux/re.sonny.Workbench.Devel.json
+	flatpak-builder --delete-build-dirs --disable-updates --build-only --ccache --force-clean flatpak build-aux/re.sonny.Workbench.Devel.json
+
 
 build: devel
 

build-aux/library.js

@@ -218,10 +218,10 @@ async function copyDirectory(source, destination) {
   }
 }
 
-const keyFile = new GLib.KeyFile();
-keyFile.load_from_file("/.flatpak-info", GLib.KeyFileFlags.NONE);
+const key_file = new GLib.KeyFile();
+key_file.load_from_file("/.flatpak-info", GLib.KeyFileFlags.NONE);
 // runtime/org.gnome.Sdk/x86_64/master
-const [, , , runtime_version] = keyFile
+const [, , , runtime_version] = key_file
   .get_string("Application", "runtime")
   .split("/");
 
@@ -236,8 +236,6 @@ function isDemoCompatible(demo) {
     return true;
   }
 
-  console.log(+runtime_version, +demo_runtime_version);
-
   return +runtime_version >= +demo_runtime_version;
 }
 

build-aux/modules/libshumate.json

@@ -5,8 +5,8 @@
   "sources": [
     {
       "type": "archive",
-      "url": "https://download.gnome.org/sources/libshumate/1.3/libshumate-1.3.alpha.tar.xz",
-      "sha256": "e23005a63342471c37dcfa104341c5a9b96a10255beb52a87f9e994ff0f99312"
+      "url": "https://download.gnome.org/sources/libshumate/1.2/libshumate-1.2.2.tar.xz",
+      "sha256": "6f587579f7f2d60b38d3f4727eb1a8d2feac9cbdc018e53ff5f772a8608fa44b"
     }
   ],
   "modules": [
@@ -29,8 +29,8 @@
       "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.0/protobuf-c-1.5.0.tar.gz",
+          "sha256": "7b404c63361ed35b3667aec75cc37b54298d56dd2bcf369de3373212cc06fd98"
         }
       ]
     }

build-aux/modules/vte.json

@@ -10,8 +10,9 @@
   ],
   "sources": [
     {
-      "type": "git",
-      "url": "https://gitlab.gnome.org/GNOME/vte.git"
+      "type": "archive",
+      "url": "https://download.gnome.org/sources/vte/0.76/vte-0.76.2.tar.xz",
+      "sha256": "e3dc6082d5bd70f8aafaaad2cdfcaf7e51da6ba00a919b11ddac6efa09c72847"
     }
   ]
 }

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": "master",
+  "runtime-version": "46",
   "sdk": "org.gnome.Sdk",
   "sdk-extensions": [
     "org.freedesktop.Sdk.Extension.vala",

data/meson.build

@@ -24,9 +24,11 @@ appstream_file = configure_file(
   install_dir: join_paths(get_option('datadir'), 'metainfo')
 )
 
-appstream_cli = find_program('appstreamcli', required: true)
-test('Validate metainfo file', appstream_cli,
-  args: ['validate', '--override=release-time-missing=info', '--no-net', '--explain', appstream_file]
+appstreamcli = find_program('appstreamcli', required: false)
+test(
+  'Validate appstream file',
+  appstreamcli,
+  args: ['validate', '--no-net', '--explain', appstream_file],
 )
 
 configure_file(