[libadwaita/wip/cdavis/final-types: 2/2] general: Depend on glib 2.66 for now

[Alexander Mikhaylenko <alexm src gnome org>]

commit a289f089b6e427d4744ac78ee819d7914caf4465
Author: Alexander Mikhaylenko <alexander mikhaylenko puri sm>
Date:   Tue Nov 9 04:12:31 2021 +0500

    general: Depend on glib 2.66 for now
    
    It's not critical to depend on 2.70 right now, and it can cause problems:
    even some of our CI images don't have 2.70 yet.
    
    Instead, define G_DEFINE_FINAL_TYPE and G_DEFINE_FINAL_TYPE_WITH_CODE for
    older glib versions, so we can use the newer macros when available.
    
    This should be good enough for now, later if we decide to bump the version
    this can be reverted.

 src/adw-animation.c                | 2 +-
 src/adw-avatar.c                   | 2 ++
 src/adw-button-content.c           | 1 +
 src/adw-carousel-indicator-dots.c  | 1 +
 src/adw-carousel-indicator-lines.c | 1 +
 src/adw-carousel.c                 | 1 +
 src/adw-clamp-layout.c             | 1 +
 src/adw-clamp-scrollable.c         | 1 +
 src/adw-clamp.c                    | 1 +
 src/adw-enum-list-model.c          | 2 ++
 src/adw-fading-label.c             | 1 +
 src/adw-flap.c                     | 1 +
 src/adw-gizmo.c                    | 1 +
 src/adw-indicator-bin.c            | 1 +
 src/adw-leaflet.c                  | 1 +
 src/adw-macros-private.h           | 5 +++++
 src/adw-settings.c                 | 2 ++
 src/adw-shadow-helper.c            | 1 +
 src/adw-split-button.c             | 1 +
 src/adw-squeezer.c                 | 1 +
 src/adw-status-page.c              | 1 +
 src/adw-style-manager.c            | 1 +
 src/adw-swipe-tracker.c            | 1 +
 src/adw-tab-bar.c                  | 1 +
 src/adw-tab-box.c                  | 1 +
 src/adw-tab-view.c                 | 1 +
 src/adw-tab.c                      | 1 +
 src/adw-toast-overlay.c            | 1 +
 src/adw-toast-widget.c             | 2 ++
 src/adw-toast.c                    | 2 ++
 src/adw-view-switcher-bar.c        | 1 +
 src/adw-view-switcher-button.c     | 1 +
 src/adw-view-switcher-title.c      | 1 +
 src/adw-view-switcher.c            | 1 +
 src/adw-window-mixin.c             | 1 +
 src/adw-window-title.c             | 3 ++-
 src/inspector/adw-inspector-page.c | 1 +
 src/meson.build                    | 2 +-
 38 files changed, 48 insertions(+), 3 deletions(-)
---
diff --git a/src/adw-animation.c b/src/adw-animation.c
index 899f3579..22b200a8 100644
--- a/src/adw-animation.c
+++ b/src/adw-animation.c
@@ -9,7 +9,7 @@
 
 #include "adw-animation-util-private.h"
 #include "adw-animation-private.h"
