From ddbd8c45217b667da5ede86bb44257e6f3ad7f0b Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Wed, 4 Jun 2025 23:55:02 -0400 Subject: [PATCH 1/5] Flatpak: Add manifest --- .github/workflows/flatpak-x-checker.yml | 22 ++++++ .../build-aux/io.elementary.granite.demo.yaml | 72 +++++++++++++++++++ 2 files changed, 94 insertions(+) create mode 100644 .github/workflows/flatpak-x-checker.yml create mode 100644 demo/build-aux/io.elementary.granite.demo.yaml diff --git a/.github/workflows/flatpak-x-checker.yml b/.github/workflows/flatpak-x-checker.yml new file mode 100644 index 000000000..ece04da6f --- /dev/null +++ b/.github/workflows/flatpak-x-checker.yml @@ -0,0 +1,22 @@ +name: Check for updates +on: + schedule: # for scheduling to work this file must be in the default branch + - cron: "0 0 * * 1" # run weekly + workflow_dispatch: # can be manually dispatched under GitHub's "Actions" tab + +jobs: + flatpak-external-data-checker: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v7 + - uses: docker://ghcr.io/flathub/flatpak-external-data-checker:latest + env: + GIT_AUTHOR_NAME: elementaryBot + GIT_COMMITTER_NAME: elementaryBot + GIT_AUTHOR_EMAIL: builds@elementary.io + GIT_COMMITTER_EMAIL: builds@elementary.io + EMAIL: builds@elementary.io + GITHUB_TOKEN: ${{ secrets.GIT_USER_TOKEN }} + with: + args: --update --never-fork demo/build-aux/io.elementary.granite.yaml diff --git a/demo/build-aux/io.elementary.granite.demo.yaml b/demo/build-aux/io.elementary.granite.demo.yaml new file mode 100644 index 000000000..22c16b979 --- /dev/null +++ b/demo/build-aux/io.elementary.granite.demo.yaml @@ -0,0 +1,72 @@ +id: io.elementary.granite.demo +runtime: io.elementary.Platform +runtime-version: daily +sdk: io.elementary.Sdk +command: granite-9-demo +tags: + - devel +desktop-file-name-suffix: ' (Development)' +finish-args: + - --share=ipc + - --socket=fallback-x11 + - --socket=wayland + - --device=dri +cleanup: + - /include + - /lib/pkgconfig + - /share/pkgconfig + - /share/aclocal + - /man + - /share/man + - /share/gtk-doc + - /share/vala + - '*.la' + - '*.a' + - '*.pyc' + - '*.pyo' +modules: + - name: libsass + buildsystem: meson + sources: + - type: git + url: https://github.com/lazka/libsass.git + branch: meson + commit: aac79dccd3c8f7e8f22125f87a119f3b1ee9d487 + - name: sassc + buildsystem: meson + sources: + - type: git + url: https://github.com/lazka/sassc.git + branch: meson + commit: a1950c2d95ea4c051feb90bb1f43559fbb54bf36 + - name: protobuf-c + buildsystem: autotools + config-opts: + - --disable-protoc + sources: + - type: git + url: https://github.com/protobuf-c/protobuf-c.git + tag: v1.5.2 + commit: 4719fdd7760624388c2c5b9d6759eb6a47490626 + x-checker-data: + type: git + tag-pattern: ^v([\d.]+)$ + - name: libshumate + buildsystem: meson + config-opts: + - -Dgtk_doc=false + sources: + - type: git + url: https://gitlab.gnome.org/GNOME/libshumate.git + tag: 1.7.0 + commit: e345c805a0dfc46cdbff46cac287b0b60a386f36 + x-checker-data: + type: git + tag-pattern: ^([\d.]+)$ + - name: demo + config-opts: + - --libdir=lib + buildsystem: meson + sources: + - type: dir + path: ../.. From c1b53cb9ec4cde43713e3d02bbd0e6bb572a692d Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Thu, 5 Jun 2025 13:50:55 -0400 Subject: [PATCH 2/5] Demo: Include header as an input source This is needed to use the repo's generated library, rather than the system's. --- demo/meson.build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/demo/meson.build b/demo/meson.build index 19312fcb2..a75bd8d69 100644 --- a/demo/meson.build +++ b/demo/meson.build @@ -25,6 +25,8 @@ executable( 'Views/VideoView.vala', 'Views/WelcomeView.vala', + libgranite.vala_header(), + dependencies: [ libgranite_dep, dependency('shumate-1.0') From fe53ce03ce429b08eec020f441ceff84c4e3031b Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Thu, 5 Jun 2025 13:52:56 -0400 Subject: [PATCH 3/5] Demo: Initialize Graphite after initializing dependencies --- demo/GraniteDemo.vala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/demo/GraniteDemo.vala b/demo/GraniteDemo.vala index 6c868c733..cc54a0445 100644 --- a/demo/GraniteDemo.vala +++ b/demo/GraniteDemo.vala @@ -10,8 +10,9 @@ public class Granite.Demo : Gtk.Application { } public override void startup () { - Granite.init (); base.startup (); + // Parent classes need to be initialized before the child. + Granite.init (); } public override void activate () { From 5253a747679eab9547454b8fb7c6f4a4999298d8 Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Wed, 9 Jul 2025 20:08:43 -0400 Subject: [PATCH 4/5] Build: Depend on meson 1.10.0 and onward --- README.md | 2 +- meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b05f7b50b..00aed61e3 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ built for elementary OS. ## Building, Testing, and Installation You'll need the following dependencies: -* meson >= 0.57.0 +* meson >= 1.10.0 * gobject-introspection * gettext * libgee-0.8-dev diff --git a/meson.build b/meson.build index 61c75e353..dc1b3e5e9 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project( 'granite-9', 'vala', 'c', - meson_version: '>= 0.57.0', + meson_version: '>= 1.10.0', version: '9.0.0' ) From 713fec6c5dea9c6966946385a58955d51f569529 Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Wed, 23 Sep 2026 07:20:36 -0400 Subject: [PATCH 5/5] Demo: Set application ID to "io.elementary.granite.demo" --- demo/GraniteDemo.vala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/GraniteDemo.vala b/demo/GraniteDemo.vala index cc54a0445..3f6c8e929 100644 --- a/demo/GraniteDemo.vala +++ b/demo/GraniteDemo.vala @@ -5,7 +5,7 @@ public class Granite.Demo : Gtk.Application { construct { - application_id = "io.elementary.granite-9.demo"; + application_id = "io.elementary.granite.demo"; flags = ApplicationFlags.FLAGS_NONE; }