From b82a618b13554fb353e8d85007d15469cd8127b6 Mon Sep 17 00:00:00 2001
From: Tom Greig <tag2y19@soton.ac.uk>
Date: Mon, 17 Mar 2025 10:30:32 +0000
Subject: [PATCH] Remove adwaita. We were only using Gtk anyway.
---
configure.sh | 2 +-
inc/app.h | 4 ++--
src/app.c | 4 ++--
src/main.c | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/configure.sh b/configure.sh
index 81ad84d..28e0371 100755
--- a/configure.sh
+++ b/configure.sh
@@ -25,7 +25,7 @@ fi
eval set -- "$ARGS";
zero="$0";
-PKGS="gtk4 libadwaita-1 librsvg-2.0"
+PKGS="gtk4 librsvg-2.0"
while true; do
diff --git a/inc/app.h b/inc/app.h
index 7397139..efc75b1 100644
--- a/inc/app.h
+++ b/inc/app.h
@@ -5,11 +5,11 @@
extern "C" {
#endif
-#include <adwaita.h>
+#include <gtk/gtk.h>
#define GAME_APP_TYPE ( game_app_get_type() )
G_DECLARE_FINAL_TYPE(
- GameApp, game_app, GAME, APP, AdwApplication );
+ GameApp, game_app, GAME, APP, GtkApplication );
GameApp* game_app_new();
void game_app_button_press( GameApp* app, int pin );
diff --git a/src/app.c b/src/app.c
index 8e4dfe7..d93a6ba 100644
--- a/src/app.c
+++ b/src/app.c
@@ -7,13 +7,13 @@
struct _GameApp {
- AdwApplication parent;
+ GtkApplication parent;
GameWindow* window;
};
-G_DEFINE_TYPE( GameApp, game_app, ADW_TYPE_APPLICATION );
+G_DEFINE_TYPE( GameApp, game_app, GTK_TYPE_APPLICATION );
/* PROTOTYPES!!! */
diff --git a/src/main.c b/src/main.c
index c1d6d93..2205169 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2,7 +2,7 @@
#include "pins.h"
-#include <adwaita.h>
+#include <gtk/gtk.h>
#include <stdio.h>
#ifndef NO_WIRINGPI
#include <wiringPi.h>
--
GitLab