* update glib2 to 2.80.4-1

glib2/PKGBUILD

@@ -9,8 +9,8 @@ pkgname=(
   glib2-devel
   glib2-docs
 )
-pkgver=2.80.2
-pkgrel=2
+pkgver=2.80.4
+pkgrel=1
 pkgdesc="Low level core library"
 url="https://gitlab.gnome.org/GNOME/glib"
 license=(LGPL-2.1-or-later)
@@ -26,9 +26,10 @@ depends=(
 )
 makedepends=(
   dbus
+  dconf
   gettext
-  git
   gi-docgen
+  git
   gobject-introspection
   libelf
   meson
@@ -49,7 +50,7 @@ source=(
   gio-querymodules.hook
   glib-compile-schemas.hook
 )
-b2sums=('5cee8c7aee08f20b759bb614475a3881f60586d5f388e9c45c670765e03b77916c3d1e27b6e0286f23d779014ba17993400ed4708bcb456a479e43a2e80f6756'
+b2sums=('ec233c9dd6836fb362e45092cd8122757e9faaff2ed910818ecc9e88359777a5935a93f6ed26a649437c9014354bad1cc122716462c92335a280d685cf3ffc71'
         'SKIP'
         '94c73ca7070c239494873dd52d6ee09382bbb5b1201f7afd737cfa140b1a2fb0744b2c2831baf3943d1d072550c35888d21ce6f19f89481ff9d1a60d9a0b30e0'
         '14c9211c0557f6d8d9a914f1b18b7e0e23f79f4abde117cb03ab119b95bf9fa9d7a712aa0a29beb266468aeb352caa3a9e4540503cfc9fe0bbaf764371832a96'
@@ -61,11 +62,6 @@ validpgpkeys=(
 prepare() {
   cd glib
 
-  # https://gitlab.archlinux.org/archlinux/packaging/packages/glib2/-/issues/6
-  # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4073
-  git cherry-pick -n df2c5d925ac4b8f1708bafa5ac1d35acada05d55 \
-                     7a7137838e79e5a98e6f4eab6898e2a0dc6392cd
-
   # Suppress noise from glib-compile-schemas.hook
   git apply -3 ../0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch
 
@@ -118,9 +114,9 @@ package_glib2() {
   )
   provides+=(libg{lib,io,irepository,module,object,thread}-2.0.so)
   optdepends=(
-    'glib2-devel: development files for glib2'
+    'dconf: GSettings storage backend'
+    'glib2-devel: development tools'
     'gvfs: most gio functionality'
-    'libelf: gresource inspection tool'
   )
   options=(staticlibs)