1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
|
--- libassuan.orig/src/mkheader.c 2013-03-15 20:26:09.000000000 +0100
+++ libassuan/src/mkheader.c 2017-09-24 14:17:33.584583300 +0200
@@ -99,7 +99,7 @@
"# include <unistd.h>\n"
"#endif\n", stdout);
else
- fputs ("#include <unistd.h>\n", stdout);
+ fputs ("#include <io.h>\n", stdout);
}
else if (!strcmp (tag, "include:types"))
{
diff -ru libassuan.orig/src/Makefile.in libassuan/src/Makefile.in
--- libassuan.orig/src/Makefile.in 2020-06-10 17:26:08.699728800 +0200
+++ libassuan/src/Makefile.in 2020-06-10 17:22:11.066865300 +0200
@@ -462,7 +462,7 @@
assuan-pipe-connect.c assuan-socket-connect.c assuan-uds.c \
assuan-logging.c assuan-socket.c $(am__append_2) \
$(am__append_3) $(am__append_4)
+@HAVE_W32_SYSTEM_TRUE@LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \
-@HAVE_W32_SYSTEM_TRUE@LTRCCOMPILE = $(LIBTOOL) --mode=compile $(RC) \
@HAVE_W32_SYSTEM_TRUE@ `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
@HAVE_W32_SYSTEM_TRUE@ sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
diff -ru libassuan.orig/src/Makefile.am libassuan/src/Makefile.am
--- libassuan.orig/src/Makefile.am 2017-09-24 14:20:05.906065400 +0200
+++ libassuan/src/Makefile.am 2017-09-24 14:40:59.038850200 +0200
@@ -87,7 +87,7 @@
if HAVE_W32_SYSTEM
+LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RC) \
-LTRCCOMPILE = $(LIBTOOL) --mode=compile $(RC) \
`echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
@@ -148,10 +148,10 @@
$(DESTDIR)$(bindir)/gpgcedev.dll
endif
+mkheader$(EXEEXT): mkheader.c Makefile
-mkheader: mkheader.c Makefile
$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) \
$(LDFLAGS_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c
+assuan.h: assuan.h.in mkheader$(EXEEXT) $(parts_of_assuan_h)
+ ./mkheader$(EXEEXT) $(host_os) $(srcdir)/assuan.h.in \
-assuan.h: assuan.h.in mkheader $(parts_of_assuan_h)
- ./mkheader $(host_os) $(srcdir)/assuan.h.in \
$(PACKAGE_VERSION) $(VERSION_NUMBER) >$@
diff -ru libassuan.orig/src/assuan-handler.c libassuan/src/assuan-handler.c
--- libassuan.orig/src/assuan-handler.c 2016-06-25 16:27:49.000000000 +0200
+++ libassuan/src/assuan-handler.c 2017-09-24 15:32:51.200956200 +0200
@@ -395,7 +395,7 @@
{ "INPUT", std_handler_input, std_help_input, 0 },
{ "OUTPUT", std_handler_output, std_help_output, 0 },
- { } };
+};
/**
diff -ru libassuan.orig/Makefile.am libassuan/Makefile.am
--- libassuan.orig/Makefile.am 2016-07-14 10:09:22.000000000 +0200
+++ libassuan/Makefile.am 2017-09-25 21:20:19.928317500 +0200
@@ -35,7 +35,7 @@
doc =
endif
-SUBDIRS = m4 src $(doc) tests
+SUBDIRS = m4 src $(doc)
dist-hook: gen-ChangeLog
|
