mingw: Update mxe_fixes.patch to work with latest MXE.

diff --git a/cross-compile/mingw/mxe_fixes.patch b/cross-compile/mingw/mxe_fixes.patch
index 6a0a3d6c5a08d7433d4c8ac393378fc3c7a156cf..4a0e74981790bbdfa583c61091c7670c9fb924c4 100644 (file)
--- a/cross-compile/mingw/mxe_fixes.patch
+++ b/cross-compile/mingw/mxe_fixes.patch
@@ -13,17 +13,19 @@ MXE setup for sigrok usage.
    https://gitlab.gnome.org/GNOME/glib/commit/3d7cde654c4c6f3bdad32f5521f28f5802a7c377
 
 diff --git a/src/libusb1.mk b/src/libusb1.mk
-index 358d0f3c..2f97246e 100644
+index e1f93d86..2f97246e 100644
 --- a/src/libusb1.mk
 +++ b/src/libusb1.mk
-@@ -5,10 +5,10 @@ $(PKG)_WEBSITE  := https://libusb.info/
+@@ -4,11 +4,11 @@ PKG             := libusb1
+ $(PKG)_WEBSITE  := https://libusb.info/
  $(PKG)_DESCR    := LibUsb-1.0
  $(PKG)_IGNORE   :=
- $(PKG)_VERSION  := 1.0.21
--$(PKG)_CHECKSUM := 7dce9cce9a81194b7065ee912bcd55eeffebab694ea403ffb91b67db66b1824b
+-$(PKG)_VERSION  := 1.0.22
+-$(PKG)_CHECKSUM := 75aeb9d59a4fdb800d329a545c2e6799f732362193b465ea198f2aa275518157
 -$(PKG)_SUBDIR   := libusb-$($(PKG)_VERSION)
 -$(PKG)_FILE     := libusb-$($(PKG)_VERSION).tar.bz2
 -$(PKG)_URL      := https://$(SOURCEFORGE_MIRROR)/project/libusb/libusb-1.0/libusb-$($(PKG)_VERSION)/$($(PKG)_FILE)
++$(PKG)_VERSION  := 1.0.20-rc3-event-abstraction-v4
 +$(PKG)_CHECKSUM := 58fee7f3f05fda209d14c55763df36ab86028bd9ab82c9bb74f1d5ab3208bcfd
 +$(PKG)_SUBDIR   := libusb-event-abstraction-v4
 +$(PKG)_FILE     := libusb-event-abstraction-v4.zip
@@ -41,14 +43,14 @@ index 358d0f3c..2f97246e 100644
          CFLAGS=-D_WIN32_WINNT=0x0500
      $(MAKE) -C '$(1)' -j '$(JOBS)' install
 diff --git a/src/glib-1-fixes.patch b/src/glib-1-fixes.patch
-index 021a5cac..428cc6a9 100644
+index 764ece9e..428cc6a9 100644
 --- a/src/glib-1-fixes.patch
 +++ b/src/glib-1-fixes.patch
 @@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
  From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
  From: Mark Brand <mabrand@mabrand.nl>
  Date: Thu, 23 Sep 2010 21:42:46 +0200
--Subject: [PATCH 1/9] fix tool paths
+-Subject: [PATCH 01/10] fix tool paths
 +Subject: [PATCH] fix tool paths
  
  
@@ -57,7 +59,7 @@ index 021a5cac..428cc6a9 100644
  From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
  From: Hans Petter Jansson <hpj@cl.no>
  Date: Fri, 15 Jun 2012 15:25:01 +0200
--Subject: [PATCH 2/9] Avoid DllMain symbol conflict when linking statically
+-Subject: [PATCH 02/10] Avoid DllMain symbol conflict when linking statically
 +Subject: [PATCH] Avoid DllMain symbol conflict when linking statically
  
 -Adjusted by Boris Nagaev on 29-Jan-2017 to fix
@@ -112,7 +114,7 @@ index 021a5cac..428cc6a9 100644
  From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
  From: Hans Petter Jansson <hpj@cl.no>
  Date: Fri, 15 Jun 2012 15:27:22 +0200
--Subject: [PATCH 3/9] Allow building without inotify support
+-Subject: [PATCH 03/10] Allow building without inotify support
 +Subject: [PATCH] Allow building without inotify support
  
  
@@ -129,7 +131,7 @@ index 021a5cac..428cc6a9 100644
  From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
  From: Hans Petter Jansson <hpj@cl.no>
  Date: Fri, 15 Jun 2012 15:28:14 +0200
--Subject: [PATCH 4/9] Make sure STDC_HEADERS is set for AC_CHECK_ALIGNOF.
+-Subject: [PATCH 04/10] Make sure STDC_HEADERS is set for AC_CHECK_ALIGNOF.
 +Subject: [PATCH] Make sure STDC_HEADERS is set for AC_CHECK_ALIGNOF.
   Backported from upstream
  
@@ -147,7 +149,7 @@ index 021a5cac..428cc6a9 100644
  From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
  From: Hans Petter Jansson <hpj@cl.no>
  Date: Fri, 15 Jun 2012 15:29:06 +0200
--Subject: [PATCH 5/9] Link with dnsapi
+-Subject: [PATCH 05/10] Link with dnsapi
 +Subject: [PATCH] Link with dnsapi
  
  
@@ -156,7 +158,7 @@ index 021a5cac..428cc6a9 100644
  From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
  From: Hans Petter Jansson <hpj@cl.no>
  Date: Fri, 15 Jun 2012 15:29:38 +0200