-
+#include "adw-macros-private.h"
 
 typedef struct
 {
diff --git a/src/adw-avatar.c b/src/adw-avatar.c
index d6b30208..9d329fee 100644
--- a/src/adw-avatar.c
+++ b/src/adw-avatar.c
@@ -15,8 +15,10 @@
 
 #include "adw-avatar.h"
 #include "adw-gizmo-private.h"
+#include "adw-macros-private.h"
 
 #define NUMBER_OF_COLORS 14
+
 /**
  * AdwAvatar:
  *
diff --git a/src/adw-button-content.c b/src/adw-button-content.c
index 5547697a..cbe4ea98 100644
--- a/src/adw-button-content.c
+++ b/src/adw-button-content.c
@@ -9,6 +9,7 @@
 #include "config.h"
 #include "adw-button-content.h"
 
+#include "adw-macros-private.h"
 #include "adw-split-button.h"
 
 /**
diff --git a/src/adw-carousel-indicator-dots.c b/src/adw-carousel-indicator-dots.c
index d2f7929f..b886f9dc 100644
--- a/src/adw-carousel-indicator-dots.c
+++ b/src/adw-carousel-indicator-dots.c
@@ -10,6 +10,7 @@
 
 #include "adw-animation-util-private.h"
 #include "adw-animation-private.h"
+#include "adw-macros-private.h"
 #include "adw-swipeable.h"
 
 #include <math.h>
diff --git a/src/adw-carousel-indicator-lines.c b/src/adw-carousel-indicator-lines.c
index 9b64e919..2f6a3938 100644
--- a/src/adw-carousel-indicator-lines.c
+++ b/src/adw-carousel-indicator-lines.c
@@ -9,6 +9,7 @@
 #include "adw-carousel-indicator-lines.h"
 
 #include "adw-animation-private.h"
+#include "adw-macros-private.h"
 #include "adw-swipeable.h"
 
 #include <math.h>
diff --git a/src/adw-carousel.c b/src/adw-carousel.c
index 1af57bb0..4bb82b41 100644
--- a/src/adw-carousel.c
+++ b/src/adw-carousel.c
@@ -10,6 +10,7 @@
 
 #include "adw-animation-util-private.h"
 #include "adw-animation-private.h"
+#include "adw-macros-private.h"
 #include "adw-navigation-direction.h"
 #include "adw-swipe-tracker.h"
 #include "adw-swipeable.h"
diff --git a/src/adw-clamp-layout.c b/src/adw-clamp-layout.c
index 51a51a71..0a1833de 100644
--- a/src/adw-clamp-layout.c
+++ b/src/adw-clamp-layout.c
@@ -11,6 +11,7 @@
 
 #include "adw-animation-util.h"
 #include "adw-animation-private.h"
+#include "adw-macros-private.h"
 
 /**
  * AdwClampLayout:
diff --git a/src/adw-clamp-scrollable.c b/src/adw-clamp-scrollable.c
index 9663d3b0..0f0ff9b4 100644
--- a/src/adw-clamp-scrollable.c
+++ b/src/adw-clamp-scrollable.c
@@ -8,6 +8,7 @@
 #include "adw-clamp-scrollable.h"
 
 #include "adw-clamp-layout.h"
+#include "adw-macros-private.h"
 #include "adw-widget-utils-private.h"
 
 /**
diff --git a/src/adw-clamp.c b/src/adw-clamp.c
index cdcafac2..7a40544b 100644
--- a/src/adw-clamp.c
+++ b/src/adw-clamp.c
@@ -8,6 +8,7 @@
 #include "adw-clamp.h"
 
 #include "adw-clamp-layout.h"
+#include "adw-macros-private.h"
 #include "adw-widget-utils-private.h"
 
 /**
diff --git a/src/adw-enum-list-model.c b/src/adw-enum-list-model.c
index 7c9f0393..1d09aa95 100644
--- a/src/adw-enum-list-model.c
+++ b/src/adw-enum-list-model.c
@@ -8,6 +8,8 @@
 
 #include "adw-enum-list-model.h"
 
+#include "adw-macros-private.h"
+
 #include <gio/gio.h>
 
 /**
diff --git a/src/adw-fading-label.c b/src/adw-fading-label.c
index 39c06bbc..08d0cf01 100644
--- a/src/adw-fading-label.c
+++ b/src/adw-fading-label.c
@@ -11,6 +11,7 @@
 
 #include <glib/gi18n-lib.h>
 #include "adw-bidi-private.h"
+#include "adw-macros-private.h"
 
 #define FADE_WIDTH 18
 
diff --git a/src/adw-flap.c b/src/adw-flap.c
index 5ce4b50e..17b66029 100644
--- a/src/adw-flap.c
+++ b/src/adw-flap.c
@@ -13,6 +13,7 @@
 #include "adw-animation-util-private.h"
 #include "adw-animation-private.h"
 #include "adw-gizmo-private.h"
+#include "adw-macros-private.h"
 #include "adw-shadow-helper-private.h"
 #include "adw-swipeable.h"
 #include "adw-swipe-tracker-private.h"
diff --git a/src/adw-gizmo.c b/src/adw-gizmo.c
index 2474d786..caa8a060 100644
--- a/src/adw-gizmo.c
+++ b/src/adw-gizmo.c
@@ -9,6 +9,7 @@
 
 #include "adw-gizmo-private.h"
 
+#include "adw-macros-private.h"
 #include "adw-widget-utils-private.h"
 
 struct _AdwGizmo
diff --git a/src/adw-indicator-bin.c b/src/adw-indicator-bin.c
index 0206f3e7..01613a26 100644
--- a/src/adw-indicator-bin.c
+++ b/src/adw-indicator-bin.c
@@ -10,6 +10,7 @@
 #include "adw-indicator-bin-private.h"
 
 #include "adw-gizmo-private.h"
+#include "adw-macros-private.h"
 #include "adw-widget-utils-private.h"
 
 /**
diff --git a/src/adw-leaflet.c b/src/adw-leaflet.c
index 047db020..23ad219c 100644
--- a/src/adw-leaflet.c
+++ b/src/adw-leaflet.c
@@ -12,6 +12,7 @@
 #include "adw-animation-private.h"
 #include "adw-enums-private.h"
 #include "adw-fold-threshold-policy.h"
+#include "adw-macros-private.h"
 #include "adw-leaflet.h"
 #include "adw-shadow-helper-private.h"
 #include "adw-swipeable.h"
diff --git a/src/adw-macros-private.h b/src/adw-macros-private.h
index 91384e09..cf436d94 100644
--- a/src/adw-macros-private.h
+++ b/src/adw-macros-private.h
@@ -14,6 +14,11 @@
 
 G_BEGIN_DECLS
 
+#if !GLIB_CHECK_VERSION(2, 70, 0)
+#define G_DEFINE_FINAL_TYPE           G_DEFINE_TYPE
+#define G_DEFINE_FINAL_TYPE_WITH_CODE G_DEFINE_TYPE_WITH_CODE
+#endif
+
 #define ADW_CRITICAL_CANNOT_REMOVE_CHILD(parent, child) \
 G_STMT_START { \
   g_critical ("%s:%d: tried to remove non-child %p of type '%s' from %p of type '%s'", \
diff --git a/src/adw-settings.c b/src/adw-settings.c
index 4addc464..6c4420fd 100644
--- a/src/adw-settings.c
+++ b/src/adw-settings.c
@@ -10,6 +10,8 @@
 
 #include "adw-settings-private.h"
 
+#include "adw-macros-private.h"
+
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 
diff --git a/src/adw-shadow-helper.c b/src/adw-shadow-helper.c
index eef0d576..019d5ed4 100644
--- a/src/adw-shadow-helper.c
+++ b/src/adw-shadow-helper.c
@@ -7,6 +7,7 @@
 #include "config.h"
 
 #include "adw-gizmo-private.h"
+#include "adw-macros-private.h"
 #include "adw-shadow-helper-private.h"
 
 struct _AdwShadowHelper
diff --git a/src/adw-split-button.c b/src/adw-split-button.c
index 994b666b..72b5562e 100644
--- a/src/adw-split-button.c
+++ b/src/adw-split-button.c
@@ -8,6 +8,7 @@
 
 #include "adw-split-button.h"
 
+#include "adw-macros-private.h"
 #include "adw-widget-utils-private.h"
 
 /**
diff --git a/src/adw-squeezer.c b/src/adw-squeezer.c
index eeec0362..a7219e4a 100644
--- a/src/adw-squeezer.c
+++ b/src/adw-squeezer.c
@@ -21,6 +21,7 @@
 #include "gtkprogresstrackerprivate.h"
 #include "adw-animation-util-private.h"
 #include "adw-animation-private.h"
+#include "adw-macros-private.h"
 #include "adw-widget-utils-private.h"
 
 /**
diff --git a/src/adw-status-page.c b/src/adw-status-page.c
index 330c65cc..d4df7b6a 100644
--- a/src/adw-status-page.c
+++ b/src/adw-status-page.c
@@ -8,6 +8,7 @@
 
 #include "adw-status-page.h"
 
+#include "adw-macros-private.h"
 #include "adw-widget-utils-private.h"
 
 /**
diff --git a/src/adw-style-manager.c b/src/adw-style-manager.c
index acc68d64..ff9e7a76 100644
--- a/src/adw-style-manager.c
+++ b/src/adw-style-manager.c
@@ -10,6 +10,7 @@
 
 #include "adw-style-manager-private.h"
 
+#include "adw-macros-private.h"
 #include "adw-settings-private.h"
 #include <gtk/gtk.h>
 
diff --git a/src/adw-swipe-tracker.c b/src/adw-swipe-tracker.c
index 0f458fe5..1da0e89f 100644
--- a/src/adw-swipe-tracker.c
+++ b/src/adw-swipe-tracker.c
@@ -8,6 +8,7 @@
 
 #include "adw-swipe-tracker-private.h"
 #include "adw-navigation-direction.h"
+#include "adw-macros-private.h"
 
 #include <math.h>
 
diff --git a/src/adw-tab-bar.c b/src/adw-tab-bar.c
index 736a613d..3d6c5b85 100644
--- a/src/adw-tab-bar.c
+++ b/src/adw-tab-bar.c
@@ -11,6 +11,7 @@
 #include "adw-tab-bar-private.h"
 
 #include "adw-bin.h"
+#include "adw-macros-private.h"
 #include "adw-tab-box-private.h"
 #include "adw-widget-utils-private.h"
 
diff --git a/src/adw-tab-box.c b/src/adw-tab-box.c
index c8c114a1..c14e688d 100644
--- a/src/adw-tab-box.c
+++ b/src/adw-tab-box.c
@@ -12,6 +12,7 @@
 #include "adw-animation-util-private.h"
 #include "adw-animation-private.h"
 #include "adw-gizmo-private.h"
+#include "adw-macros-private.h"
 #include "adw-tab-private.h"
 #include "adw-tab-bar-private.h"
 #include "adw-tab-view-private.h"
diff --git a/src/adw-tab-view.c b/src/adw-tab-view.c
index 0a2ff065..e028bdfd 100644
--- a/src/adw-tab-view.c
+++ b/src/adw-tab-view.c
@@ -11,6 +11,7 @@
 #include "adw-tab-view-private.h"
 
 #include "adw-gizmo-private.h"
+#include "adw-macros-private.h"
 #include "adw-widget-utils-private.h"
 
 /* FIXME replace with groups */
diff --git a/src/adw-tab.c b/src/adw-tab.c
index 9b1330d5..44bc5071 100644
--- a/src/adw-tab.c
+++ b/src/adw-tab.c
@@ -13,6 +13,7 @@
 #include "adw-animation-private.h"
 #include "adw-bidi-private.h"
 #include "adw-fading-label-private.h"
+#include "adw-macros-private.h"
 
 #define FADE_WIDTH 18
 #define CLOSE_BTN_ANIMATION_DURATION 150
diff --git a/src/adw-toast-overlay.c b/src/adw-toast-overlay.c
index 39de1be2..2d903291 100644
--- a/src/adw-toast-overlay.c
+++ b/src/adw-toast-overlay.c
@@ -10,6 +10,7 @@
 
 #include "adw-animation-private.h"
 #include "adw-animation-util-private.h"
+#include "adw-macros-private.h"
 #include "adw-toast-private.h"
 #include "adw-toast-widget-private.h"
 #include "adw-widget-utils-private.h"
diff --git a/src/adw-toast-widget.c b/src/adw-toast-widget.c
index f12627de..4fdc78b6 100644
--- a/src/adw-toast-widget.c
+++ b/src/adw-toast-widget.c
@@ -8,6 +8,8 @@
 
 #include "adw-toast-widget-private.h"
 
+#include "adw-macros-private.h"
+
 #define TOAST_DURATION 5000
 
 struct _AdwToastWidget {
diff --git a/src/adw-toast.c b/src/adw-toast.c
index ae3da15e..8ab7dfa5 100644
--- a/src/adw-toast.c
+++ b/src/adw-toast.c
@@ -8,6 +8,8 @@
 
 #include "adw-toast-private.h"
 
+#include "adw-macros-private.h"
+
 /**
  * AdwToastPriority:
  * @ADW_TOAST_PRIORITY_NORMAL: the toast will be queued if another toast is
diff --git a/src/adw-view-switcher-bar.c b/src/adw-view-switcher-bar.c
index 6cb31431..ea8e7886 100644
--- a/src/adw-view-switcher-bar.c
+++ b/src/adw-view-switcher-bar.c
@@ -8,6 +8,7 @@
 #include "config.h"
 
 #include "adw-enums.h"
+#include "adw-macros-private.h"
 #include "adw-view-switcher-bar.h"
 
 /**
diff --git a/src/adw-view-switcher-button.c b/src/adw-view-switcher-button.c
index 43b63a29..a229baa0 100644
--- a/src/adw-view-switcher-button.c
+++ b/src/adw-view-switcher-button.c
@@ -8,6 +8,7 @@
 #include "config.h"
 
 #include "adw-indicator-bin-private.h"
+#include "adw-macros-private.h"
 #include "adw-view-switcher-button-private.h"
 
 #define TIMEOUT_EXPAND 500
diff --git a/src/adw-view-switcher-title.c b/src/adw-view-switcher-title.c
index f11db4f0..bfcfca4e 100644
--- a/src/adw-view-switcher-title.c
+++ b/src/adw-view-switcher-title.c
@@ -7,6 +7,7 @@
 
 #include "config.h"
 
+#include "adw-macros-private.h"
 #include "adw-view-switcher-title.h"
 #include "adw-squeezer.h"
 #include "adw-window-title.h"
diff --git a/src/adw-view-switcher.c b/src/adw-view-switcher.c
index f31875b2..4dccd112 100644
--- a/src/adw-view-switcher.c
+++ b/src/adw-view-switcher.c
@@ -11,6 +11,7 @@
 #include "config.h"
 
 #include "adw-enums.h"
+#include "adw-macros-private.h"
 #include "adw-view-switcher.h"
 #include "adw-view-switcher-button-private.h"
 
diff --git a/src/adw-window-mixin.c b/src/adw-window-mixin.c
index 41462710..5efa0180 100644
--- a/src/adw-window-mixin.c
+++ b/src/adw-window-mixin.c
@@ -7,6 +7,7 @@
 #include "config.h"
 
 #include "adw-gizmo-private.h"
+#include "adw-macros-private.h"
 #include "adw-widget-utils-private.h"
 #include "adw-window-mixin-private.h"
 
diff --git a/src/adw-window-title.c b/src/adw-window-title.c
index 9bcdd371..c3bddfd4 100644
--- a/src/adw-window-title.c
+++ b/src/adw-window-title.c
@@ -5,9 +5,10 @@
  */
 
 #include "config.h"
-
 #include "adw-window-title.h"
 
+#include "adw-macros-private.h"
+
 /**
  * AdwWindowTitle:
  *
diff --git a/src/inspector/adw-inspector-page.c b/src/inspector/adw-inspector-page.c
index 57bc1e97..90281270 100644
--- a/src/inspector/adw-inspector-page.c
+++ b/src/inspector/adw-inspector-page.c
@@ -12,6 +12,7 @@
 #include "adw-inspector-page-private.h"
 
 #include <adwaita.h>
+#include "adw-macros-private.h"
 #include "adw-settings-private.h"
 
 struct _AdwInspectorPage
diff --git a/src/meson.build b/src/meson.build
index 030aa37f..35f3d905 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -200,7 +200,7 @@ libadwaita_sources = [
   libadwaita_init_public_types,
 ]
 
-glib_min_version = '>= 2.70'
+glib_min_version = '>= 2.66'
 gtk_min_version = '>= 4.4.0'
 
 gio_dep = dependency('gio-2.0', version: glib_min_version)