update to 2.70.0

3 files changed, 14 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8e8a4c2fe65c..f4defc2b7cdb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-glib2
 	pkgdesc = Low level core library (mingw-w64)
-	pkgver = 2.68.4
+	pkgver = 2.70.0
 	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?signed#tag=2.68.4
+	source = git+https://gitlab.gnome.org/GNOME/glib.git?signed#tag=2.70.0
 	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 = 48c471eb65707fa610ab386490663ec4f5b6908cc8b9690a3922959d71fbb302
+	sha256sums = c2fa65ddf9cdef61107c0c414997a1a2ec17212303b73b93b2503cb8a0cb9f5d
 	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 32d8976aa2fd..9893c0aa77a0 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.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
+diff -rupN --no-dereference glib-2.69.2/gio/tests/org.gtk.test.gschema.override.orig glib-2.69.2-new/gio/tests/org.gtk.test.gschema.override.orig
+--- glib-2.69.2/gio/tests/org.gtk.test.gschema.override.orig	2021-08-19 17:15:24.712496300 +0200
++++ glib-2.69.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.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
+diff -rupN --no-dereference glib-2.69.2/gio/tests/org.gtk.test.gschema.xml.orig glib-2.69.2-new/gio/tests/org.gtk.test.gschema.xml.orig
+--- glib-2.69.2/gio/tests/org.gtk.test.gschema.xml.orig	2021-08-19 17:15:24.712496300 +0200
++++ glib-2.69.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.68.1/gio/tests/org.gtk.test.gschema.xml.orig
 -  </schema>
 -
 -</schemalist>
-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
+diff -rupN --no-dereference glib-2.69.2/glib/gstdio.c glib-2.69.2-new/glib/gstdio.c
+--- glib-2.69.2/glib/gstdio.c	2021-08-19 17:15:24.740496600 +0200
++++ glib-2.69.2-new/glib/gstdio.c	2021-08-28 22:11:16.978513413 +0200
 @@ -1045,6 +1045,11 @@ g_open (const gchar *filename,
  	int          mode)
  {
diff --git a/PKGBUILD b/PKGBUILD
index b4aa2535740a..c782f98ccc89 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Renato Silva <br.renatosilva@gmail.com>
 # Contributor: Martchus <martchus@gmx.net>
 pkgname=mingw-w64-glib2
-pkgver=2.68.4
+pkgver=2.70.0
 pkgrel=1
 arch=(any)
 pkgdesc="Low level core library (mingw-w64)"
@@ -17,17 +17,12 @@ 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'
-            '48c471eb65707fa610ab386490663ec4f5b6908cc8b9690a3922959d71fbb302'
+            'c2fa65ddf9cdef61107c0c414997a1a2ec17212303b73b93b2503cb8a0cb9f5d'
             '3c9848916492435852e4e27bee608a0b2146e146c40f889d725acffd9409aae8')
 validpgpkeys=('923B7025EE03C1C59F42684CF0942E894B2EAFA0') # Philip Withnall (https://endlessos.org/) <pwithnall@endlessos.org>
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
-pkgver() {
-  cd glib
-  git describe --tags | sed 's/-/+/g'
-}
-
 prepare() {
   cd glib
   # https://gitlab.gnome.org/GNOME/glib/issues/539