From c2843a5f0e547bc3dc7164cefaad796e33d2ff8b Mon Sep 17 00:00:00 2001
From: Emi Vasilek <emi.vasilek@gmail.com>
Date: Sat, 7 Oct 2023 18:18:42 +0200
Subject: [PATCH] libadwaita: update to 1.4.0.

---
 common/shlibs                                      |  2 +-
 .../libadwaita/patches/disable-broken-tests.patch  | 10 ----------
 srcpkgs/libadwaita/template                        | 14 +++++++-------
 3 files changed, 8 insertions(+), 18 deletions(-)
 delete mode 100644 srcpkgs/libadwaita/patches/disable-broken-tests.patch

diff --git a/common/shlibs b/common/shlibs
index f70ec850d7d..df55cc9311f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3487,7 +3487,7 @@ liburiparser.so.1 uriparser-0.8.6_1
 libcpptest.so.1 cpptest-2.0.0_1
 libhandy-0.0.so.0 libhandy-0.0.3_1
 libhandy-1.so.0 libhandy1-0.90.0_1
-libadwaita-1.so.0 libadwaita-1.0.0alpha2_1
+libadwaita-1.so.0 libadwaita-1.4.0_1
 libswitchboard-2.0.so.0 switchboard-2.3.2_1
 libcodecore.so.0 libio.elementary.code-3.0_1
 libpantheon-files-core.so.6 libio.elementary.files-6.0.0_1
diff --git a/srcpkgs/libadwaita/patches/disable-broken-tests.patch b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
deleted file mode 100644
index dba1ca02114..00000000000
--- a/srcpkgs/libadwaita/patches/disable-broken-tests.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/tests/meson.build
-+++ b/tests/meson.build
-@@ -36,7 +36,6 @@
-   'test-preferences-group',
-   'test-preferences-page',
-   'test-preferences-row',
--  'test-preferences-window',
-   'test-split-button',
-   'test-squeezer',
-   'test-status-page',
diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
index 9957cf5ff38..074f28b4cb8 100644
--- a/srcpkgs/libadwaita/template
+++ b/srcpkgs/libadwaita/template
@@ -1,6 +1,6 @@
 # Template file for 'libadwaita'
 pkgname=libadwaita
-version=1.3.1
+version=1.4.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -8,16 +8,16 @@ configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc)
  $(vopt_bool gir vapi) $(vopt_feature gir introspection)"
 hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gi-docgen)
  $(vopt_if gir vala-devel) gettext sassc"
-makedepends="gtk4-devel libglib-devel harfbuzz-devel"
-checkdepends="xvfb-run cantarell-fonts"
+makedepends="gtk4-devel libglib-devel harfbuzz-devel AppStream-devel"
+checkdepends="xvfb-run cantarell-fonts dbus"
 short_desc="GTK4 building blocks for modern adaptive applications"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
-changelog="https://gitlab.gnome.org/GNOME/libadwaita/-/raw/libadwaita-1-3/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/libadwaita/-/raw/libadwaita-1-4/NEWS"
 distfiles="${GNOME_SITE}/libadwaita/${version%.*}/libadwaita-${version}.tar.xz"
-checksum=6b8bbf413c501b46c8616a0e5b836d7a34091140941412520bbd9ddda6df8cbd
-make_check_pre="xvfb-run"
+checksum=e51a098a54d43568218fc48fcf52e80e36f469b3ce912d8ce9c308a37e9f47c2
+make_check_pre="dbus-run-session xvfb-run"
 
 build_options="gir gtk_doc"
 build_options_default="gir gtk_doc"
@@ -30,7 +30,7 @@ pre_build() {
 }
 
 libadwaita-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} gtk4-devel"
+	depends="${sourcepkg}>=${version}_${revision} gtk4-devel AppStream-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove "usr/lib/*.so"