From 94701eee5442f6e3eb760330ca2e8fb0be7201cd Mon Sep 17 00:00:00 2001
From: Dan Yeaw <dan@yeaw.me>
Date: Sat, 14 Sep 2024 12:27:46 -0400
Subject: [PATCH 01/14] Update Orc to version 0.4.40

---
 gvsbuild/projects/gstreamer.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gvsbuild/projects/gstreamer.py b/gvsbuild/projects/gstreamer.py
index b8d3cfeb4..b473ff7df 100644
--- a/gvsbuild/projects/gstreamer.py
+++ b/gvsbuild/projects/gstreamer.py
@@ -70,11 +70,11 @@ def __init__(self):
         Project.__init__(
             self,
             "orc",
-            version="0.4.39",
+            version="0.4.40",
             lastversion_even=True,
             repository="https://gitlab.freedesktop.org/gstreamer/orc",
             archive_url="https://gstreamer.freedesktop.org/src/orc/orc-{version}.tar.xz",
-            hash="33ed2387f49b825fa1b9c3b0072e05f259141b895474ad085ae51143d3040cc0",
+            hash="3fc2bee78dfb7c41fd9605061fc69138db7df007eae2f669a1f56e8bacef74ab",
             dependencies=["meson", "ninja"],
         )
 

From fa6c79a67545a42f89fd87ea903525bf2137d0bc Mon Sep 17 00:00:00 2001
From: Dan Yeaw <dan@yeaw.me>
Date: Sat, 14 Sep 2024 12:31:00 -0400
Subject: [PATCH 02/14] Update libarchive to version 3.7.5

---
 gvsbuild/projects/libarchive.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gvsbuild/projects/libarchive.py b/gvsbuild/projects/libarchive.py
