annotate src/msvc-libidn-1.patch @ 3725:2acaa9943159

qscintilla: update 2.8.4 * src/qscintilla.mk: update to version and checksum for 2.8.4
author John Donoghue
date Mon, 20 Oct 2014 11:01:00 -0400
parents fae995570da2
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3082
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
1 diff -ur libidn-1.25-orig/examples/example.c libidn-1.25/examples/example.c
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
2 --- libidn-1.25-orig/examples/example.c 2012-04-27 06:48:08 -0400
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
3 +++ libidn-1.25/examples/example.c 2013-06-23 15:49:49 -0400
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
4 @@ -18,6 +18,10 @@
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
5 *
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
6 */
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
7
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
8 +#ifdef HAVE_CONFIG_H
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
9 +#include <config.h>
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
10 +#endif
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
11 +
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
12 #include <stdio.h>
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
13 #include <stdlib.h>
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
14 #include <string.h>
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
15 diff -ur libidn-1.25-orig/examples/example2.c libidn-1.25/examples/example2.c
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
16 --- libidn-1.25-orig/examples/example2.c 2012-04-27 06:48:08 -0400
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
17 +++ libidn-1.25/examples/example2.c 2013-06-23 15:50:00 -0400
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
18 @@ -19,6 +19,10 @@
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
19 *
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
20 */
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
21
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
22 +#ifdef HAVE_CONFIG_H
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
23 +#include <config.h>
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
24 +#endif
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
25 +
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
26 #include <locale.h> /* setlocale() */
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
27
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
28 /*
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
29 diff -ur libidn-1.25-orig/examples/example3.c libidn-1.25/examples/example3.c
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
30 --- libidn-1.25-orig/examples/example3.c 2012-04-27 06:48:08 -0400
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
31 +++ libidn-1.25/examples/example3.c 2013-06-23 15:50:06 -0400
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
32 @@ -18,6 +18,10 @@
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
33 *
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
34 */
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
35
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
36 +#ifdef HAVE_CONFIG_H
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
37 +#include <config.h>
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
38 +#endif
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
39 +
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
40 #include <stdio.h>
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
41 #include <stdlib.h>
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
42 #include <string.h>
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
43 diff -ur libidn-1.25-orig/examples/example4.c libidn-1.25/examples/example4.c
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
44 --- libidn-1.25-orig/examples/example4.c 2012-04-27 06:48:08 -0400
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
45 +++ libidn-1.25/examples/example4.c 2013-06-23 15:50:12 -0400
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
46 @@ -18,6 +18,10 @@
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
47 *
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
48 */
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
49
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
50 +#ifdef HAVE_CONFIG_H
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
51 +#include <config.h>
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
52 +#endif
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
53 +
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
54 #include <stdio.h>
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
55 #include <stdlib.h>
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
56 #include <string.h>
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
57 diff -ur libidn-1.25-orig/examples/example5.c libidn-1.25/examples/example5.c
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
58 --- libidn-1.25-orig/examples/example5.c 2012-04-27 06:48:08 -0400
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
59 +++ libidn-1.25/examples/example5.c 2013-06-23 15:50:18 -0400
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
60 @@ -18,6 +18,10 @@
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
61 *
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
62 */
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
63
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
64 +#ifdef HAVE_CONFIG_H
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
65 +#include <config.h>
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
66 +#endif
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
67 +
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
68 #include <stdio.h>
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
69 #include <stdlib.h>
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
70 #include <string.h>
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
71 diff -ur libidn-1.25-orig/lib/Makefile.in libidn-1.25/lib/Makefile.in
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
72 --- libidn-1.25-orig/lib/Makefile.in 2012-05-23 04:36:47 -0400
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
73 +++ libidn-1.25/lib/Makefile.in 2013-06-23 15:49:18 -0400
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
74 @@ -1090,7 +1090,7 @@
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
75 $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -no-undefined \
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
76 $(am__append_3) $(am__append_4) $(am__append_5)
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
77 @HAVE_LD_OUTPUT_DEF_TRUE@defexecdir = $(bindir)
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
78 -@HAVE_LD_OUTPUT_DEF_TRUE@defexec_DATA = libidn-$(DLL_VERSION).def
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
79 +@HAVE_LD_OUTPUT_DEF_TRUE@#defexec_DATA = libidn-$(DLL_VERSION).def
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
80 @HAVE_LD_OUTPUT_DEF_TRUE@CLEANFILES = $(defexec_DATA)
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
81 SPEC = $(top_srcdir)/doc/specifications
fae995570da2 [MSVC] enable libidn compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
82 all: $(BUILT_SOURCES)