From f6651ea940cf69725d135fa3fe2319db4c2bd47c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Corentin=20No=C3=ABl?= <corentin@elementary.io>
Date: Thu, 22 Apr 2021 00:37:42 +0200
Subject: [PATCH 1/2] Make elementary themes the default fallback

---
 gtk-default-themes.patch | 15 +++++++++++++
 io.elementary.Sdk.json   | 48 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+)
 create mode 100644 gtk-default-themes.patch

diff --git a/gtk-default-themes.patch b/gtk-default-themes.patch
new file mode 100644
index 0000000..c09e4f3
--- /dev/null
+++ b/gtk-default-themes.patch
@@ -0,0 +1,15 @@
+diff --git a/gtk/gtksettingsprivate.h b/gtk/gtksettingsprivate.h
+index 47f75a6297..fd822c630a 100644
+--- a/gtk/gtksettingsprivate.h
++++ b/gtk/gtksettingsprivate.h
+@@ -23,8 +23,8 @@
+ 
+ G_BEGIN_DECLS
+ 
+-#define DEFAULT_THEME_NAME      "Adwaita"
+-#define DEFAULT_ICON_THEME      "Adwaita"
++#define DEFAULT_THEME_NAME      "io.elementary.stylesheet.blueberry"
++#define DEFAULT_ICON_THEME      "elementary"
+ 
+ void                _gtk_settings_set_property_value_from_rc (GtkSettings            *settings,
+                                                               const gchar            *name,
diff --git a/io.elementary.Sdk.json b/io.elementary.Sdk.json
index 16bbbef..50fb06b 100644
--- a/io.elementary.Sdk.json
+++ b/io.elementary.Sdk.json
@@ -41,6 +41,32 @@
         }
     },
     "modules": [
+         {
+            "name": "gtk",
+            "buildsystem": "meson",
+            "config-opts": [
+                "-Dbroadway_backend=true",
+                "-Dinstalled_tests=true",
+                "-Dtests=false",
+                "-Dx11_backend=true",
+                "-Dwayland-backend=true",
+                "-Dgtk_doc=true",
+                "-Dman=true",
+                "-Dintrospection=true",
+                "-Dtracker3=true"
+            ],
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://gitlab.gnome.org/GNOME/gtk.git",
+                    "tag": "3.24.28"
+                },
+                {
+                    "type": "patch",
+                    "path": "gtk-default-themes.patch"
+                }
+            ]
+        },
          {
             "name": "icons",
             "buildsystem": "meson",
@@ -183,6 +209,28 @@
                     "tag": "1.2.0"
                 }
             ]
+        },
+        {
+            "name" : "platform-settings",
+            "buildsystem" : "simple",
+            "modules": [
+                {
+                    "name" : "default-gtk-settings",
+                    "buildsystem" : "simple",
+                    "sources" : [
+                        {
+                            "type": "git",
+                            "url": "https://github.com/elementary/default-settings.git"
+                        }
+                    ],
+                    "build-commands": [
+                        "install -Dm644 gtk/settings.ini /etc/gtk-3.0/settings.ini"
+                    ]
+                }
+            ],
+            "build-commands": [
+                "ln -S /usr/share/themes/io.elementary.stylesheet.blueberry /usr/share/themes/elementary"
+            ]
         }
     ]
 }

From 133ef808dcdcf85bba4d398774da44c6fd7f0058 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danielle=20For=C3=A9?= <daniel@elementary.io>
Date: Sun, 5 Dec 2021 08:52:35 -0800
Subject: [PATCH 2/2] Update io.elementary.Sdk.json

---
 io.elementary.Sdk.json | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/io.elementary.Sdk.json b/io.elementary.Sdk.json
index 227c0ef..9da6e44 100644
--- a/io.elementary.Sdk.json
+++ b/io.elementary.Sdk.json
@@ -217,28 +217,6 @@
                     "path": "."
                 }
             ]
-        },
-        {
-            "name" : "platform-settings",
-            "buildsystem" : "simple",
-            "modules": [
-                {
-                    "name" : "default-gtk-settings",
-                    "buildsystem" : "simple",
-                    "sources" : [
-                        {
-                            "type": "git",
-                            "url": "https://github.com/elementary/default-settings.git"
-                        }
-                    ],
-                    "build-commands": [
-                        "install -Dm644 gtk/settings.ini /etc/gtk-3.0/settings.ini"
-                    ]
-                }
-            ],
-            "build-commands": [
-                "ln -S /usr/share/themes/io.elementary.stylesheet.blueberry /usr/share/themes/elementary"
-            ]
         }
     ]
 }