index 12161dab9..67880f159 100644
--- a/gvsbuild/projects/libarchive.py
+++ b/gvsbuild/projects/libarchive.py
@@ -27,9 +27,9 @@ def __init__(self):
         Project.__init__(
             self,
             "libarchive",
-            version="3.7.4",
+            version="3.7.5",
             archive_url="https://libarchive.org/downloads/libarchive-{version}.tar.xz",
-            hash="f887755c434a736a609cbd28d87ddbfbe9d6a3bb5b703c22c02f6af80a802735",
+            hash="ca74ff8f99dd40ab8a8274424d10a12a7ec3f4428dd35aee9fdda8bdb861b570",
             dependencies=[
                 "cmake",
                 "ninja",

From b2eb4ea50a3fb3d1e565bb9172dd66f9fb1b2aca Mon Sep 17 00:00:00 2001
From: Dan Yeaw <dan@yeaw.me>
Date: Sat, 14 Sep 2024 12:59:56 -0400
Subject: [PATCH 03/14] Update GTK to version 4.16.1

---
 gvsbuild/projects/gtk.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gvsbuild/projects/gtk.py b/gvsbuild/projects/gtk.py
index f2187cef9..4049057ce 100644
--- a/gvsbuild/projects/gtk.py
+++ b/gvsbuild/projects/gtk.py
@@ -122,12 +122,12 @@ def __init__(self):
             self,
             "gtk4",
             prj_dir="gtk4",
-            version="4.16.0",
+            version="4.16.1",
             lastversion_major=4,
             lastversion_even=True,
             repository="https://gitlab.gnome.org/GNOME/gtk",
             archive_url="https://download.gnome.org/sources/gtk/{major}.{minor}/gtk-{version}.tar.xz",
-            hash="8ef538778c82c09870a6cc325195049caec5593c1ca37df915a7b6b10f5524ea",
+            hash="926a1eabd481f9bfa25538f95016fdfcfaf963b2f90b40ae69e90def5499215c",
             dependencies=[
                 "gdk-pixbuf",
                 "pango",

From 2782daa0b38103143eb4cc6ca46987e16d1e16b8 Mon Sep 17 00:00:00 2001
From: Dan Yeaw <dan@yeaw.me>
Date: Sat, 14 Sep 2024 15:37:11 -0400
Subject: [PATCH 04/14] Update libadwaita to version 1.6.0

---
 .../0001-remove-appstream-dependency.patch    | 949 +++++++++---------
 gvsbuild/projects/libadwaita.py               |   6 +-
 2 files changed, 451 insertions(+), 504 deletions(-)

diff --git a/gvsbuild/patches/libadwaita/0001-remove-appstream-dependency.patch b/gvsbuild/patches/libadwaita/0001-remove-appstream-dependency.patch
index 515f8cd49..fbf80e5a0 100644
--- a/gvsbuild/patches/libadwaita/0001-remove-appstream-dependency.patch
+++ b/gvsbuild/patches/libadwaita/0001-remove-appstream-dependency.patch
@@ -1,23 +1,11 @@
 Subject: [PATCH] Remove appstream
 ---
-Index: subprojects/appstream.wrap
-===================================================================
-diff --git a/subprojects/appstream.wrap b/subprojects/appstream.wrap
-deleted file mode 100644
---- a/subprojects/appstream.wrap	(revision d63f6356a13374b834a9b4a674d6516f34f3aa10)
-+++ /dev/null	(revision d63f6356a13374b834a9b4a674d6516f34f3aa10)
-@@ -1,5 +0,0 @@
--[wrap-git]
--directory = appstream
--url = https://github.com/ximion/appstream.git
--revision = main
--depth = 1
 Index: tests/org.gnome.Adwaita1.Test.metainfo.xml
 ===================================================================
 diff --git a/tests/org.gnome.Adwaita1.Test.metainfo.xml b/tests/org.gnome.Adwaita1.Test.metainfo.xml
 deleted file mode 100644
---- a/tests/org.gnome.Adwaita1.Test.metainfo.xml	(revision d63f6356a13374b834a9b4a674d6516f34f3aa10)
-+++ /dev/null	(revision d63f6356a13374b834a9b4a674d6516f34f3aa10)
+--- a/tests/org.gnome.Adwaita1.Test.metainfo.xml	(revision 42b47f0438fc2b24910c58e00bd2bd970b499379)
++++ /dev/null	(revision 42b47f0438fc2b24910c58e00bd2bd970b499379)
 @@ -1,29 +0,0 @@
 -<?xml version="1.0" encoding="UTF-8"?>
 -<component type="desktop-application">
@@ -52,8 +40,8 @@ Index: tests/tests.gresources.xml
 ===================================================================
 diff --git a/tests/tests.gresources.xml b/tests/tests.gresources.xml
 deleted file mode 100644
---- a/tests/tests.gresources.xml	(revision d63f6356a13374b834a9b4a674d6516f34f3aa10)
-+++ /dev/null	(revision d63f6356a13374b834a9b4a674d6516f34f3aa10)
+--- a/tests/tests.gresources.xml	(revision 42b47f0438fc2b24910c58e00bd2bd970b499379)
++++ /dev/null	(revision 42b47f0438fc2b24910c58e00bd2bd970b499379)
 @@ -1,6 +0,0 @@
 -<?xml version="1.0" encoding="UTF-8"?>
 -<gresources>
@@ -61,107 +49,235 @@ deleted file mode 100644
 -    <file compressed="true">org.gnome.Adwaita1.Test.metainfo.xml</file>
 -  </gresource>
 -</gresources>
-Index: src/meson.build
+Index: tests/test-about-window.c
 IDEA additional info:
 Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
 <+>UTF-8
 ===================================================================
-diff --git a/src/meson.build b/src/meson.build
---- a/src/meson.build	(revision d63f6356a13374b834a9b4a674d6516f34f3aa10)
-+++ b/src/meson.build	(date 1716642545234)
-@@ -284,20 +284,12 @@
+diff --git a/tests/test-about-window.c b/tests/test-about-window.c
+--- a/tests/test-about-window.c	(revision 42b47f0438fc2b24910c58e00bd2bd970b499379)
++++ b/tests/test-about-window.c	(date 1726337776197)
+@@ -8,49 +8,6 @@
  
- gio_dep = dependency('gio-2.0', version: glib_min_version)
- gtk_dep = dependency('gtk4', version: gtk_min_version)
--appstream_dep = dependency('appstream',
--  fallback : ['appstream', 'appstream_dep'],
--  default_options : [
--    'systemd=false', 'apidocs=false', 'install-docs=false',
--    'stemming=false', 'svg-support=false', 'gir=false',
--  ],
--)
+ #include <adwaita.h>
  
- libadwaita_deps = [
-   dependency('glib-2.0', version: glib_min_version),
-   dependency('fribidi'),
-   gio_dep,
-   gtk_dep,
--  appstream_dep,
-   cc.find_library('m', required: false),
- ]
+-#include "adwaita-test-resources.h"
+-
+-static void
+-test_adw_about_window_from_appdata (void)
+-{
+-  AdwAboutWindow *window = ADW_ABOUT_WINDOW (adw_about_window_new_from_appdata ("/org/gnome/Adwaita1/Test/org.gnome.Adwaita1.Test.metainfo.xml", "1.0"));
+-
+-  g_assert_nonnull (window);
+-
+-  g_assert_cmpstr (adw_about_window_get_release_notes (window), ==, "<p>Testing Build</p>\n");
+-  g_assert_cmpstr (adw_about_window_get_release_notes_version (window), ==, "1.0");
+-  g_assert_cmpstr (adw_about_window_get_version (window), ==, "1.0");
+-  g_assert_cmpstr (adw_about_window_get_application_icon (window), ==, "org.gnome.Adwaita1.Test");
+-  g_assert_cmpstr (adw_about_window_get_application_name (window), ==, "Adwaita Test");
+-  g_assert_cmpstr (adw_about_window_get_developer_name (window), ==, "The GNOME Project");
+-  g_assert_cmpstr (adw_about_window_get_issue_url (window), ==, "https://gitlab.gnome.org/GNOME/libadwaita/issues");
+-  g_assert_cmpstr (adw_about_window_get_support_url (window), ==, "http://www.gnome.org/friends/");
+-  g_assert_cmpstr (adw_about_window_get_website (window), ==, "https://gitlab.gnome.org/GNOME/libadwaita");
+-  g_assert_cmpuint (adw_about_window_get_license_type (window), ==, GTK_LICENSE_LGPL_2_1);
+-
+-  g_assert_finalize_object (window);
+-
+-  window = ADW_ABOUT_WINDOW (adw_about_window_new_from_appdata ("/org/gnome/Adwaita1/Test/org.gnome.Adwaita1.Test.metainfo.xml", "0.1"));
+-
+-  g_assert_nonnull (window);
+-
+-  g_assert_cmpstr (adw_about_window_get_release_notes (window), ==, "<p>Testing Build Older</p>\n");
+-  g_assert_cmpstr (adw_about_window_get_release_notes_version (window), ==, "0.1");
+-  g_assert_cmpstr (adw_about_window_get_version (window), ==, "1.0");
+-
+-  g_assert_finalize_object (window);
+-
+-  window = ADW_ABOUT_WINDOW (adw_about_window_new_from_appdata ("/org/gnome/Adwaita1/Test/org.gnome.Adwaita1.Test.metainfo.xml", NULL));
+-
+-  g_assert_nonnull (window);
+-
+-  g_assert_cmpstr (adw_about_window_get_release_notes (window), ==, "");
+-  g_assert_cmpstr (adw_about_window_get_release_notes_version (window), ==, "");
+-  g_assert_cmpstr (adw_about_window_get_version (window), ==, "1.0");
+-
+-  g_assert_finalize_object (window);
+-}
+-
+ static void
+ test_adw_about_window_create (void)
+ {
+@@ -143,16 +100,10 @@
+ main (int   argc,
+       char *argv[])
+ {
+-  GResource *test_resources;
+-
+   gtk_test_init (&argc, &argv, NULL);
+   adw_init ();
+ 
+-  test_resources = test_get_resource ();
+-  g_resources_register (test_resources);
+-
+   g_test_add_func ("/Adwaita/AboutWindow/create", test_adw_about_window_create);
+-  g_test_add_func ("/Adwaita/AboutWindow/from_appdata", test_adw_about_window_from_appdata);
  
+   return g_test_run ();
+ }
 Index: src/adw-about-window.h
 IDEA additional info:
 Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
 <+>UTF-8
 ===================================================================
 diff --git a/src/adw-about-window.h b/src/adw-about-window.h
---- a/src/adw-about-window.h	(revision d63f6356a13374b834a9b4a674d6516f34f3aa10)
-+++ b/src/adw-about-window.h	(date 1716642545223)
+--- a/src/adw-about-window.h	(revision 42b47f0438fc2b24910c58e00bd2bd970b499379)
++++ b/src/adw-about-window.h	(date 1726337776087)
 @@ -25,10 +25,6 @@
- ADW_AVAILABLE_IN_1_2
+ ADW_DEPRECATED_IN_1_6_FOR(adw_about_dialog_new)
  GtkWidget *adw_about_window_new (void) G_GNUC_WARN_UNUSED_RESULT;
  
--ADW_AVAILABLE_IN_1_4
+-ADW_DEPRECATED_IN_1_6_FOR(adw_about_dialog_new_from_appdata)
 -GtkWidget *adw_about_window_new_from_appdata (const char *resource_path,
 -                                              const char *release_notes_version) G_GNUC_WARN_UNUSED_RESULT;
 -
- ADW_AVAILABLE_IN_1_2
+ ADW_DEPRECATED_IN_1_6_FOR(adw_about_dialog_get_application_name)
  const char *adw_about_window_get_application_name (AdwAboutWindow *self);
- ADW_AVAILABLE_IN_1_2
-@@ -174,13 +170,6 @@
- ADW_AVAILABLE_IN_1_2
+ ADW_DEPRECATED_IN_1_6_FOR(adw_about_dialog_set_application_name)
+@@ -175,12 +171,5 @@
  void adw_show_about_window (GtkWindow  *parent,
                              const char *first_property_name,
--                            ...) G_GNUC_NULL_TERMINATED;
+                             ...) G_GNUC_NULL_TERMINATED;
 -
--ADW_AVAILABLE_IN_1_4
+-ADW_DEPRECATED_IN_1_6_FOR(adw_show_about_dialog_from_appdata)
 -void adw_show_about_window_from_appdata (GtkWindow  *parent,
 -                                         const char *resource_path,
 -                                         const char *release_notes_version,
 -                                         const char *first_property_name,
 -                                         ...) G_GNUC_NULL_TERMINATED;
-+                            ...);
  
  G_END_DECLS
-Index: src/adw-about-dialog.h
+Index: src/meson.build
 IDEA additional info:
 Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
 <+>UTF-8
 ===================================================================
-diff --git a/src/adw-about-dialog.h b/src/adw-about-dialog.h
---- a/src/adw-about-dialog.h	(revision d63f6356a13374b834a9b4a674d6516f34f3aa10)
-+++ b/src/adw-about-dialog.h	(date 1716642545163)
-@@ -178,11 +178,4 @@
-                             const char *first_property_name,
-                             ...) G_GNUC_NULL_TERMINATED;
+diff --git a/src/meson.build b/src/meson.build
+--- a/src/meson.build	(revision 42b47f0438fc2b24910c58e00bd2bd970b499379)
++++ b/src/meson.build	(date 1726337776130)
+@@ -302,20 +302,12 @@
  
--ADW_AVAILABLE_IN_1_5
--void adw_show_about_dialog_from_appdata (GtkWidget  *parent,
--                                         const char *resource_path,
--                                         const char *release_notes_version,
--                                         const char *first_property_name,
--                                         ...) G_GNUC_NULL_TERMINATED;
+ gio_dep = dependency('gio-2.0', version: glib_min_version)
+ gtk_dep = dependency('gtk4', version: gtk_min_version)
+-appstream_dep = dependency('appstream',
+-  fallback : ['appstream', 'appstream_dep'],
+-  default_options : [
+-    'systemd=false', 'apidocs=false', 'install-docs=false',
+-    'stemming=false', 'svg-support=false', 'gir=false',
+-  ],
+-)
+ 
+ libadwaita_deps = [
+   dependency('glib-2.0', version: glib_min_version),
+   dependency('fribidi'),
+   gio_dep,
+   gtk_dep,
+-  appstream_dep,
+   cc.find_library('m', required: false),
+ ]
+ 
+Index: tests/test-about-dialog.c
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/tests/test-about-dialog.c b/tests/test-about-dialog.c
+--- a/tests/test-about-dialog.c	(revision 42b47f0438fc2b24910c58e00bd2bd970b499379)
++++ b/tests/test-about-dialog.c	(date 1726337776184)
+@@ -9,49 +9,6 @@
+ 
+ #include <adwaita.h>
+ 
+-#include "adwaita-test-resources.h"
 -
- G_END_DECLS
-Index: src/adw-about-dialog.c
+-static void
+-test_adw_about_dialog_from_appdata (void)
+-{
+-  AdwAboutDialog *dialog = g_object_ref_sink (ADW_ABOUT_DIALOG (adw_about_dialog_new_from_appdata ("/org/gnome/Adwaita1/Test/org.gnome.Adwaita1.Test.metainfo.xml", "1.0")));
+-
+-  g_assert_nonnull (dialog);
+-
+-  g_assert_cmpstr (adw_about_dialog_get_release_notes (dialog), ==, "<p>Testing Build</p>\n");
+-  g_assert_cmpstr (adw_about_dialog_get_release_notes_version (dialog), ==, "1.0");
+-  g_assert_cmpstr (adw_about_dialog_get_version (dialog), ==, "1.0");
+-  g_assert_cmpstr (adw_about_dialog_get_application_icon (dialog), ==, "org.gnome.Adwaita1.Test");
+-  g_assert_cmpstr (adw_about_dialog_get_application_name (dialog), ==, "Adwaita Test");
+-  g_assert_cmpstr (adw_about_dialog_get_developer_name (dialog), ==, "The GNOME Project");
+-  g_assert_cmpstr (adw_about_dialog_get_issue_url (dialog), ==, "https://gitlab.gnome.org/GNOME/libadwaita/issues");
+-  g_assert_cmpstr (adw_about_dialog_get_support_url (dialog), ==, "http://www.gnome.org/friends/");
+-  g_assert_cmpstr (adw_about_dialog_get_website (dialog), ==, "https://gitlab.gnome.org/GNOME/libadwaita");
+-  g_assert_cmpuint (adw_about_dialog_get_license_type (dialog), ==, GTK_LICENSE_LGPL_2_1);
+-
+-  g_assert_finalize_object (dialog);
+-
+-  dialog = g_object_ref_sink (ADW_ABOUT_DIALOG (adw_about_dialog_new_from_appdata ("/org/gnome/Adwaita1/Test/org.gnome.Adwaita1.Test.metainfo.xml", "0.1")));
+-
+-  g_assert_nonnull (dialog);
+-
+-  g_assert_cmpstr (adw_about_dialog_get_release_notes (dialog), ==, "<p>Testing Build Older</p>\n");
+-  g_assert_cmpstr (adw_about_dialog_get_release_notes_version (dialog), ==, "0.1");
+-  g_assert_cmpstr (adw_about_dialog_get_version (dialog), ==, "1.0");
+-
+-  g_assert_finalize_object (dialog);
+-
+-  dialog = g_object_ref_sink (ADW_ABOUT_DIALOG (adw_about_dialog_new_from_appdata ("/org/gnome/Adwaita1/Test/org.gnome.Adwaita1.Test.metainfo.xml", NULL)));
+-
+-  g_assert_nonnull (dialog);
+-
+-  g_assert_cmpstr (adw_about_dialog_get_release_notes (dialog), ==, "");
+-  g_assert_cmpstr (adw_about_dialog_get_release_notes_version (dialog), ==, "");
+-  g_assert_cmpstr (adw_about_dialog_get_version (dialog), ==, "1.0");
+-
+-  g_assert_finalize_object (dialog);
+-}
+-
+ static void
+ test_adw_about_dialog_create (void)
+ {
+@@ -144,16 +101,10 @@
+ main (int   argc,
+       char *argv[])
+ {
+-  GResource *test_resources;
+-
+   gtk_test_init (&argc, &argv, NULL);
+   adw_init ();
+ 
+-  test_resources = test_get_resource ();
+-  g_resources_register (test_resources);
+-
+   g_test_add_func ("/Adwaita/AboutDialog/create", test_adw_about_dialog_create);
+-  g_test_add_func ("/Adwaita/AboutDialog/from_appdata", test_adw_about_dialog_from_appdata);
+ 
+   return g_test_run ();
+ }
+Index: src/adw-about-window.c
 IDEA additional info:
 Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
 <+>UTF-8
 ===================================================================
-diff --git a/src/adw-about-dialog.c b/src/adw-about-dialog.c
---- a/src/adw-about-dialog.c	(revision d63f6356a13374b834a9b4a674d6516f34f3aa10)
-+++ b/src/adw-about-dialog.c	(date 1716662850354)
-@@ -7,7 +7,6 @@
+diff --git a/src/adw-about-window.c b/src/adw-about-window.c
+--- a/src/adw-about-window.c	(revision 42b47f0438fc2b24910c58e00bd2bd970b499379)
++++ b/src/adw-about-window.c	(date 1726342004953)
+@@ -6,7 +6,6 @@
  
  #include "config.h"
  #include <glib/gi18n-lib.h>
 -#include <appstream.h>
  
- #include "adw-about-dialog.h"
+ #include "adw-about-window.h"
  
-@@ -411,13 +410,6 @@
-   self->legal_showing_idle_id = 0;
+@@ -421,13 +420,6 @@
+     g_idle_add_once ((GSourceOnceFunc) legal_showing_idle_cb, self);
  }
  
 -static gboolean
@@ -172,48 +288,49 @@ diff --git a/src/adw-about-dialog.c b/src/adw-about-dialog.c
 -}
 -
  static void
