Add patch to fix w32-glib-io build of gpgme
authorAndre Heinecke <aheinecke@gnupg.org>
Tue, 26 Mar 2019 18:26:14 +0000 (19:26 +0100)
committerAndre Heinecke <aheinecke@gnupg.org>
Tue, 26 Mar 2019 18:26:14 +0000 (19:26 +0100)
--

Makefile.am
patches/gpgme-1.13.0/0001-core-w32-glib-Fix-build-of-w32-glib-io.c.patch [new file with mode: 0755]

index d827e09..c586411 100644 (file)
@@ -45,7 +45,8 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
         patches/qttools/disable-most-tools.patch \
         patches/qtwinextras/support-xp.patch \
         patches/w32pth-2.0.5/workaround-broken-libtool.patch \
-        patches/breeze-icons/0001-Make-binary-icons-cross-compilable.patch
+        patches/breeze-icons/0001-Make-binary-icons-cross-compilable.patch \
+        patches/gpgme-1.13.0/0001-core-w32-glib-Fix-build-of-w32-glib-io.c.patch
 
 copy-news:
        cp NEWS doc/website/NEWS.last
diff --git a/patches/gpgme-1.13.0/0001-core-w32-glib-Fix-build-of-w32-glib-io.c.patch b/patches/gpgme-1.13.0/0001-core-w32-glib-Fix-build-of-w32-glib-io.c.patch
new file mode 100755 (executable)
index 0000000..153d0f3
--- /dev/null
@@ -0,0 +1,50 @@
+#! /bin/sh
+patch -p1 -l -f $* < $0
+exit $?
+
+From 213c4bc1eb1f45695cc3955cc722ebb363dcbdd0 Mon Sep 17 00:00:00 2001
+From: Andre Heinecke <aheinecke@gnupg.org>
+Date: Tue, 26 Mar 2019 19:22:44 +0100
+Subject: [PATCH] core,w32,glib: Fix build of w32-glib-io.c
+
+* src/w32-glib-io.c (_gpgme_io_pipe, _gpgme_io_connect): Do not
+use TRACE_SUC in a return statement.
+---
+ src/w32-glib-io.c | 17 ++++++++++-------
+ 1 file changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/src/w32-glib-io.c b/src/w32-glib-io.c
+index 8c8722ce..e2e3b8ab 100644
+--- a/src/w32-glib-io.c
++++ b/src/w32-glib-io.c
+@@ -421,12 +421,13 @@ _gpgme_io_pipe (int filedes[2], int inherit_idx)
+       return TRACE_SYSRES (-1);
+     }
+
+-  return TRACE_SUC ("read=0x%x/%p, write=0x%x/%p, channel=%p",
+-                   filedes[0],
+-                   (HANDLE) _get_osfhandle (giochannel_table[filedes[0]].fd),
+-                   filedes[1],
+-                   (HANDLE) _get_osfhandle (giochannel_table[filedes[1]].fd),
+-                   giochannel_table[1 - inherit_idx].chan);
++  TRACE_SUC ("read=0x%x/%p, write=0x%x/%p, channel=%p",
++           filedes[0],
++           (HANDLE) _get_osfhandle (giochannel_table[filedes[0]].fd),
++           filedes[1],
++           (HANDLE) _get_osfhandle (giochannel_table[filedes[1]].fd),
++           giochannel_table[1 - inherit_idx].chan);
++  return 0;
+ }
+
+
+@@ -1081,5 +1082,7 @@ _gpgme_io_connect (int fd, struct sockaddr *addr, int addrlen)
+       return TRACE_SYSRES (-1);
+     }
+
+-  return TRACE_SUC ("");
++  TRACE_SUC ("");
++
++  return 0;
+ }
+--
+2.20.1