--Subject: [PATCH 6/9] Ensure globals are initialized even when DllMain is not
+-Subject: [PATCH 06/10] Ensure globals are initialized even when DllMain is not
 - being run
 +Subject: [PATCH] Ensure globals are initialized even when DllMain is not being
 + run
@@ -193,7 +195,7 @@ index 021a5cac..428cc6a9 100644
  From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
  From: Gerardo Ballabio <gerardo.ballabio@gmail.com>
  Date: Sun, 16 Aug 2015 13:18:24 +0200
--Subject: [PATCH 7/9] Remove an annoying runtime warning
+-Subject: [PATCH 07/10] Remove an annoying runtime warning
 +Subject: [PATCH] Remove an annoying runtime warning
  
  that pops up when using GtkApplication in Gtk+ 3 programs.
@@ -220,19 +222,19 @@ index 021a5cac..428cc6a9 100644
  From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
  From: aquiles2k <aj@elane2k.com>
  Date: Wed, 6 Apr 2016 22:39:53 +0300
--Subject: [PATCH 8/9] fix error "won't overwrite defined macro" on OSX
+-Subject: [PATCH 08/10] fix error "won't overwrite defined macro" on OSX
 +Subject: [PATCH] fix error "won't overwrite defined macro" on OSX
  
  See https://github.com/mxe/mxe/issues/1281
  
-@@ -596,48 +580,22 @@ index 1111111..2222222 100644
+@@ -596,110 +580,22 @@ index 1111111..2222222 100644
   dnl At the end, if we're not within glib, we'll define the public
   dnl definitions in terms of our private definitions.
  
 -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 -From: Tony Theodore <tonyt@logyst.com>
 -Date: Mon, 26 Feb 2018 16:09:53 +1100
--Subject: [PATCH 9/9] darwin: disable g_cocoa_notification_backend
+-Subject: [PATCH 09/10] darwin: disable g_cocoa_notification_backend
  
 +From: Boris Pek <tehnick-8@mail.ru>
 +Date: Thu, 28 Apr 2016 16:48:12 +0300
@@ -289,6 +291,68 @@ index 021a5cac..428cc6a9 100644
 - #ifdef G_OS_WIN32
 -       g_type_ensure (_g_winhttp_vfs_get_type ());
 - #endif
+-
+-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+-From: Ernestas Kulik <ekulik@redhat.com>
+-Date: Tue, 29 Jan 2019 09:50:46 +0100
+-Subject: [PATCH 10/10] gdbus: Avoid printing null strings
+-
+-This mostly affects the 2.56 branch, but, given that GCC 9 is being
+-stricter about passing null string pointers to printf-like functions, it
+-might make sense to proactively fix such calls.
+-
+-gdbusauth.c: In function '_g_dbus_auth_run_server':
+-gdbusauth.c:1302:11: error: '%s' directive argument is null
+-[-Werror=format-overflow=]
+- 1302 |           debug_print ("SERVER: WaitingForBegin, read '%s'",
+- line);
+-       |
+-
+-gdbusmessage.c: In function ‘g_dbus_message_to_blob’:
+-gdbusmessage.c:2730:30: error: ‘%s’ directive argument is null [-Werror=format-overflow=]
+- 2730 |       tupled_signature_str = g_strdup_printf ("(%s)", signature_str);
+-      |
+-
+-diff --git a/gio/gdbusauth.c b/gio/gdbusauth.c
+-index 1111111..2222222 100644
+---- a/gio/gdbusauth.c
+-+++ b/gio/gdbusauth.c
+-@@ -1295,9 +1295,9 @@ _g_dbus_auth_run_server (GDBusAuth              *auth,
+-                                                     &line_length,
+-                                                     cancellable,
+-                                                     error);
+--          debug_print ("SERVER: WaitingForBegin, read '%s'", line);
+-           if (line == NULL)
+-             goto out;
+-+          debug_print ("SERVER: WaitingForBegin, read '%s'", line);
+-           if (g_strcmp0 (line, "BEGIN") == 0)
+-             {
+-               /* YAY, done! */
+-diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c
+-index 1111111..2222222 100644
+---- a/gio/gdbusmessage.c
+-+++ b/gio/gdbusmessage.c
+-@@ -2695,7 +2695,6 @@ g_dbus_message_to_blob (GDBusMessage          *message,
+-   if (message->body != NULL)
+-     {
+-       gchar *tupled_signature_str;
+--      tupled_signature_str = g_strdup_printf ("(%s)", signature_str);
+-       if (signature == NULL)
+-         {
+-           g_set_error (error,
+-@@ -2703,10 +2702,10 @@ g_dbus_message_to_blob (GDBusMessage          *message,
+-                        G_IO_ERROR_INVALID_ARGUMENT,
+-                        _("Message body has signature '%s' but there is no signature header"),
+-                        signature_str);
+--          g_free (tupled_signature_str);
+-           goto out;
+-         }
+--      else if (g_strcmp0 (tupled_signature_str, g_variant_get_type_string (message->body)) != 0)
+-+      tupled_signature_str = g_strdup_printf ("(%s)", signature_str);
+-+      if (g_strcmp0 (tupled_signature_str, g_variant_get_type_string (message->body)) != 0)
+-         {
+-           g_set_error (error,
+-                        G_IO_ERROR,
 diff --git a/src/glib-2-format.patch b/src/glib-2-format.patch
 new file mode 100644
 index 00000000..3d594af0