- update_credits_legal_group (AdwAboutDialog *self)
+ update_credits_legal_group (AdwAboutWindow *self)
  {
-@@ -1953,180 +1945,6 @@
-   return g_object_new (ADW_TYPE_ABOUT_DIALOG, NULL);
+@@ -1986,189 +1978,6 @@
+   return g_object_new (ADW_TYPE_ABOUT_WINDOW, NULL);
  }
  
 -/**
-- * adw_about_dialog_new_from_appdata:
+- * adw_about_window_new_from_appdata:
 - * @resource_path: The resource to use
 - * @release_notes_version: (nullable): The version to retrieve release notes for
 - *
-- * Creates a new `AdwAboutDialog` using AppStream metadata.
+- * Creates a new `AdwAboutWindow` using AppStream metadata.
 - *
 - * This automatically sets the following properties with the following AppStream
 - * values:
 - *
-- * * [property@AboutDialog:application-icon] is set from the `<id>`
-- * * [property@AboutDialog:application-name] is set from the `<name>`
-- * * [property@AboutDialog:developer-name] is set from the `<name>` within
+- * * [property@AboutWindow:application-icon] is set from the `<id>`
+- * * [property@AboutWindow:application-name] is set from the `<name>`
+- * * [property@AboutWindow:developer-name] is set from the `<name>` within
 - *      `<developer>`
-- * * [property@AboutDialog:version] is set from the version of the latest release
-- * * [property@AboutDialog:website] is set from the `<url type="homepage">`
-- * * [property@AboutDialog:support-url] is set from the `<url type="help">`
-- * * [property@AboutDialog:issue-url] is set from the `<url type="bugtracker">`
-- * * [property@AboutDialog:license-type] is set from the `<project_license>`.
+- * * [property@AboutWindow:version] is set from the version of the latest release
+- * * [property@AboutWindow:website] is set from the `<url type="homepage">`
+- * * [property@AboutWindow:support-url] is set from the `<url type="help">`
+- * * [property@AboutWindow:issue-url] is set from the `<url type="bugtracker">`
+- * * [property@AboutWindow:license-type] is set from the `<project_license>`.
 - *     If the license type retrieved from AppStream is not listed in
 - *     [enum@Gtk.License], it will be set to `GTK_LICENCE_CUSTOM`.
 - *
 - * If @release_notes_version is not `NULL`,
-- * [property@AboutDialog:release-notes-version] is set to match it, while
-- * [property@AboutDialog:release-notes] is set from the AppStream release
+- * [property@AboutWindow:release-notes-version] is set to match it, while
+- * [property@AboutWindow:release-notes] is set from the AppStream release
 - * description for that version.
 - *
-- * Returns: the newly created `AdwAboutDialog`
+- * Returns: the newly created `AdwAboutWindow`
 - *
-- * Since: 1.5
+- * Since: 1.4
+- * Deprecated: 1.6: Use [class@AboutDialog].
 - */
