From 85f3da7d8d4eb2b1ca049536894810a453864626 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Mon, 26 Aug 2024 19:12:43 +0200
Subject: [PATCH] glib2: Update to 2.80.5

---
 glib2/002-fix-build.patch | 13 -------------
 glib2/PKGBUILD            | 12 ++++--------
 2 files changed, 4 insertions(+), 21 deletions(-)
 delete mode 100644 glib2/002-fix-build.patch

diff --git a/glib2/002-fix-build.patch b/glib2/002-fix-build.patch
deleted file mode 100644
index cab4cd311e2..00000000000
--- a/glib2/002-fix-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/glib/glib-private.h b/glib/glib-private.h
-index 7ab2579b0..3318e4c91 100644
---- a/glib/glib-private.h
-+++ b/glib/glib-private.h
-@@ -64,7 +64,7 @@
-  * as we'd like: https://stackoverflow.com/a/11529277/210151 and
-  * https://devblogs.microsoft.com/oldnewthing/20200731-00/?p=104024
-  */
--#elif defined (G_OS_UNIX) && !defined (__APPLE__) && g_macro__has_attribute (weak)
-+#elif defined (G_OS_UNIX) && !defined (__APPLE__) && g_macro__has_attribute (weak) && !defined(__CYGWIN__)
- 
- #define HAS_DYNAMIC_ASAN_LOADING
- 
diff --git a/glib2/PKGBUILD b/glib2/PKGBUILD
index a9475f470c5..5694a119015 100644
--- a/glib2/PKGBUILD
+++ b/glib2/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgbase=glib2
 pkgname=(glib2 glib2-devel)
-pkgver=2.80.4
+pkgver=2.80.5
 pkgrel=1
 pkgdesc="Common C routines used by GTK+ and other libs"
 license=('spdx:LGPL-2.1-or-later')
@@ -24,12 +24,10 @@ makedepends=('gcc'
              'zlib-devel'
              'python-docutils')
 source=(https://download.gnome.org/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz
-        001-gmodule-lib-prefix.patch
-        002-fix-build.patch)
+        001-gmodule-lib-prefix.patch)
 noextract=("glib-$pkgver.tar.xz")
-sha256sums=('24e029c5dfc9b44e4573697adf33078a9827c48938555004b3b9096fa4ea034f'
-            '31bce1aff2dab2262ea372d101081162a77e9310fe0d68400da8c85d698ce65e'
-            '6ce91ebaa164a2ae964e1e5d0d700a70eb4a18c0cee06c48daa22c73561af1dd')
+sha256sums=('9f23a9de803c695bbfde7e37d6626b18b9a83869689dd79019bf3ae66c3e6771'
+            '31bce1aff2dab2262ea372d101081162a77e9310fe0d68400da8c85d698ce65e')
 msys2_references=(
   'cygwin: glib2.0'
   'cpe: cpe:2.3:a:gnome:glib'
@@ -41,8 +39,6 @@ prepare() {
   cd glib-${pkgver}
 
   patch -p1 -i ${srcdir}/001-gmodule-lib-prefix.patch
-  # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4150
-  patch -p1 -i ${srcdir}/002-fix-build.patch
 }
 
 build() {