Update to 2.74.0

3 files changed, 23 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 108a4288cc3a..653a1a6d305c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-glib2
 	pkgdesc = Low level core library (mingw-w64)
-	pkgver = 2.72.3
+	pkgver = 2.74.0
 	pkgrel = 1
 	url = https://wiki.gnome.org/Projects/GLib
 	arch = any
@@ -8,17 +8,16 @@ pkgbase = mingw-w64-glib2
 	makedepends = mingw-w64-meson
 	makedepends = git
 	depends = mingw-w64-libffi
-	depends = mingw-w64-pcre
+	depends = mingw-w64-pcre2
 	depends = mingw-w64-gettext
 	depends = mingw-w64-zlib
 	options = !strip
 	options = !buildflags
 	options = staticlibs
 	options = !emptydirs
-	source = git+https://gitlab.gnome.org/GNOME/glib.git?signed#tag=2.72.3
+	source = git+https://gitlab.gnome.org/GNOME/glib.git#commit=30bd57ecf8aa051de9848ba5a2b140f4810401ff
 	source = 0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch
-	validpgpkeys = 923B7025EE03C1C59F42684CF0942E894B2EAFA0
 	sha256sums = SKIP
-	sha256sums = 38d2a038b39cef7a2452ddf4b04422e17a40745cc9b1fc8297c24320cecca7f9
+	sha256sums = 4e4d59c194dcbd9a88ccc0932b9a0e7e48e7480a2b848af24eeb005fa7c9f246
 
 pkgname = mingw-w64-glib2
diff --git a/0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch b/0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch
index 602e08c0088f..8107fbcc072e 100644
--- a/0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch
+++ b/0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch
@@ -1,12 +1,12 @@
-diff -rupN --no-dereference glib-2.72.0/gio/tests/org.gtk.test.gschema.override.orig glib-2.72.0-new/gio/tests/org.gtk.test.gschema.override.orig
---- glib-2.72.0/gio/tests/org.gtk.test.gschema.override.orig	2022-03-17 16:01:31.000000000 +0100
-+++ glib-2.72.0-new/gio/tests/org.gtk.test.gschema.override.orig	1970-01-01 01:00:00.000000000 +0100
+diff -rupN --no-dereference glib-2.72.2/gio/tests/org.gtk.test.gschema.override.orig glib-2.72.2-new/gio/tests/org.gtk.test.gschema.override.orig
+--- glib-2.72.2/gio/tests/org.gtk.test.gschema.override.orig	2022-05-30 15:26:47.000000000 +0200
++++ glib-2.72.2-new/gio/tests/org.gtk.test.gschema.override.orig	1970-01-01 01:00:00.000000000 +0100
 @@ -1,2 +0,0 @@
 -[org.gtk.test.per-desktop:GNOME-Classic]
 -desktop = "GNOME Classic"
-diff -rupN --no-dereference glib-2.72.0/gio/tests/org.gtk.test.gschema.xml.orig glib-2.72.0-new/gio/tests/org.gtk.test.gschema.xml.orig
---- glib-2.72.0/gio/tests/org.gtk.test.gschema.xml.orig	2022-03-17 16:01:31.000000000 +0100
-+++ glib-2.72.0-new/gio/tests/org.gtk.test.gschema.xml.orig	1970-01-01 01:00:00.000000000 +0100
+diff -rupN --no-dereference glib-2.72.2/gio/tests/org.gtk.test.gschema.xml.orig glib-2.72.2-new/gio/tests/org.gtk.test.gschema.xml.orig
+--- glib-2.72.2/gio/tests/org.gtk.test.gschema.xml.orig	2022-05-30 15:26:47.000000000 +0200
++++ glib-2.72.2-new/gio/tests/org.gtk.test.gschema.xml.orig	1970-01-01 01:00:00.000000000 +0100
 @@ -1,222 +0,0 @@
 -<schemalist>
 -
@@ -230,9 +230,9 @@ diff -rupN --no-dereference glib-2.72.0/gio/tests/org.gtk.test.gschema.xml.orig
 -  </schema>
 -
 -</schemalist>
-diff -rupN --no-dereference glib-2.72.0/glib/gstdio.c glib-2.72.0-new/glib/gstdio.c
---- glib-2.72.0/glib/gstdio.c	2022-03-17 16:01:31.000000000 +0100
-+++ glib-2.72.0-new/glib/gstdio.c	2022-03-28 10:49:45.327804097 +0200
+diff -rupN --no-dereference glib-2.72.2/glib/gstdio.c glib-2.72.2-new/glib/gstdio.c
+--- glib-2.72.2/glib/gstdio.c	2022-05-30 15:26:47.000000000 +0200
++++ glib-2.72.2-new/glib/gstdio.c	2022-05-31 08:56:18.761043527 +0200
 @@ -1045,6 +1045,11 @@ g_open (const gchar *filename,
  	int          mode)
  {
diff --git a/PKGBUILD b/PKGBUILD
index 2dec92d9d00c..2b65f3e32bc6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,20 +4,25 @@
 # Contributor: Renato Silva <br.renatosilva@gmail.com>
 # Contributor: Martchus <martchus@gmx.net>
 pkgname=mingw-w64-glib2
-pkgver=2.72.3
+pkgver=2.74.0
 pkgrel=1
 arch=(any)
 pkgdesc="Low level core library (mingw-w64)"
-depends=(mingw-w64-libffi mingw-w64-pcre mingw-w64-gettext mingw-w64-zlib)
+depends=(mingw-w64-libffi mingw-w64-pcre2 mingw-w64-gettext mingw-w64-zlib)
 makedepends=(mingw-w64-meson git)
 license=("LGPL2.1")
 options=(!strip !buildflags staticlibs !emptydirs)
 url="https://wiki.gnome.org/Projects/GLib"
-source=("git+https://gitlab.gnome.org/GNOME/glib.git?signed#tag=$pkgver"
+_commit=30bd57ecf8aa051de9848ba5a2b140f4810401ff  # tags/2.74.0^0
+source=("git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit"
   "0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch")
 sha256sums=('SKIP'
-            '38d2a038b39cef7a2452ddf4b04422e17a40745cc9b1fc8297c24320cecca7f9')
-validpgpkeys=('923B7025EE03C1C59F42684CF0942E894B2EAFA0') # Philip Withnall (https://endlessos.org/) <pwithnall@endlessos.org>
+            '4e4d59c194dcbd9a88ccc0932b9a0e7e48e7480a2b848af24eeb005fa7c9f246')
+
+pkgver() {
+  cd glib
+  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+}
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"