--AdwDialog *
--adw_about_dialog_new_from_appdata (const char *resource_path,
+-GtkWidget *
+-adw_about_window_new_from_appdata (const char *resource_path,
 -                                   const char *release_notes_version)
 -{
--  AdwAboutDialog *self;
+-  AdwAboutWindow *self;
 -  GFile *appdata_file;
 -  char *appdata_uri;
 -  AsMetadata *metadata;
@@ -229,7 +346,7 @@ diff --git a/src/adw-about-dialog.c b/src/adw-about-dialog.c
 -  appdata_uri = g_strconcat ("resource://", resource_path, NULL);
 -  appdata_file = g_file_new_for_uri (appdata_uri);
 -
--  self = ADW_ABOUT_DIALOG (adw_about_dialog_new ());
+-  self = ADW_ABOUT_WINDOW (adw_about_window_new ());
 -  metadata = as_metadata_new ();
 -
 -  if (!as_metadata_parse_file (metadata, appdata_file, AS_FORMAT_KIND_UNKNOWN, &error)) {
@@ -285,8 +402,8 @@ diff --git a/src/adw-about-dialog.c b/src/adw-about-dialog.c
 -      version = as_release_get_version (notes_release);
 -
 -      if (release_notes && version) {
--        adw_about_dialog_set_release_notes (self, release_notes);
--        adw_about_dialog_set_release_notes_version (self, version);
+-        adw_about_window_set_release_notes (self, release_notes);
+-        adw_about_window_set_release_notes_version (self, version);
 -      }
 -    } else {
 -      g_critical ("No valid release found for version %s", release_notes_version);
@@ -298,7 +415,7 @@ diff --git a/src/adw-about-dialog.c b/src/adw-about-dialog.c
 -    const char *version = as_release_get_version (latest_release);
 -
 -    if (version)
--      adw_about_dialog_set_version (self, version);
+-      adw_about_window_set_version (self, version);
 -  }
 -
 -  name = as_component_get_name (component);
@@ -313,329 +430,108 @@ diff --git a/src/adw-about-dialog.c b/src/adw-about-dialog.c
 -  developer_name = as_component_get_developer_name (component);
 -#endif
 -
--  adw_about_dialog_set_application_icon (self, application_id);
+-  adw_about_window_set_application_icon (self, application_id);
 -
 -  if (name)
--    adw_about_dialog_set_application_name (self, name);
+-    adw_about_window_set_application_name (self, name);
 -
 -  if (developer_name)
--    adw_about_dialog_set_developer_name (self, developer_name);
+-    adw_about_window_set_developer_name (self, developer_name);
 -
 -  if (project_license) {
 -    int i;
 -
 -    for (i = 0; i < G_N_ELEMENTS (gtk_license_info); i++) {
 -      if (g_strcmp0 (gtk_license_info[i].spdx_id, project_license) == 0) {
--        adw_about_dialog_set_license_type (self, (GtkLicense) i);
+-        adw_about_window_set_license_type (self, (GtkLicense) i);
 -        break;
 -      }
 -    }
 -
--    if (adw_about_dialog_get_license_type (self) == GTK_LICENSE_UNKNOWN)
--      adw_about_dialog_set_license_type (self, GTK_LICENSE_CUSTOM);
+-    /* Handle deprecated SPDX IDs */
+-    for (i = 0; i < G_N_ELEMENTS (license_aliases); i++) {
+-      if (g_strcmp0 (license_aliases[i].spdx_id, project_license) == 0) {
+-        adw_about_window_set_license_type (self, license_aliases[i].license);
+-        break;
+-      }
+-    }
+-
+-    if (adw_about_window_get_license_type (self) == GTK_LICENSE_UNKNOWN)
+-      adw_about_window_set_license_type (self, GTK_LICENSE_CUSTOM);
 -  }
 -
 -  if (issue_url)
--    adw_about_dialog_set_issue_url (self, issue_url);
+-    adw_about_window_set_issue_url (self, issue_url);
 -
 -  if (support_url)
--    adw_about_dialog_set_support_url (self, support_url);
+-    adw_about_window_set_support_url (self, support_url);
 -
 -  if (website_url)
--    adw_about_dialog_set_website (self, website_url);
+-    adw_about_window_set_website (self, website_url);
 -
 -  g_object_unref (appdata_file);
 -  g_object_unref (metadata);
 -  g_free (application_id);
 -  g_free (appdata_uri);
 -
--  return ADW_DIALOG (self);
+-  return GTK_WIDGET (self);
 -}
 -
  /**
-  * adw_about_dialog_get_application_icon: (attributes org.gtk.Method.get_property=application-icon)
-  * @self: an about dialog
-@@ -3421,43 +3239,4 @@
-   g_object_set_valist (G_OBJECT (dialog), first_property_name, var_args);
-   va_end (var_args);
+  * adw_about_window_get_application_icon:
+  * @self: an about window
+@@ -3511,43 +3320,3 @@
  
--  adw_dialog_present (dialog, parent);
--}
+   gtk_window_present (GTK_WINDOW (window));
+ }
 -
 -/**
-- * adw_show_about_dialog_from_appdata: (skip)
-- * @parent: the parent widget
+- * adw_show_about_window_from_appdata: (skip)
+- * @parent: (nullable): the parent top-level window
 - * @resource_path: The resource to use
 - * @release_notes_version: (nullable): The version to retrieve release notes for
 - * @first_property_name: the name of the first property
 - * @...: value of first property, followed by more pairs of property name and
 - *   value, `NULL`-terminated
 - *
-- * A convenience function for showing an application’s about dialog from
+- * A convenience function for showing an application’s about window from
 - * AppStream metadata.
 - *
-- * See [ctor@AboutDialog.new_from_appdata] for details.
+- * See [ctor@AboutWindow.new_from_appdata] for details.
 - *
-- * Since: 1.5
+- * Since: 1.4
+- * Deprecated: 1.6: Use [func@show_about_dialog_from_appdata].
 - */
 -void
--adw_show_about_dialog_from_appdata (GtkWidget  *parent,
+-adw_show_about_window_from_appdata (GtkWindow  *parent,
 -                                    const char *resource_path,
 -                                    const char *release_notes_version,
 -                                    const char *first_property_name,
 -                                    ...)
 -{
--  AdwDialog *dialog;
+-  GtkWidget *window;
 -  va_list var_args;
 -
--  g_return_if_fail (GTK_IS_WIDGET (parent));
--
--  dialog = adw_about_dialog_new_from_appdata (resource_path,
--                                              release_notes_version);
--
--  va_start (var_args, first_property_name);
--  g_object_set_valist (G_OBJECT (dialog), first_property_name, var_args);
--  va_end (var_args);
--
--  adw_dialog_present (dialog, parent);
- }
-Index: tests/test-about-dialog.c
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/tests/test-about-dialog.c b/tests/test-about-dialog.c
---- a/tests/test-about-dialog.c	(revision d63f6356a13374b834a9b4a674d6516f34f3aa10)
-+++ b/tests/test-about-dialog.c	(date 1716642545267)
-@@ -9,49 +9,6 @@
- 
- #include <adwaita.h>
- 
--#include "adwaita-test-resources.h"
--
--static void
--test_adw_about_dialog_from_appdata (void)
--{
--  AdwAboutDialog *dialog = g_object_ref_sink (ADW_ABOUT_DIALOG (adw_about_dialog_new_from_appdata ("/org/gnome/Adwaita1/Test/org.gnome.Adwaita1.Test.metainfo.xml", "1.0")));
--
--  g_assert_nonnull (dialog);
--
--  g_assert_cmpstr (adw_about_dialog_get_release_notes (dialog), ==, "<p>Testing Build</p>\n");
--  g_assert_cmpstr (adw_about_dialog_get_release_notes_version (dialog), ==, "1.0");
--  g_assert_cmpstr (adw_about_dialog_get_version (dialog), ==, "1.0");
--  g_assert_cmpstr (adw_about_dialog_get_application_icon (dialog), ==, "org.gnome.Adwaita1.Test");
--  g_assert_cmpstr (adw_about_dialog_get_application_name (dialog), ==, "Adwaita Test");
--  g_assert_cmpstr (adw_about_dialog_get_developer_name (dialog), ==, "The GNOME Project");
--  g_assert_cmpstr (adw_about_dialog_get_issue_url (dialog), ==, "https://gitlab.gnome.org/GNOME/libadwaita/issues");
--  g_assert_cmpstr (adw_about_dialog_get_support_url (dialog), ==, "http://www.gnome.org/friends/");
--  g_assert_cmpstr (adw_about_dialog_get_website (dialog), ==, "https://gitlab.gnome.org/GNOME/libadwaita");
--  g_assert_cmpuint (adw_about_dialog_get_license_type (dialog), ==, GTK_LICENSE_LGPL_2_1);
--
--  g_assert_finalize_object (dialog);
--
--  dialog = g_object_ref_sink (ADW_ABOUT_DIALOG (adw_about_dialog_new_from_appdata ("/org/gnome/Adwaita1/Test/org.gnome.Adwaita1.Test.metainfo.xml", "0.1")));
--
--  g_assert_nonnull (dialog);
--
--  g_assert_cmpstr (adw_about_dialog_get_release_notes (dialog), ==, "<p>Testing Build Older</p>\n");
--  g_assert_cmpstr (adw_about_dialog_get_release_notes_version (dialog), ==, "0.1");
--  g_assert_cmpstr (adw_about_dialog_get_version (dialog), ==, "1.0");
--
--  g_assert_finalize_object (dialog);
--
--  dialog = g_object_ref_sink (ADW_ABOUT_DIALOG (adw_about_dialog_new_from_appdata ("/org/gnome/Adwaita1/Test/org.gnome.Adwaita1.Test.metainfo.xml", NULL)));
--
--  g_assert_nonnull (dialog);
--
--  g_assert_cmpstr (adw_about_dialog_get_release_notes (dialog), ==, "");
--  g_assert_cmpstr (adw_about_dialog_get_release_notes_version (dialog), ==, "");
--  g_assert_cmpstr (adw_about_dialog_get_version (dialog), ==, "1.0");
--
--  g_assert_finalize_object (dialog);
--}
--
- static void
- test_adw_about_dialog_create (void)
- {
-@@ -144,16 +101,10 @@
- main (int   argc,
-       char *argv[])
- {
--  GResource *test_resources;
--
-   gtk_test_init (&argc, &argv, NULL);
-   adw_init ();
- 
--  test_resources = test_get_resource ();
--  g_resources_register (test_resources);
--
-   g_test_add_func ("/Adwaita/AboutDialog/create", test_adw_about_dialog_create);
--  g_test_add_func ("/Adwaita/AboutDialog/from_appdata", test_adw_about_dialog_from_appdata);
- 
-   return g_test_run ();
- }
-Index: demo/data/meson.build
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/demo/data/meson.build b/demo/data/meson.build
---- a/demo/data/meson.build	(revision d63f6356a13374b834a9b4a674d6516f34f3aa10)
-+++ b/demo/data/meson.build	(date 1716642545017)
-@@ -34,25 +34,6 @@
- appdata_config.set('BUILD_VERSION', meson.project_version())
- appdata_config.set('BUILD_DATE', today)
- 
--appstream_file = i18n.merge_file(
--  input: configure_file(
--    input: 'org.gnome.Adwaita1.Demo.metainfo.xml.in.in',
--    output: 'org.gnome.Adwaita1.Demo.metainfo.xml.in',
--    configuration: appdata_config
--  ),
--  output: 'org.gnome.Adwaita1.Demo.metainfo.xml',
--  po_dir: '../../po',
--  install: true,
--  install_dir: datadir / 'metainfo'
--)
--
--appstreamcli = find_program('appstreamcli', required: false)
--if appstreamcli.found()
--  test('Validate appstream file', appstreamcli,
--    args: ['validate', '--no-net', '--explain', appstream_file]
--  )
--endif
--
- install_data(
-   'org.gnome.Adwaita1.Demo.svg',
-   install_dir: datadir / 'icons' / 'hicolor' / 'scalable' / 'apps'
-Index: tests/test-about-window.c
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/tests/test-about-window.c b/tests/test-about-window.c
---- a/tests/test-about-window.c	(revision d63f6356a13374b834a9b4a674d6516f34f3aa10)
-+++ b/tests/test-about-window.c	(date 1716642545276)
-@@ -8,49 +8,6 @@
- 
- #include <adwaita.h>
- 
--#include "adwaita-test-resources.h"
--
--static void
--test_adw_about_window_from_appdata (void)
--{
--  AdwAboutWindow *window = ADW_ABOUT_WINDOW (adw_about_window_new_from_appdata ("/org/gnome/Adwaita1/Test/org.gnome.Adwaita1.Test.metainfo.xml", "1.0"));
--
--  g_assert_nonnull (window);
--
--  g_assert_cmpstr (adw_about_window_get_release_notes (window), ==, "<p>Testing Build</p>\n");
--  g_assert_cmpstr (adw_about_window_get_release_notes_version (window), ==, "1.0");
--  g_assert_cmpstr (adw_about_window_get_version (window), ==, "1.0");
--  g_assert_cmpstr (adw_about_window_get_application_icon (window), ==, "org.gnome.Adwaita1.Test");
--  g_assert_cmpstr (adw_about_window_get_application_name (window), ==, "Adwaita Test");
--  g_assert_cmpstr (adw_about_window_get_developer_name (window), ==, "The GNOME Project");
--  g_assert_cmpstr (adw_about_window_get_issue_url (window), ==, "https://gitlab.gnome.org/GNOME/libadwaita/issues");
--  g_assert_cmpstr (adw_about_window_get_support_url (window), ==, "http://www.gnome.org/friends/");
--  g_assert_cmpstr (adw_about_window_get_website (window), ==, "https://gitlab.gnome.org/GNOME/libadwaita");
--  g_assert_cmpuint (adw_about_window_get_license_type (window), ==, GTK_LICENSE_LGPL_2_1);
--
--  g_assert_finalize_object (window);
--
--  window = ADW_ABOUT_WINDOW (adw_about_window_new_from_appdata ("/org/gnome/Adwaita1/Test/org.gnome.Adwaita1.Test.metainfo.xml", "0.1"));
--
--  g_assert_nonnull (window);
--
--  g_assert_cmpstr (adw_about_window_get_release_notes (window), ==, "<p>Testing Build Older</p>\n");
--  g_assert_cmpstr (adw_about_window_get_release_notes_version (window), ==, "0.1");
--  g_assert_cmpstr (adw_about_window_get_version (window), ==, "1.0");
--
--  g_assert_finalize_object (window);
--
--  window = ADW_ABOUT_WINDOW (adw_about_window_new_from_appdata ("/org/gnome/Adwaita1/Test/org.gnome.Adwaita1.Test.metainfo.xml", NULL));
--
--  g_assert_nonnull (window);
--
--  g_assert_cmpstr (adw_about_window_get_release_notes (window), ==, "");
--  g_assert_cmpstr (adw_about_window_get_release_notes_version (window), ==, "");
--  g_assert_cmpstr (adw_about_window_get_version (window), ==, "1.0");
--
--  g_assert_finalize_object (window);
--}
--
- static void
- test_adw_about_window_create (void)
- {
-@@ -143,16 +100,10 @@
- main (int   argc,
-       char *argv[])
- {
--  GResource *test_resources;
--
-   gtk_test_init (&argc, &argv, NULL);
-   adw_init ();
- 
--  test_resources = test_get_resource ();
--  g_resources_register (test_resources);
--
-   g_test_add_func ("/Adwaita/AboutWindow/create", test_adw_about_window_create);
--  g_test_add_func ("/Adwaita/AboutWindow/from_appdata", test_adw_about_window_from_appdata);
- 
-   return g_test_run ();
- }
-Index: tests/meson.build
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/tests/meson.build b/tests/meson.build
---- a/tests/meson.build	(revision d63f6356a13374b834a9b4a674d6516f34f3aa10)
-+++ b/tests/meson.build	(date 1716642545250)
-@@ -2,13 +2,6 @@
- 
- subdir('manual')
- 
--test_resources = gnome.compile_resources(
--   'adwaita-test-resources',
--   'tests.gresources.xml',
--
--   c_name: 'test',
--)
--
- test_env = [
-   'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()),
-   'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()),
-@@ -21,6 +14,7 @@
- 
- test_cflags = [
-   '-DADW_LOG_DOMAIN="Adwaita"',
-+  '-DTEST_DATA_DIR="@0@/data"'.format(meson.current_source_dir()),
- ]
- 
- test_link_args = []
-@@ -87,13 +81,7 @@
- ]
- 
- foreach test_name : test_names
--  test_sources = [
--    test_name + '.c',
--    test_resources,
--    libadwaita_generated_headers
--  ]
+-  window = adw_about_window_new_from_appdata (resource_path,
+-                                              release_notes_version);
 -
--  t = executable(test_name, test_sources,
-+  t = executable(test_name, [test_name + '.c'] + libadwaita_generated_headers,
-                        c_args: test_cflags,
-                     link_args: test_link_args,
-                  dependencies: libadwaita_deps + [libadwaita_dep],
+-  va_start (var_args, first_property_name);
+-  g_object_set_valist (G_OBJECT (window), first_property_name, var_args);
+-  va_end (var_args);
+-
+-  if (parent)
+-    gtk_window_set_transient_for (GTK_WINDOW (window), parent);
+-
+-  gtk_window_present (GTK_WINDOW (window));
+-}
 Index: demo/adwaita-demo.gresources.xml
 IDEA additional info:
 Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
 <+>UTF-8
 ===================================================================
 diff --git a/demo/adwaita-demo.gresources.xml b/demo/adwaita-demo.gresources.xml
---- a/demo/adwaita-demo.gresources.xml	(revision d63f6356a13374b834a9b4a674d6516f34f3aa10)
-+++ b/demo/adwaita-demo.gresources.xml	(date 1716642545044)
+--- a/demo/adwaita-demo.gresources.xml	(revision 42b47f0438fc2b24910c58e00bd2bd970b499379)
++++ b/demo/adwaita-demo.gresources.xml	(date 1726337208007)
 @@ -3,7 +3,6 @@
    <gresource prefix="/org/gnome/Adwaita1/Demo">
      <file preprocess="xml-stripblanks" alias="icons/scalable/apps/org.gnome.Adwaita1.Demo.svg">data/org.gnome.Adwaita1.Demo.svg</file>
@@ -644,76 +540,49 @@ diff --git a/demo/adwaita-demo.gresources.xml b/demo/adwaita-demo.gresources.xml
      <file preprocess="xml-stripblanks">icons/scalable/actions/avatar-delete-symbolic.svg</file>
      <file preprocess="xml-stripblanks">icons/scalable/actions/avatar-save-symbolic.svg</file>
      <file preprocess="xml-stripblanks">icons/scalable/actions/clock-alarm-symbolic.svg</file>
-Index: src/adw-about-window.c
+Index: demo/meson.build
 IDEA additional info:
 Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
 <+>UTF-8
 ===================================================================
-diff --git a/src/adw-about-window.c b/src/adw-about-window.c
---- a/src/adw-about-window.c	(revision d63f6356a13374b834a9b4a674d6516f34f3aa10)
-+++ b/src/adw-about-window.c	(date 1716669139820)
-@@ -6,7 +6,6 @@
+diff --git a/demo/meson.build b/demo/meson.build
+--- a/demo/meson.build	(revision 42b47f0438fc2b24910c58e00bd2bd970b499379)
++++ b/demo/meson.build	(date 1726337208016)
+@@ -3,7 +3,6 @@
+ subdir('data')
+ 
+ demo_config_data = configuration_data()
+-demo_config_data.set_quoted('ADW_METAINFO', appstream_file.full_path())
+ demo_config_data.set_quoted('ADW_DEMO_VCS_TAG', '@VCS_TAG@')
+ 
+ demo_config_h = vcs_tag(
+@@ -19,8 +18,6 @@
+    'adwaita-demo.gresources.xml',
+ 
+    c_name: 'adw',
+-   dependencies: appstream_file,
+-   source_dir: meson.current_build_dir(),
+ )
+ 
+ adwaita_demo_sources = [
+Index: src/adw-about-dialog.c
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/src/adw-about-dialog.c b/src/adw-about-dialog.c
+--- a/src/adw-about-dialog.c	(revision 42b47f0438fc2b24910c58e00bd2bd970b499379)
++++ b/src/adw-about-dialog.c	(date 1726337233258)
+@@ -7,7 +7,6 @@
  
  #include "config.h"
  #include <glib/gi18n-lib.h>
 -#include <appstream.h>
  
- #include "adw-about-window.h"
- 
-@@ -194,32 +193,31 @@
- typedef struct {
-   const char *name;
-   const char *url;
--  const char *spdx_id;
- } LicenseInfo;
+ #include "adw-about-dialog.h"
  
- /* Copied from GTK 4 for consistency with GtkAboutDialog. */
- /* LicenseInfo for each GtkLicense type; keep in the same order as the
-  * enumeration. */
- static const LicenseInfo gtk_license_info [] = {
--  { NULL, NULL, NULL },
--  { NULL, NULL, NULL },
--  { N_("GNU General Public License, version 2 or later"), "https://www.gnu.org/licenses/old-licenses/gpl-2.0.html", "GPL-2.0-or-later" },
--  { N_("GNU General Public License, version 3 or later"), "https://www.gnu.org/licenses/gpl-3.0.html", "GPL-3.0-or-later" },
--  { N_("GNU Lesser General Public License, version 2.1 or later"), "https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html", "LGPL-2.1-or-later" },
--  { N_("GNU Lesser General Public License, version 3 or later"), "https://www.gnu.org/licenses/lgpl-3.0.html", "LGPL-3.0-or-later" },
--  { N_("BSD 2-Clause License"), "https://opensource.org/licenses/bsd-license.php", "BSD-2-Clause" },
--  { N_("The MIT License (MIT)"), "https://opensource.org/licenses/mit-license.php", "MIT" },
--  { N_("Artistic License 2.0"), "https://opensource.org/licenses/artistic-license-2.0.php", "Artistic-2.0" },
--  { N_("GNU General Public License, version 2 only"), "https://www.gnu.org/licenses/old-licenses/gpl-2.0.html", "GPL-2.0" },
--  { N_("GNU General Public License, version 3 only"), "https://www.gnu.org/licenses/gpl-3.0.html", "GPL-3.0" },
--  { N_("GNU Lesser General Public License, version 2.1 only"), "https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html", "LGPL-2.1-only" },
--  { N_("GNU Lesser General Public License, version 3 only"), "https://www.gnu.org/licenses/lgpl-3.0.html", "LGPL-3.0-only" },
--  { N_("GNU Affero General Public License, version 3 or later"), "https://www.gnu.org/licenses/agpl-3.0.html", "AGPL-3.0-or-later" },
--  { N_("GNU Affero General Public License, version 3 only"), "https://www.gnu.org/licenses/agpl-3.0.html", "AGPL-3.0-only" },
--  { N_("BSD 3-Clause License"), "https://opensource.org/licenses/BSD-3-Clause", "BSD-3-Clause" },
--  { N_("Apache License, Version 2.0"), "https://opensource.org/licenses/Apache-2.0", "Apache-2.0" },
--  { N_("Mozilla Public License 2.0"), "https://opensource.org/licenses/MPL-2.0", "MPL-2.0" },
--  { N_("BSD Zero-Clause License"), "https://opensource.org/license/0bsd", "0BSD" }
-+  { NULL, NULL },
-+  { NULL, NULL },
-+  { N_("GNU General Public License, version 2 or later"), "https://www.gnu.org/licenses/old-licenses/gpl-2.0.html" },
-+  { N_("GNU General Public License, version 3 or later"), "https://www.gnu.org/licenses/gpl-3.0.html" },
-+  { N_("GNU Lesser General Public License, version 2.1 or later"), "https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html" },
-+  { N_("GNU Lesser General Public License, version 3 or later"), "https://www.gnu.org/licenses/lgpl-3.0.html" },
-+  { N_("BSD 2-Clause License"), "https://opensource.org/licenses/bsd-license.php" },
-+  { N_("The MIT License (MIT)"), "https://opensource.org/licenses/mit-license.php" },
-+  { N_("Artistic License 2.0"), "https://opensource.org/licenses/artistic-license-2.0.php" },
-+  { N_("GNU General Public License, version 2 only"), "https://www.gnu.org/licenses/old-licenses/gpl-2.0.html" },
-+  { N_("GNU General Public License, version 3 only"), "https://www.gnu.org/licenses/gpl-3.0.html" },
-+  { N_("GNU Lesser General Public License, version 2.1 only"), "https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html" },
-+  { N_("GNU Lesser General Public License, version 3 only"), "https://www.gnu.org/licenses/lgpl-3.0.html" },
-+  { N_("GNU Affero General Public License, version 3 or later"), "https://www.gnu.org/licenses/agpl-3.0.html" },
-+  { N_("GNU Affero General Public License, version 3 only"), "https://www.gnu.org/licenses/agpl-3.0.html" },
-+  { N_("BSD 3-Clause License"), "https://opensource.org/licenses/BSD-3-Clause" },
-+  { N_("Apache License, Version 2.0"), "https://opensource.org/licenses/Apache-2.0" },
-+  { N_("Mozilla Public License 2.0"), "https://opensource.org/licenses/MPL-2.0" },
-+  { N_("BSD Zero-Clause License"), "https://opensource.org/license/0bsd" }
- };
- /* Copied from GTK 4 for consistency with GtkAboutDialog. */
- /* Keep this static assertion updated with the last element of the enumeration,
-@@ -409,13 +407,6 @@
-     g_idle_add_once ((GSourceOnceFunc) legal_showing_idle_cb, self);
+@@ -422,13 +421,6 @@
+   self->legal_showing_idle_id = 0;
  }
  
 -static gboolean
@@ -724,48 +593,48 @@ diff --git a/src/adw-about-window.c b/src/adw-about-window.c
 -}
 -
  static void
- update_credits_legal_group (AdwAboutWindow *self)
+ update_credits_legal_group (AdwAboutDialog *self)
  {
-@@ -1952,180 +1943,6 @@
-   return g_object_new (ADW_TYPE_ABOUT_WINDOW, NULL);
+@@ -1964,188 +1956,6 @@
+   return g_object_new (ADW_TYPE_ABOUT_DIALOG, NULL);
  }
  
 -/**
-- * adw_about_window_new_from_appdata:
+- * adw_about_dialog_new_from_appdata:
 - * @resource_path: The resource to use
 - * @release_notes_version: (nullable): The version to retrieve release notes for
 - *
-- * Creates a new `AdwAboutWindow` using AppStream metadata.
+- * Creates a new `AdwAboutDialog` using AppStream metadata.
 - *
 - * This automatically sets the following properties with the following AppStream
 - * values:
 - *
-- * * [property@AboutWindow:application-icon] is set from the `<id>`
-- * * [property@AboutWindow:application-name] is set from the `<name>`
-- * * [property@AboutWindow:developer-name] is set from the `<name>` within
+- * * [property@AboutDialog:application-icon] is set from the `<id>`
+- * * [property@AboutDialog:application-name] is set from the `<name>`
+- * * [property@AboutDialog:developer-name] is set from the `<name>` within
 - *      `<developer>`
-- * * [property@AboutWindow:version] is set from the version of the latest release
-- * * [property@AboutWindow:website] is set from the `<url type="homepage">`
-- * * [property@AboutWindow:support-url] is set from the `<url type="help">`
-- * * [property@AboutWindow:issue-url] is set from the `<url type="bugtracker">`
-- * * [property@AboutWindow:license-type] is set from the `<project_license>`.
+- * * [property@AboutDialog:version] is set from the version of the latest release
+- * * [property@AboutDialog:website] is set from the `<url type="homepage">`
+- * * [property@AboutDialog:support-url] is set from the `<url type="help">`
+- * * [property@AboutDialog:issue-url] is set from the `<url type="bugtracker">`
+- * * [property@AboutDialog:license-type] is set from the `<project_license>`.
 - *     If the license type retrieved from AppStream is not listed in
 - *     [enum@Gtk.License], it will be set to `GTK_LICENCE_CUSTOM`.
 - *
 - * If @release_notes_version is not `NULL`,
-- * [property@AboutWindow:release-notes-version] is set to match it, while
-- * [property@AboutWindow:release-notes] is set from the AppStream release
+- * [property@AboutDialog:release-notes-version] is set to match it, while
+- * [property@AboutDialog:release-notes] is set from the AppStream release
 - * description for that version.
 - *
-- * Returns: the newly created `AdwAboutWindow`
+- * Returns: the newly created `AdwAboutDialog`
 - *
-- * Since: 1.4
+- * Since: 1.5
 - */
--GtkWidget *
--adw_about_window_new_from_appdata (const char *resource_path,
+-AdwDialog *
+-adw_about_dialog_new_from_appdata (const char *resource_path,
 -                                   const char *release_notes_version)
 -{
--  AdwAboutWindow *self;
+-  AdwAboutDialog *self;
 -  GFile *appdata_file;
 -  char *appdata_uri;
 -  AsMetadata *metadata;
@@ -781,7 +650,7 @@ diff --git a/src/adw-about-window.c b/src/adw-about-window.c
 -  appdata_uri = g_strconcat ("resource://", resource_path, NULL);
 -  appdata_file = g_file_new_for_uri (appdata_uri);
 -
--  self = ADW_ABOUT_WINDOW (adw_about_window_new ());
+-  self = ADW_ABOUT_DIALOG (adw_about_dialog_new ());
 -  metadata = as_metadata_new ();
 -
 -  if (!as_metadata_parse_file (metadata, appdata_file, AS_FORMAT_KIND_UNKNOWN, &error)) {
@@ -837,8 +706,8 @@ diff --git a/src/adw-about-window.c b/src/adw-about-window.c
 -      version = as_release_get_version (notes_release);
 -
 -      if (release_notes && version) {
--        adw_about_window_set_release_notes (self, release_notes);
--        adw_about_window_set_release_notes_version (self, version);
+-        adw_about_dialog_set_release_notes (self, release_notes);
+-        adw_about_dialog_set_release_notes_version (self, version);
 -      }
 -    } else {
 -      g_critical ("No valid release found for version %s", release_notes_version);
@@ -850,7 +719,7 @@ diff --git a/src/adw-about-window.c b/src/adw-about-window.c
 -    const char *version = as_release_get_version (latest_release);
 -
 -    if (version)
--      adw_about_window_set_version (self, version);
+-      adw_about_dialog_set_version (self, version);
 -  }
 -
 -  name = as_component_get_name (component);
@@ -865,131 +734,115 @@ diff --git a/src/adw-about-window.c b/src/adw-about-window.c
 -  developer_name = as_component_get_developer_name (component);
 -#endif
 -
--  adw_about_window_set_application_icon (self, application_id);
+-  adw_about_dialog_set_application_icon (self, application_id);
 -
 -  if (name)
--    adw_about_window_set_application_name (self, name);
+-    adw_about_dialog_set_application_name (self, name);
 -
 -  if (developer_name)
--    adw_about_window_set_developer_name (self, developer_name);
+-    adw_about_dialog_set_developer_name (self, developer_name);
 -
 -  if (project_license) {
 -    int i;
 -
 -    for (i = 0; i < G_N_ELEMENTS (gtk_license_info); i++) {
 -      if (g_strcmp0 (gtk_license_info[i].spdx_id, project_license) == 0) {
--        adw_about_window_set_license_type (self, (GtkLicense) i);
+-        adw_about_dialog_set_license_type (self, (GtkLicense) i);
 -        break;
 -      }
 -    }
 -
--    if (adw_about_window_get_license_type (self) == GTK_LICENSE_UNKNOWN)
--      adw_about_window_set_license_type (self, GTK_LICENSE_CUSTOM);
+-    /* Handle deprecated SPDX IDs */
+-    for (i = 0; i < G_N_ELEMENTS (license_aliases); i++) {
+-      if (g_strcmp0 (license_aliases[i].spdx_id, project_license) == 0) {
+-        adw_about_dialog_set_license_type (self, license_aliases[i].license);
+-        break;
+-      }
+-    }
+-
+-    if (adw_about_dialog_get_license_type (self) == GTK_LICENSE_UNKNOWN)
+-      adw_about_dialog_set_license_type (self, GTK_LICENSE_CUSTOM);
 -  }
 -
 -  if (issue_url)
--    adw_about_window_set_issue_url (self, issue_url);
+-    adw_about_dialog_set_issue_url (self, issue_url);
 -
 -  if (support_url)
--    adw_about_window_set_support_url (self, support_url);
+-    adw_about_dialog_set_support_url (self, support_url);
 -
 -  if (website_url)
--    adw_about_window_set_website (self, website_url);
+-    adw_about_dialog_set_website (self, website_url);
 -
 -  g_object_unref (appdata_file);
 -  g_object_unref (metadata);
 -  g_free (application_id);
 -  g_free (appdata_uri);
 -
--  return GTK_WIDGET (self);
+-  return ADW_DIALOG (self);
 -}
 -
  /**
-  * adw_about_window_get_application_icon: (attributes org.gtk.Method.get_property=application-icon)
-  * @self: an about window
-@@ -3423,42 +3240,3 @@
+  * adw_about_dialog_get_application_icon:
+  * @self: an about dialog
+@@ -3440,43 +3250,4 @@
+   g_object_set_valist (G_OBJECT (dialog), first_property_name, var_args);
+   va_end (var_args);
  
-   gtk_window_present (GTK_WINDOW (window));
- }
+-  adw_dialog_present (dialog, parent);
+-}
 -
 -/**
-- * adw_show_about_window_from_appdata: (skip)
-- * @parent: (nullable): the parent top-level window
+- * adw_show_about_dialog_from_appdata: (skip)
+- * @parent: the parent widget
 - * @resource_path: The resource to use
 - * @release_notes_version: (nullable): The version to retrieve release notes for
 - * @first_property_name: the name of the first property
 - * @...: value of first property, followed by more pairs of property name and
 - *   value, `NULL`-terminated
 - *
-- * A convenience function for showing an application’s about window from
+- * A convenience function for showing an application’s about dialog from
 - * AppStream metadata.
 - *
-- * See [ctor@AboutWindow.new_from_appdata] for details.
+- * See [ctor@AboutDialog.new_from_appdata] for details.
 - *
-- * Since: 1.4
+- * Since: 1.5
 - */
 -void
--adw_show_about_window_from_appdata (GtkWindow  *parent,
+-adw_show_about_dialog_from_appdata (GtkWidget  *parent,
 -                                    const char *resource_path,
 -                                    const char *release_notes_version,
 -                                    const char *first_property_name,
 -                                    ...)
 -{
--  GtkWidget *window;
+-  AdwDialog *dialog;
 -  va_list var_args;
 -
--  window = adw_about_window_new_from_appdata (resource_path,
+-  g_return_if_fail (GTK_IS_WIDGET (parent));
+-
+-  dialog = adw_about_dialog_new_from_appdata (resource_path,
 -                                              release_notes_version);
 -
 -  va_start (var_args, first_property_name);
--  g_object_set_valist (G_OBJECT (window), first_property_name, var_args);
+-  g_object_set_valist (G_OBJECT (dialog), first_property_name, var_args);
 -  va_end (var_args);
 -
--  if (parent)
--    gtk_window_set_transient_for (GTK_WINDOW (window), parent);
--
--  gtk_window_present (GTK_WINDOW (window));
--}
-Index: demo/meson.build
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/demo/meson.build b/demo/meson.build
---- a/demo/meson.build	(revision d63f6356a13374b834a9b4a674d6516f34f3aa10)
-+++ b/demo/meson.build	(date 1716642545055)
-@@ -3,7 +3,6 @@
- subdir('data')
- 
- demo_config_data = configuration_data()
--demo_config_data.set_quoted('ADW_METAINFO', appstream_file.full_path())
- demo_config_data.set_quoted('ADW_DEMO_VCS_TAG', '@VCS_TAG@')
- 
- demo_config_h = vcs_tag(
-@@ -19,8 +18,6 @@
-    'adwaita-demo.gresources.xml',
- 
-    c_name: 'adw',
--   dependencies: appstream_file,
--   source_dir: meson.current_build_dir(),
- )
- 
- adwaita_demo_sources = [
+-  adw_dialog_present (dialog, parent);
+ }
 Index: demo/adwaita-demo.c
 IDEA additional info:
 Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
 <+>UTF-8
 ===================================================================
 diff --git a/demo/adwaita-demo.c b/demo/adwaita-demo.c
---- a/demo/adwaita-demo.c	(revision d63f6356a13374b834a9b4a674d6516f34f3aa10)
-+++ b/demo/adwaita-demo.c	(date 1716642545029)
+--- a/demo/adwaita-demo.c	(revision 42b47f0438fc2b24910c58e00bd2bd970b499379)
++++ b/demo/adwaita-demo.c	(date 1726337207957)
 @@ -1,5 +1,3 @@
 -#include "config.h"
 -
  #include <glib/gi18n.h>
  #include <gtk/gtk.h>
  #include <adwaita.h>
-@@ -57,15 +55,23 @@
+@@ -56,15 +54,23 @@
  
    debug_info = adw_demo_generate_debug_info ();
  
@@ -997,7 +850,7 @@ diff --git a/demo/adwaita-demo.c b/demo/adwaita-demo.c
 -  adw_about_dialog_set_version (ADW_ABOUT_DIALOG (about), ADW_VERSION_S);
 -  adw_about_dialog_set_debug_info (ADW_ABOUT_DIALOG (about), debug_info);
 -  adw_about_dialog_set_debug_info_filename (ADW_ABOUT_DIALOG (about), "adwaita-1-demo-debug-info.txt");
--  adw_about_dialog_set_copyright (ADW_ABOUT_DIALOG (about), "© 2017–2022 Purism SPC");
+-  adw_about_dialog_set_copyright (ADW_ABOUT_DIALOG (about), "© 2017–2022 Purism SPC\n© 2023-2024 GNOME Foundation Inc.");
 -  adw_about_dialog_set_developers (ADW_ABOUT_DIALOG (about), developers);
 -  adw_about_dialog_set_designers (ADW_ABOUT_DIALOG (about), designers);
 -  adw_about_dialog_set_artists (ADW_ABOUT_DIALOG (about), designers);
@@ -1022,3 +875,95 @@ diff --git a/demo/adwaita-demo.c b/demo/adwaita-demo.c
  
    adw_about_dialog_add_link (ADW_ABOUT_DIALOG (about),
                               _("_Documentation"),
+Index: tests/meson.build
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/tests/meson.build b/tests/meson.build
+--- a/tests/meson.build	(revision 42b47f0438fc2b24910c58e00bd2bd970b499379)
++++ b/tests/meson.build	(date 1726337776151)
+@@ -2,13 +2,6 @@
+ 
+ subdir('manual')
+ 
+-test_resources = gnome.compile_resources(
+-   'adwaita-test-resources',
+-   'tests.gresources.xml',
+-
+-   c_name: 'test',
+-)
+-
+ test_env = [
+   'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()),
+   'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()),
+@@ -21,6 +14,7 @@
+ 
+ test_cflags = [
+   '-DADW_LOG_DOMAIN="Adwaita"',
++  '-DTEST_DATA_DIR="@0@/data"'.format(meson.current_source_dir()),
+ ]
+ 
+ test_link_args = []
+@@ -94,13 +88,7 @@
+ ]
+ 
+ foreach test_name : test_names
+-  test_sources = [
+-    test_name + '.c',
+-    test_resources,
+-    libadwaita_generated_headers
+-  ]
+-
+-  t = executable(test_name, test_sources,
++  t = executable(test_name, [test_name + '.c'] + libadwaita_generated_headers,
+                        c_args: test_cflags,
+                     link_args: test_link_args,
+                  dependencies: libadwaita_deps + [libadwaita_internal_dep],
+Index: src/adw-about-dialog.h
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/src/adw-about-dialog.h b/src/adw-about-dialog.h
+--- a/src/adw-about-dialog.h	(revision 42b47f0438fc2b24910c58e00bd2bd970b499379)
++++ b/src/adw-about-dialog.h	(date 1726337233304)
+@@ -178,11 +178,4 @@
+                             const char *first_property_name,
+                             ...) G_GNUC_NULL_TERMINATED;
+ 
+-ADW_AVAILABLE_IN_1_5
+-void adw_show_about_dialog_from_appdata (GtkWidget  *parent,
+-                                         const char *resource_path,
+-                                         const char *release_notes_version,
+-                                         const char *first_property_name,
+-                                         ...) G_GNUC_NULL_TERMINATED;
+-
+ G_END_DECLS
+Index: demo/data/meson.build
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/demo/data/meson.build b/demo/data/meson.build
+--- a/demo/data/meson.build	(revision 42b47f0438fc2b24910c58e00bd2bd970b499379)
++++ b/demo/data/meson.build	(date 1726341703583)
+@@ -35,18 +35,6 @@
+ appdata_config.set('BUILD_VERSION', meson.project_version())
+ appdata_config.set('BUILD_DATE', today)
+ 
+-appstream_file = i18n.merge_file(
+-  input: configure_file(
+-    input: 'org.gnome.Adwaita1.Demo.metainfo.xml.in.in',
+-    output: 'org.gnome.Adwaita1.Demo.metainfo.xml.in',
+-    configuration: appdata_config
+-  ),
+-  output: 'org.gnome.Adwaita1.Demo.metainfo.xml',
+-  po_dir: '../../po',
+-  install: true,
+-  install_dir: datadir / 'metainfo'
+-)
+-
+ appstreamcli = find_program('appstreamcli', required: false)
+ if appstreamcli.found()
+   test('Validate appstream file', appstreamcli,
diff --git a/gvsbuild/projects/libadwaita.py b/gvsbuild/projects/libadwaita.py
index 60dfbf361..1102dfdbc 100644
--- a/gvsbuild/projects/libadwaita.py
+++ b/gvsbuild/projects/libadwaita.py
@@ -25,9 +25,9 @@ def __init__(self):
             self,
             "libadwaita",
             repository="https://gitlab.gnome.org/GNOME/libadwaita",
-            version="1.5.3",
+            version="1.6.0",
             archive_url="https://download.gnome.org/sources/libadwaita/{major}.{minor}/libadwaita-{version}.tar.xz",
-            hash="3b358635f7ea455d9fe75101373e34d2fba130d1590bd1a1c87ab1ccfba05f32",
+            hash="9ed783934cb99c9101639194e1fc072cb09303b8f3c2fc6623390186a9dad8d3",
             dependencies=[
                 "ninja",
                 "meson",
@@ -48,6 +48,8 @@ def __init__(self):
         self.add_param(f"-Dintrospection={gir}")
         self.add_param("-Dgtk_doc=false")
         self.add_param("-Dvapi=false")
+        # https://gitlab.gnome.org/GNOME/libadwaita/-/issues/931
+        self.add_param("-Dtests=false")
 
     def build(self, **kwargs):
         Meson.build(self)

From be17fee4c0c38af230986cfcf5cffcc8ead4722b Mon Sep 17 00:00:00 2001
From: Dan Yeaw <dan@yeaw.me>
Date: Sat, 14 Sep 2024 16:09:21 -0400
Subject: [PATCH 05/14] Update gtkmm to version 4.16.0

---
 gvsbuild/projects/gtkmm.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gvsbuild/projects/gtkmm.py b/gvsbuild/projects/gtkmm.py
index 56e4aeb1b..7b871433e 100644
--- a/gvsbuild/projects/gtkmm.py
+++ b/gvsbuild/projects/gtkmm.py
@@ -25,12 +25,12 @@ def __init__(self):
             self,
             "gtkmm",
             prj_dir="gtkmm",
-            version="4.14.0",
+            version="4.16.0",
             lastversion_major=4,
             lastversion_even=True,
             repository="https://gitlab.gnome.org/GNOME/gtkmm",
             archive_url="https://download.gnome.org/sources/gtkmm/{major}.{minor}/gtkmm-{version}.tar.xz",
-            hash="9350a0444b744ca3dc69586ebd1b6707520922b6d9f4f232103ce603a271ecda",
+            hash="3b23fd3abf8fb223b00e9983b6010af2db80e38c89ab6994b8b6230aa85d60f9",
             dependencies=[
                 "gdk-pixbuf",
                 "pangomm",

From b078e9a68dfa529b3772eedb2352e702788b51a0 Mon Sep 17 00:00:00 2001
From: Dan Yeaw <dan@yeaw.me>
Date: Sat, 14 Sep 2024 17:07:40 -0400
Subject: [PATCH 06/14] Update libpng to version 1.6.44

---
 gvsbuild/projects/libpng.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gvsbuild/projects/libpng.py b/gvsbuild/projects/libpng.py
index 6ef944028..66d064399 100644
--- a/gvsbuild/projects/libpng.py
+++ b/gvsbuild/projects/libpng.py
@@ -24,11 +24,11 @@ def __init__(self):
         Project.__init__(
             self,
             "libpng",
-            version="1.6.43",
+            version="1.6.44",
             repository="https://github.com/pnggroup/libpng",
             archive_url="https://github.com/pnggroup/libpng/archive/v{version}.tar.gz",
             archive_filename="libpng-{version}.tar.gz",
-            hash="fecc95b46cf05e8e3fc8a414750e0ba5aad00d89e9fdf175e94ff041caf1a03a",
+            hash="0ef5b633d0c65f780c4fced27ff832998e71478c13b45dfb6e94f23a82f64f7c",
             dependencies=["cmake", "ninja", "zlib"],
         )
 

From 838bb713c13861cf0f3a3a696865f6b71657c0e2 Mon Sep 17 00:00:00 2001
From: Dan Yeaw <dan@yeaw.me>
Date: Sat, 14 Sep 2024 17:08:19 -0400
Subject: [PATCH 07/14] Update libpanel to version 1.8.0

---
 gvsbuild/projects/libpanel.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gvsbuild/projects/libpanel.py b/gvsbuild/projects/libpanel.py
index 97e715af4..4b282fb8b 100644
--- a/gvsbuild/projects/libpanel.py
+++ b/gvsbuild/projects/libpanel.py
@@ -25,10 +25,10 @@ def __init__(self):
             self,
             "libpanel",
             repository="https://gitlab.gnome.org/GNOME/libpanel",
-            version="1.7.0",
+            version="1.8.0",
             lastversion_even=True,
             archive_url="https://download.gnome.org/sources/libpanel/{major}.{minor}/libpanel-{version}.tar.xz",
-            hash="3ab29489f320d07dd032c7481999ba14eddae3ae19bb1c7e9fc2cc67051e1fda",
+            hash="5a9b6b54452fa1903a2fd64ba62278ef94b9b11659b7e1a5fda3518b66cd39c3",
             dependencies=[
                 "ninja",
                 "meson",

From 5573c88b8164e7f6be2ae211fe63e7713af3c46e Mon Sep 17 00:00:00 2001
From: Dan Yeaw <dan@yeaw.me>
Date: Sun, 15 Sep 2024 20:16:49 -0400
Subject: [PATCH 08/14] Update gtksourceview to version 5.14.0

---
 gvsbuild/projects/gtksourceview.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gvsbuild/projects/gtksourceview.py b/gvsbuild/projects/gtksourceview.py
index 23d7a4255..aa030445e 100644
--- a/gvsbuild/projects/gtksourceview.py
+++ b/gvsbuild/projects/gtksourceview.py
@@ -49,12 +49,12 @@ def __init__(self):
         Project.__init__(
             self,
             "gtksourceview5",
-            version="5.12.1",
+            version="5.14.0",
             lastversion_major=5,
             lastversion_even=True,
             repository="https://gitlab.gnome.org/GNOME/gtksourceview",
             archive_url="https://download.gnome.org/sources/gtksourceview/{major}.{minor}/gtksourceview-{version}.tar.xz",
-            hash="84c82aad985c5aadae7cea7804904a76341ec82b268d46594c1a478f39b42c1f",
+            hash="c40d1f7309d111f5805fec47c1fead519c4b8d506317ce5e90013ce47d65e9c6",
             dependencies=["meson", "ninja", "gtk4", "pkgconf", "libxml2"],
             patches=[],
         )

From db183ea752f731e1b4f43a6d9bfb43a1d9ab57e8 Mon Sep 17 00:00:00 2001
From: Dan Yeaw <dan@yeaw.me>
Date: Sun, 15 Sep 2024 20:18:19 -0400
Subject: [PATCH 09/14] Update PyGObject to version 3.50.0

---
 gvsbuild/projects/pygobject.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gvsbuild/projects/pygobject.py b/gvsbuild/projects/pygobject.py
index b5876fe85..ff1346aa2 100644
--- a/gvsbuild/projects/pygobject.py
+++ b/gvsbuild/projects/pygobject.py
@@ -26,11 +26,11 @@ def __init__(self):
         Project.__init__(
             self,
             "pygobject",
-            version="3.48.2",
+            version="3.50.0",
             lastversion_even=True,
             repository="https://gitlab.gnome.org/GNOME/pygobject",
             archive_url="https://download.gnome.org/sources/pygobject/{major}.{minor}/pygobject-{version}.tar.xz",
-            hash="0794aeb4a9be31a092ac20621b5f54ec280f9185943d328b105cdae6298ad1a7",
+            hash="8d836e75b5a881d457ee1622cae4a32bcdba28a0ba562193adb3bbb472472212",
             dependencies=["pycairo", "gobject-introspection", "libffi"],
             patches=[
                 "001-pygobject-py38-load-dll.patch",

From 3d75609b442a36898f23b28927217a0129f6eb3f Mon Sep 17 00:00:00 2001
From: Dan Yeaw <dan@yeaw.me>
Date: Sun, 15 Sep 2024 20:29:10 -0400
Subject: [PATCH 10/14] Update gsettings-desktop-schemas to version 47.1

---
 gvsbuild/projects/gsettings_desktop_schemas.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gvsbuild/projects/gsettings_desktop_schemas.py b/gvsbuild/projects/gsettings_desktop_schemas.py
index 466ce267a..b19bfb937 100644
--- a/gvsbuild/projects/gsettings_desktop_schemas.py
+++ b/gvsbuild/projects/gsettings_desktop_schemas.py
@@ -24,10 +24,10 @@ def __init__(self):
         Project.__init__(
             self,
             "gsettings-desktop-schemas",
-            version="46.1",
+            version="47.1",
             repository="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas",
             archive_url="https://download.gnome.org/sources/gsettings-desktop-schemas/{major}/gsettings-desktop-schemas-{version}.tar.xz",
-            hash="9b88101437a6958ebe6bbd812e49bbf1d09cc667011e415559d847e870468a61",
+            hash="a60204d9c9c0a1b264d6d0d134a38340ba5fc6076a34b84da945d8bfcc7a2815",
             dependencies=["meson", "ninja", "pkgconf", "glib"],
         )
         if self.opts.enable_gi:

From bb723d48fb13a1a99d9fa9dbc6316114a74a5fd2 Mon Sep 17 00:00:00 2001
From: Dan Yeaw <dan@yeaw.me>
Date: Sun, 15 Sep 2024 20:32:14 -0400
Subject: [PATCH 11/14] Update gobject-introspection to version 1.82.0

---
 .../002-remove-distutils-msvccompiler.patch   | 81 -------------------
 gvsbuild/projects/gobject_introspection.py    |  6 +-
 2 files changed, 2 insertions(+), 85 deletions(-)
 delete mode 100644 gvsbuild/patches/gobject-introspection/002-remove-distutils-msvccompiler.patch

diff --git a/gvsbuild/patches/gobject-introspection/002-remove-distutils-msvccompiler.patch b/gvsbuild/patches/gobject-introspection/002-remove-distutils-msvccompiler.patch
deleted file mode 100644
index 922512c4f..000000000
--- a/gvsbuild/patches/gobject-introspection/002-remove-distutils-msvccompiler.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py
-index d0ed70a3c4a1a6b7f9029827e87920cb34841334..9a732cd5ee92a99e6c60d76dafd5788a933ad383 100644
---- a/giscanner/ccompiler.py
-+++ b/giscanner/ccompiler.py
-@@ -26,7 +26,6 @@ import tempfile
- import sys
- import distutils
-
--from distutils.msvccompiler import MSVCCompiler
- from distutils.unixccompiler import UnixCCompiler
- from distutils.cygwinccompiler import Mingw32CCompiler
- from distutils.sysconfig import get_config_vars
-@@ -167,7 +166,7 @@ class CCompiler(object):
-         # Now, create the distutils ccompiler instance based on the info we have.
-         if compiler_name == 'msvc':
-             # For MSVC, we need to create a instance of a subclass of distutil's
--            # MSVC9Compiler class, as it does not provide a preprocess()
-+            # MSVCCompiler class, as it does not provide a preprocess()
-             # implementation
-             from . import msvccompiler
-             self.compiler = msvccompiler.get_msvc_compiler()
-@@ -460,7 +459,7 @@ class CCompiler(object):
-             return self.compiler.linker_exe
-
-     def check_is_msvc(self):
--        return isinstance(self.compiler, MSVCCompiler)
-+        return self.compiler.compiler_type == "msvc"
-
-     # Private APIs
-     def _set_cpp_options(self, options):
-@@ -486,7 +485,7 @@ class CCompiler(object):
-                     # macros for compiling using distutils
-                     # get dropped for MSVC builds, so
-                     # escape the escape character.
--                    if isinstance(self.compiler, MSVCCompiler):
-+                    if self.check_is_msvc():
-                         macro_value = macro_value.replace('\"', '\\\"')
-                 macros.append((macro_name, macro_value))
-             elif option.startswith('-U'):
-diff --git a/giscanner/msvccompiler.py b/giscanner/msvccompiler.py
-index 0a543982007d0c813575b16c94709f5c342b4372..e333a80f548e17df8ca158627164ac6fb841cd99 100644
---- a/giscanner/msvccompiler.py
-+++ b/giscanner/msvccompiler.py
-@@ -19,30 +19,30 @@
- #
-
- import os
--import distutils
-+from typing import Type
-
- from distutils.errors import DistutilsExecError, CompileError
--from distutils.ccompiler import CCompiler, gen_preprocess_options
-+from distutils.ccompiler import CCompiler, gen_preprocess_options, new_compiler
- from distutils.dep_util import newer
-
- # Distutil's MSVCCompiler does not provide a preprocess()
- # Implementation, so do our own here.
-
-
-+DistutilsMSVCCompiler: Type = type(new_compiler(compiler="msvc"))
-+
-+
- def get_msvc_compiler():
-     return MSVCCompiler()
-
-
--class MSVCCompiler(distutils.msvccompiler.MSVCCompiler):
-+class MSVCCompiler(DistutilsMSVCCompiler):
-
-     def __init__(self, verbose=0, dry_run=0, force=0):
--        super(distutils.msvccompiler.MSVCCompiler, self).__init__()
-+        super(DistutilsMSVCCompiler, self).__init__()
-         CCompiler.__init__(self, verbose, dry_run, force)
-         self.__paths = []
-         self.__arch = None  # deprecated name
--        if os.name == 'nt':
--            if isinstance(self, distutils.msvc9compiler.MSVCCompiler):
--                self.__version = distutils.msvc9compiler.VERSION
-         self.initialized = False
-         self.preprocess_options = None
-         if self.check_is_clang_cl():
diff --git a/gvsbuild/projects/gobject_introspection.py b/gvsbuild/projects/gobject_introspection.py
index 9042685ce..11ff95d6f 100644
--- a/gvsbuild/projects/gobject_introspection.py
+++ b/gvsbuild/projects/gobject_introspection.py
@@ -28,11 +28,11 @@ def __init__(self):
         Project.__init__(
             self,
             "gobject-introspection",
-            version="1.80.1",
+            version="1.82.0",
             lastversion_even=True,
             repository="https://gitlab.gnome.org/GNOME/gobject-introspection",
             archive_url="https://download.gnome.org/sources/gobject-introspection/{major}.{minor}/gobject-introspection-{version}.tar.xz",
-            hash="a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8",
+            hash="0f5a4c1908424bf26bc41e9361168c363685080fbdb87a196c891c8401ca2f09",
             dependencies=[
                 "ninja",
                 "meson",
@@ -43,8 +43,6 @@ def __init__(self):
             patches=[
                 # https://gitlab.gnome.org/GNOME/gobject-introspection/-/issues/427
                 "001-incorrect-giscanner-path.patch",
-                # https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/490
-                "002-remove-distutils-msvccompiler.patch",
             ],
         )
 

From a63bd53da9981b760541a387cb5d525843f1cb13 Mon Sep 17 00:00:00 2001
From: Dan Yeaw <dan@yeaw.me>
Date: Sun, 15 Sep 2024 20:34:59 -0400
Subject: [PATCH 12/14] Update json-c to version 0.18.20240915

---
 gvsbuild/projects/jsonc.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gvsbuild/projects/jsonc.py b/gvsbuild/projects/jsonc.py
index 774256626..fb9c95cdd 100644
--- a/gvsbuild/projects/jsonc.py
+++ b/gvsbuild/projects/jsonc.py
@@ -24,9 +24,9 @@ def __init__(self):
         Project.__init__(
             self,
             "json-c",
-            version="0.17.20230812",
+            version="0.18.20240915",
             archive_url="https://github.com/json-c/json-c/archive/json-c-{major}.{minor}-{micro}.tar.gz",
-            hash="024d302a3aadcbf9f78735320a6d5aedf8b77876c8ac8bbb95081ca55054c7eb",
+            hash="3112c1f25d39eca661fe3fc663431e130cc6e2f900c081738317fba49d29e298",
         )
 
     def build(self):

From f8df0a6d986bf1ed0bb65e44afc228c37996d2a5 Mon Sep 17 00:00:00 2001
From: Dan Yeaw <dan@yeaw.me>
Date: Sun, 15 Sep 2024 20:35:47 -0400
Subject: [PATCH 13/14] Update libcurl to version 8.10.0

---
 gvsbuild/projects/libcurl.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gvsbuild/projects/libcurl.py b/gvsbuild/projects/libcurl.py
index e4de09850..1be7a69dd 100644
--- a/gvsbuild/projects/libcurl.py
+++ b/gvsbuild/projects/libcurl.py
@@ -27,10 +27,10 @@ def __init__(self):
         Project.__init__(
             self,
             "libcurl",
-            version="8.9.1",
+            version="8.10.0",
             repository="https://github.com/curl/curl",
             archive_url="https://github.com/curl/curl/releases/download/curl-{major}_{minor}_{micro}/curl-{version}.tar.xz",
-            hash="f292f6cc051d5bbabf725ef85d432dfeacc8711dd717ea97612ae590643801e5",
+            hash="e6b142f0e85e954759d37e26a3627e2278137595be80e3a860c4353e4335e5a0",
             dependencies=[
                 "perl",
                 "cmake",

From ebb6a09ef70e995d2ffbeed2d78d5226c80ac72a Mon Sep 17 00:00:00 2001
From: Dan Yeaw <dan@yeaw.me>
Date: Sun, 15 Sep 2024 20:38:22 -0400
Subject: [PATCH 14/14] Update libjpeg-turbo to version 3.0.4

---
 gvsbuild/projects/libjpeg_turbo.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gvsbuild/projects/libjpeg_turbo.py b/gvsbuild/projects/libjpeg_turbo.py
index 7890dcc69..aa2a2398f 100644
--- a/gvsbuild/projects/libjpeg_turbo.py
+++ b/gvsbuild/projects/libjpeg_turbo.py
@@ -24,9 +24,9 @@ def __init__(self):
         Project.__init__(
             self,
             "libjpeg-turbo",
-            version="3.0.3",
+            version="3.0.4",
             archive_url="https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/{version}/libjpeg-turbo-{version}.tar.gz",
-            hash="343e789069fc7afbcdfe44dbba7dbbf45afa98a15150e079a38e60e44578865d",
+            hash="99130559e7d62e8d695f2c0eaeef912c5828d5b84a0537dcb24c9678c9d5b76b",
             dependencies=[
                 "cmake",
                 "ninja",