summarylogtreecommitdiffstats
path: root/0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch
diff options
context:
space:
mode:
Diffstat (limited to '0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch')
-rw-r--r--0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch28
1 files changed, 14 insertions, 14 deletions
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