From: Uwe Hermann <redacted>
Date: Wed, 3 Oct 2018 14:15:24 +0000 (+0200)
Subject: sigrok-cross-mingw: Drop apparently obsolete libzip patch.
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=d33de79da70210575f2c922aa0de1ad81f92852c;p=sigrok-util.git

sigrok-cross-mingw: Drop apparently obsolete libzip patch.

Initial tests with MinGW 5.0.4 and libzip 1.5.1 from recent MXE suggest
that this issue is no longer reproducible. It was probably fixed in
either of the packages in the mean time.
---

diff --git a/cross-compile/mingw/mxe_fixes.patch b/cross-compile/mingw/mxe_fixes.patch
index 798bf98..504d441 100644
--- a/cross-compile/mingw/mxe_fixes.patch
+++ b/cross-compile/mingw/mxe_fixes.patch
@@ -3,9 +3,6 @@ MXE setup for sigrok usage.
 
  - libsigrok currently requires a special libusb branch.
 
- - Force libzip to use its own mkstemp() implementation.
-   http://sigrok.org/bugzilla/show_bug.cgi?id=570#c2
-
  - We're reverting to glib 2.44.1 for now since more recent
    versions (e.g. 2.50.2) seem to have a bug. Details:
    https://sigrok.org/bugzilla/show_bug.cgi?id=1232
@@ -39,20 +36,6 @@ index 0b58dff3..281a1169 100644
          $(MXE_CONFIGURE_OPTS) \
          CFLAGS=-D_WIN32_WINNT=0x0500
      $(MAKE) -C '$(1)' -j '$(JOBS)' install
-diff --git a/src/libzip.mk b/src/libzip.mk
-index 28ea792c..ee1bcfbe 100644
---- a/src/libzip.mk
-+++ b/src/libzip.mk
-@@ -18,7 +18,8 @@ endef
- 
- define $(PKG)_BUILD
-     cd '$(1)' && ./configure \
--        $(MXE_CONFIGURE_OPTS)
-+        $(MXE_CONFIGURE_OPTS) \
-+        ac_cv_func_mkstemp=no
-     $(MAKE) -C '$(1)' -j '$(JOBS)' install $(MXE_DISABLE_CRUFT) SUBDIRS=lib
- 
-     '$(TARGET)-gcc' \
 diff --git a/src/glib-1-fixes.patch b/src/glib-1-fixes.patch
 index 021a5cac..428cc6a9 100644
 --- a/src/glib-1-fixes.patch