update to 2.68.2

3 files changed, 17 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b9ec2ddd1455..9f5bd64edafb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-glib2
 	pkgdesc = Low level core library (mingw-w64)
-	pkgver = 2.66.7
+	pkgver = 2.68.2
 	pkgrel = 1
 	url = https://wiki.gnome.org/Projects/GLib
 	arch = any
@@ -15,12 +15,12 @@ pkgbase = mingw-w64-glib2
 	options = !buildflags
 	options = staticlibs
 	options = !emptydirs
-	source = git+https://gitlab.gnome.org/GNOME/glib.git#commit=95115f029d9c170c2e966cd7d3547b6394c92a4a
+	source = git+https://gitlab.gnome.org/GNOME/glib.git?signed#tag=2.68.2
 	source = 0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch
 	source = glib-prefer-constructors-over-DllMain.patch
+	validpgpkeys = 923B7025EE03C1C59F42684CF0942E894B2EAFA0
 	sha256sums = SKIP
-	sha256sums = f24badc8897bdcf36949f4eef0a0c6e2c26823e8f0400b4dd44a5553f4bdfae0
+	sha256sums = 48c471eb65707fa610ab386490663ec4f5b6908cc8b9690a3922959d71fbb302
 	sha256sums = 3c9848916492435852e4e27bee608a0b2146e146c40f889d725acffd9409aae8
 
 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 daa81da1433d..32d8976aa2fd 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.66.0/gio/tests/org.gtk.test.gschema.override.orig glib-2.66.0-new/gio/tests/org.gtk.test.gschema.override.orig
---- glib-2.66.0/gio/tests/org.gtk.test.gschema.override.orig	2020-09-10 12:42:41.561684100 +0200
-+++ glib-2.66.0-new/gio/tests/org.gtk.test.gschema.override.orig	1970-01-01 01:00:00.000000000 +0100
+diff -rupN --no-dereference glib-2.68.1/gio/tests/org.gtk.test.gschema.override.orig glib-2.68.1-new/gio/tests/org.gtk.test.gschema.override.orig
+--- glib-2.68.1/gio/tests/org.gtk.test.gschema.override.orig	2021-04-08 16:00:16.799500700 +0200
++++ glib-2.68.1-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.66.0/gio/tests/org.gtk.test.gschema.xml.orig glib-2.66.0-new/gio/tests/org.gtk.test.gschema.xml.orig
---- glib-2.66.0/gio/tests/org.gtk.test.gschema.xml.orig	2020-09-10 12:42:41.561684100 +0200
-+++ glib-2.66.0-new/gio/tests/org.gtk.test.gschema.xml.orig	1970-01-01 01:00:00.000000000 +0100
+diff -rupN --no-dereference glib-2.68.1/gio/tests/org.gtk.test.gschema.xml.orig glib-2.68.1-new/gio/tests/org.gtk.test.gschema.xml.orig
+--- glib-2.68.1/gio/tests/org.gtk.test.gschema.xml.orig	2021-04-08 16:00:16.799500700 +0200
++++ glib-2.68.1-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.66.0/gio/tests/org.gtk.test.gschema.xml.orig
 -  </schema>
 -
 -</schemalist>
-diff -rupN --no-dereference glib-2.66.0/glib/gstdio.c glib-2.66.0-new/glib/gstdio.c
---- glib-2.66.0/glib/gstdio.c	2020-09-10 12:42:41.606684700 +0200
-+++ glib-2.66.0-new/glib/gstdio.c	2020-09-15 15:46:25.857827483 +0200
+diff -rupN --no-dereference glib-2.68.1/glib/gstdio.c glib-2.68.1-new/glib/gstdio.c
+--- glib-2.68.1/glib/gstdio.c	2021-04-08 16:00:16.834501000 +0200
++++ glib-2.68.1-new/glib/gstdio.c	2021-04-12 12:48:00.188308889 +0200
 @@ -1045,6 +1045,11 @@ g_open (const gchar *filename,
  	int          mode)
  {
diff --git a/PKGBUILD b/PKGBUILD
index 0453fd7f524b..3acfdd4e0f4d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,9 +4,8 @@
 # Contributor: Renato Silva <br.renatosilva@gmail.com>
 # Contributor: Martchus <martchus@gmx.net>
 pkgname=mingw-w64-glib2
-pkgver=2.66.7
+pkgver=2.68.2
 pkgrel=1
-_commit=95115f029d9c170c2e966cd7d3547b6394c92a4a  # tags/2.66.7^0
 arch=(any)
 pkgdesc="Low level core library (mingw-w64)"
 depends=(mingw-w64-libffi mingw-w64-pcre mingw-w64-gettext mingw-w64-zlib)
@@ -14,12 +13,13 @@ 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#commit=$_commit"
+source=("git+https://gitlab.gnome.org/GNOME/glib.git?signed#tag=$pkgver"
   "0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch"
   "glib-prefer-constructors-over-DllMain.patch")
 sha256sums=('SKIP'
-            'f24badc8897bdcf36949f4eef0a0c6e2c26823e8f0400b4dd44a5553f4bdfae0'
+            '48c471eb65707fa610ab386490663ec4f5b6908cc8b9690a3922959d71fbb302'
             '3c9848916492435852e4e27bee608a0b2146e146c40f889d725acffd9409aae8')
+validpgpkeys=('923B7025EE03C1C59F42684CF0942E894B2EAFA0') # Philip Withnall (https://endlessos.org/) <pwithnall@endlessos.org>
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"