update to 2.66.0

3 files changed, 20 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 296c82173f90..161a52cc1737 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-glib2
 	pkgdesc = Low level core library (mingw-w64)
-	pkgver = 2.64.4
+	pkgver = 2.66.0
 	pkgrel = 1
 	url = https://wiki.gnome.org/Projects/GLib
 	arch = any
@@ -15,11 +15,11 @@ pkgbase = mingw-w64-glib2
 	options = !buildflags
 	options = staticlibs
 	options = !emptydirs
-	source = git+https://gitlab.gnome.org/GNOME/glib.git#commit=551bd5c1d1db1aa10d71acb9cde6a088a374d8bb
+	source = git+https://gitlab.gnome.org/GNOME/glib.git#commit=c2c12e42920d6e06c23c87398996827e53c1fc72
 	source = 0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch
 	source = glib-prefer-constructors-over-DllMain.patch
 	sha256sums = SKIP
-	sha256sums = 74ae54ada7dce2c95f197e5e389b61100e622b8a9ae9cd8e2dfa681138abade8
+	sha256sums = f24badc8897bdcf36949f4eef0a0c6e2c26823e8f0400b4dd44a5553f4bdfae0
 	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 4c6f7cfa5cda..daa81da1433d 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.64.1/gio/tests/org.gtk.test.gschema.override.orig glib-2.64.1-new/gio/tests/org.gtk.test.gschema.override.orig
---- glib-2.64.1/gio/tests/org.gtk.test.gschema.override.orig	2020-03-11 13:21:39.000000000 +0100
-+++ glib-2.64.1-new/gio/tests/org.gtk.test.gschema.override.orig	1970-01-01 01:00:00.000000000 +0100
+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
 @@ -1,2 +0,0 @@
 -[org.gtk.test.per-desktop:GNOME-Classic]
 -desktop = "GNOME Classic"
-diff -rupN --no-dereference glib-2.64.1/gio/tests/org.gtk.test.gschema.xml.orig glib-2.64.1-new/gio/tests/org.gtk.test.gschema.xml.orig
---- glib-2.64.1/gio/tests/org.gtk.test.gschema.xml.orig	2020-03-11 13:21:39.000000000 +0100
-+++ glib-2.64.1-new/gio/tests/org.gtk.test.gschema.xml.orig	1970-01-01 01:00:00.000000000 +0100
+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
 @@ -1,222 +0,0 @@
 -<schemalist>
 -
@@ -230,10 +230,10 @@ diff -rupN --no-dereference glib-2.64.1/gio/tests/org.gtk.test.gschema.xml.orig
 -  </schema>
 -
 -</schemalist>
-diff -rupN --no-dereference glib-2.64.1/glib/gstdio.c glib-2.64.1-new/glib/gstdio.c
---- glib-2.64.1/glib/gstdio.c	2020-03-11 13:21:39.000000000 +0100
-+++ glib-2.64.1-new/glib/gstdio.c	2020-03-12 13:42:05.308446311 +0100
-@@ -1036,6 +1036,11 @@ g_open (const gchar *filename,
+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
+@@ -1045,6 +1045,11 @@ g_open (const gchar *filename,
  	int          mode)
  {
  #ifdef G_OS_WIN32
@@ -245,7 +245,7 @@ diff -rupN --no-dereference glib-2.64.1/glib/gstdio.c glib-2.64.1-new/glib/gstdi
    wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
    int retval;
    int save_errno;
-@@ -1046,12 +1051,114 @@ g_open (const gchar *filename,
+@@ -1055,12 +1060,114 @@ g_open (const gchar *filename,
        return -1;
      }
  
@@ -363,7 +363,7 @@ diff -rupN --no-dereference glib-2.64.1/glib/gstdio.c glib-2.64.1-new/glib/gstdi
    return retval;
  #else
    int fd;
-@@ -1099,6 +1206,8 @@ g_creat (const gchar *filename,
+@@ -1108,6 +1215,8 @@ g_creat (const gchar *filename,
  	 int          mode)
  {
  #ifdef G_OS_WIN32
@@ -372,7 +372,7 @@ diff -rupN --no-dereference glib-2.64.1/glib/gstdio.c glib-2.64.1-new/glib/gstdi
    wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
    int retval;
    int save_errno;
-@@ -1109,12 +1218,41 @@ g_creat (const gchar *filename,
+@@ -1118,12 +1227,41 @@ g_creat (const gchar *filename,
        return -1;
      }
  
@@ -417,7 +417,7 @@ diff -rupN --no-dereference glib-2.64.1/glib/gstdio.c glib-2.64.1-new/glib/gstdi
    return retval;
  #else
    return creat (filename, mode);
-@@ -1556,34 +1694,102 @@ g_fopen (const gchar *filename,
+@@ -1565,34 +1703,102 @@ g_fopen (const gchar *filename,
  	 const gchar *mode)
  {
  #ifdef G_OS_WIN32
diff --git a/PKGBUILD b/PKGBUILD
index 1a98b755b1c2..f79d9ed4a030 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,9 +4,9 @@
 # Contributor: Renato Silva <br.renatosilva@gmail.com>
 # Contributor: Martchus <martchus@gmx.net>
 pkgname=mingw-w64-glib2
-pkgver=2.64.4
+pkgver=2.66.0
 pkgrel=1
-_commit=551bd5c1d1db1aa10d71acb9cde6a088a374d8bb  # tags/2.64.4^0
+_commit=c2c12e42920d6e06c23c87398996827e53c1fc72  # tags/2.66.0^0
 arch=(any)
 pkgdesc="Low level core library (mingw-w64)"
 depends=(mingw-w64-libffi mingw-w64-pcre mingw-w64-gettext mingw-w64-zlib)
@@ -18,7 +18,7 @@ source=("git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit"
   "0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch"
   "glib-prefer-constructors-over-DllMain.patch")
 sha256sums=('SKIP'
-            '74ae54ada7dce2c95f197e5e389b61100e622b8a9ae9cd8e2dfa681138abade8'
+            'f24badc8897bdcf36949f4eef0a0c6e2c26823e8f0400b4dd44a5553f4bdfae0'
             '3c9848916492435852e4e27bee608a0b2146e146c40f889d725acffd9409aae8')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"