From 11684ec77bafbbec9c7036daed4c3263463a759d Mon Sep 17 00:00:00 2001
From: Hari Rana <theevilskeleton@riseup.net>
Date: Wed, 4 Jun 2025 23:55:02 -0400
Subject: [PATCH 1/4] Flatpak: Add manifest

---
 demo/io.elementary.granite.demo.json | 102 +++++++++++++++++++++++++++
 1 file changed, 102 insertions(+)
 create mode 100644 demo/io.elementary.granite.demo.json

diff --git a/demo/io.elementary.granite.demo.json b/demo/io.elementary.granite.demo.json
new file mode 100644
index 000000000..e65bc8198
--- /dev/null
+++ b/demo/io.elementary.granite.demo.json
@@ -0,0 +1,102 @@
+{
+    "id" : "io.elementary.granite.demo",
+    "runtime" : "io.elementary.Platform",
+    "runtime-version" : "daily",
+    "sdk" : "io.elementary.Sdk",
+    "command" : "granite-7-demo",
+    "tags" : [
+        "devel"
+    ],
+    "desktop-file-name-suffix" : " (Development)",
+    "finish-args" : [
+        "--share=ipc",
+        "--socket=fallback-x11",
+        "--socket=wayland",
+        "--share=network",
+        "--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"
+                }
+            ]
+        },
+        {
+            "name" : "libshumate",
+            "buildsystem" : "meson",
+            "config-opts" : [
+                "-Dgtk_doc=false"
+            ],
+            "sources" : [
+                {
+                    "type" : "git",
+                    "url" : "https://gitlab.gnome.org/GNOME/libshumate.git",
+                    "tag" : "1.4.0",
+                    "commit" : "06021e35f0d479612fb1a3af91a73ba562175e03"
+                }
+            ]
+        },
+        {
+            "name" : "demo",
+            "config-opts" : [
+                "--libdir=lib",
+                "-Dgtk-stylesheets=true"
+            ],
+            "buildsystem" : "meson",
+            "sources" : [
+                {
+                    "type" : "dir",
+                    "path" : ".."
+                }
+            ]
+        }
+    ]
+}

From 05fa7678276aed83c122cba319eff358a6bddb97 Mon Sep 17 00:00:00 2001
From: Hari Rana <theevilskeleton@riseup.net>
Date: Thu, 5 Jun 2025 13:50:55 -0400
Subject: [PATCH 2/4] 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 c1394e46f..4058048ef 100644
--- a/demo/meson.build
+++ b/demo/meson.build
@@ -26,6 +26,8 @@ executable(
     'Views/VideoView.vala',
     'Views/WelcomeView.vala',
 
+    libgranite.vala_header(),
+
     dependencies: [
         libgranite_dep,
         dependency('shumate-1.0')

From 01824b46d8353f7d8fb24525c0afa4493fb99ac0 Mon Sep 17 00:00:00 2001
From: Hari Rana <theevilskeleton@riseup.net>
Date: Thu, 5 Jun 2025 13:52:56 -0400
Subject: [PATCH 3/4] 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 f1d95ad73..59c52a994 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 98c0bb67e8e10ea598f24606e2671ffc68a811e1 Mon Sep 17 00:00:00 2001
From: Hari Rana <theevilskeleton@riseup.net>
Date: Wed, 9 Jul 2025 20:08:43 -0400
Subject: [PATCH 4/4] Build: Depend on meson 1.9.0 and onward

---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 0d2e9212c..daa6781c1 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 project(
     'granite-7',
     'vala', 'c',
-    meson_version: '>= 0.57.0',
+    meson_version: '>= 1.9.0',
     version: '7.7.0'
 )