Mercurial > mxe-octave
annotate src/gsoap-1-fixes.patch @ 3700:76745b5dfd81
bump version to 0.0.31
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 28 Aug 2014 16:58:58 -0400 |
parents | 4916e58b9c77 |
children |
rev | line source |
---|---|
2333
f653602a0500
Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents:
2114
diff
changeset
|
1 This file is part of MXE. |
2353
99516e73b368
Move doc/index.html -> index.html
Volker Grabsch <vog@notjusthosting.com>
parents:
2333
diff
changeset
|
2 See index.html for further information. |
1994
8bf08e374ef9
package gsoap: apply published bugfix
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
3 |
8bf08e374ef9
package gsoap: apply published bugfix
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
4 Contains ad hoc patches for cross building. |
8bf08e374ef9
package gsoap: apply published bugfix
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
5 |
2702 | 6 From 538418ded4554eec40b6a889d58cfbb493cd9a2c Mon Sep 17 00:00:00 2001 |
2080
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
7 From: Mark Brand <mabrand@mabrand.nl> |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
8 Date: Sun, 23 Oct 2011 21:36:53 +0200 |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
9 Subject: [PATCH 1/3] support static linking to ntlm |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
10 |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
11 |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
12 diff --git a/configure b/configure |
2702 | 13 index 6ac9ee7..0570bb6 100755 |
2080
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
14 --- a/configure |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
15 +++ b/configure |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
16 @@ -4822,7 +4822,7 @@ case "${host}" in |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
17 ;; |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
18 *-*-cygwin*) platform=CYGWIN ;; |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
19 *-*-mingw*) platform=MINGW |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
20 - SAMPLE_EXTRA_LIBS="-lws2_32 -lkernel32 -luser32 -lgdi32" |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
21 + SAMPLE_EXTRA_LIBS="-lntlm -lws2_32 -lkernel32 -luser32 -lgdi32" |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
22 ;; |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
23 *-*-freebsd*) platform=FREEBSD ;; |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
24 *-*-openbsd*) platform=OPENBSD ;; |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
25 -- |
2702 | 26 1.7.11.4 |
2042
1b67fb0c1fb7
package gsoap: enable ntlm support with pkgconfig
Mark Brand <mabrand@mabrand.nl>
parents:
2039
diff
changeset
|
27 |
1b67fb0c1fb7
package gsoap: enable ntlm support with pkgconfig
Mark Brand <mabrand@mabrand.nl>
parents:
2039
diff
changeset
|
28 |
2702 | 29 From 41c709c382a1aa268c85d98df65562eb4563d640 Mon Sep 17 00:00:00 2001 |
2080
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
30 From: Mark Brand <mabrand@mabrand.nl> |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
31 Date: Mon, 24 Oct 2011 11:17:13 +0200 |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
32 Subject: [PATCH 2/3] ntlm support in .pc files |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
33 |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
34 |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
35 diff --git a/gsoap++.pc.in b/gsoap++.pc.in |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
36 index 035afd9..3411d55 100644 |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
37 --- a/gsoap++.pc.in |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
38 +++ b/gsoap++.pc.in |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
39 @@ -8,4 +8,4 @@ Description: SOAP C++ Web Services |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
40 Version: @VERSION@ |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
41 Requires: |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
42 Libs: -L${libdir} -lgsoap++ @SAMPLE_EXTRA_LIBS@ |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
43 -Cflags: @SOAPCPP2_IPV6@ -DWITH_DOM -I${includedir} |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
44 +Cflags: @SOAPCPP2_IPV6@ -DWITH_DOM -DWITH_NTLM -I${includedir} |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
45 diff --git a/gsoap.pc.in b/gsoap.pc.in |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
46 index e2607aa..96a54b9 100644 |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
47 --- a/gsoap.pc.in |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
48 +++ b/gsoap.pc.in |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
49 @@ -8,4 +8,4 @@ Description: SOAP C Web Services |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
50 Version: @VERSION@ |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
51 Requires: |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
52 Libs: -L${libdir} -lgsoap @SAMPLE_EXTRA_LIBS@ |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
53 -Cflags: @SOAPCPP2_IPV6@ -DWITH_DOM -I${includedir} |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
54 +Cflags: @SOAPCPP2_IPV6@ -DWITH_DOM -DWITH_NTLM -I${includedir} |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
55 diff --git a/gsoapck++.pc.in b/gsoapck++.pc.in |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
56 index cb03e2f..b349049 100644 |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
57 --- a/gsoapck++.pc.in |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
58 +++ b/gsoapck++.pc.in |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
59 @@ -8,4 +8,4 @@ Description: SOAP C++ Web Services with Cookies Enabled |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
60 Version: @VERSION@ |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
61 Requires: |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
62 Libs: -L${libdir} -lgsoapck++ @SAMPLE_EXTRA_LIBS@ |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
63 -Cflags: @SOAPCPP2_IPV6@ -DWITH_COOKIES -DWITH_DOM -I${includedir} |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
64 +Cflags: @SOAPCPP2_IPV6@ -DWITH_COOKIES -DWITH_DOM -DWITH_NTLM -I${includedir} |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
65 diff --git a/gsoapck.pc.in b/gsoapck.pc.in |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
66 index 859a922..e5ce5eb 100644 |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
67 --- a/gsoapck.pc.in |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
68 +++ b/gsoapck.pc.in |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
69 @@ -8,4 +8,4 @@ Description: SOAP C Web Services with Cookies Enabled |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
70 Version: @VERSION@ |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
71 Requires: |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
72 Libs: -L${libdir} -lgsoapck @SAMPLE_EXTRA_LIBS@ |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
73 -Cflags: @SOAPCPP2_IPV6@ -DWITH_COOKIES -DWITH_DOM -I${includedir} |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
74 +Cflags: @SOAPCPP2_IPV6@ -DWITH_COOKIES -DWITH_DOM -DWITH_NTLM -I${includedir} |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
75 diff --git a/gsoapssl++.pc.in b/gsoapssl++.pc.in |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
76 index 391d820..791408a 100644 |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
77 --- a/gsoapssl++.pc.in |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
78 +++ b/gsoapssl++.pc.in |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
79 @@ -8,4 +8,4 @@ Description: SOAP C++ Web Services with SSL and ZLIB |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
80 Version: @VERSION@ |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
81 Requires: |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
82 Libs: -L${libdir} -lgsoapssl++ @SAMPLE_SSL_LIBS@ @SAMPLE_EXTRA_LIBS@ |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
83 -Cflags: @SOAPCPP2_IPV6@ -DWITH_OPENSSL -DWITH_DOM -DWITH_COOKIES -DWITH_GZIP -I${includedir} |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
84 +Cflags: @SOAPCPP2_IPV6@ -DWITH_OPENSSL -DWITH_DOM -DWITH_NTLM -DWITH_COOKIES -DWITH_GZIP -I${includedir} |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
85 diff --git a/gsoapssl.pc.in b/gsoapssl.pc.in |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
86 index 79c940a..17c9ee3 100644 |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
87 --- a/gsoapssl.pc.in |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
88 +++ b/gsoapssl.pc.in |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
89 @@ -8,4 +8,4 @@ Description: SOAP C Web Services with SSL and ZLIB |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
90 Version: @VERSION@ |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
91 Requires: |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
92 Libs: -L${libdir} -lgsoapssl @SAMPLE_SSL_LIBS@ @SAMPLE_EXTRA_LIBS@ |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
93 -Cflags: @SOAPCPP2_IPV6@ -DWITH_OPENSSL -DWITH_DOM -DWITH_COOKIES -DWITH_GZIP -I${includedir} |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
94 +Cflags: @SOAPCPP2_IPV6@ -DWITH_OPENSSL -DWITH_DOM -DWITH_NTLM -DWITH_COOKIES -DWITH_GZIP -I${includedir} |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
95 -- |
2702 | 96 1.7.11.4 |
2080
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
97 |
dd2ac0a72169
package gsoap: upgrade to v2.8.4 with fix
Mark Brand <mabrand@mabrand.nl>
parents:
2079
diff
changeset
|
98 |
2702 | 99 From 3b8d0a7db13b9c607e66c6a9d5455f26576d80fd Mon Sep 17 00:00:00 2001 |
100 From: Mark Brand <mabrand@mabrand.nl> | |
101 Date: Mon, 20 Aug 2012 13:12:49 +0200 | |
102 Subject: [PATCH 3/3] fix MINGW compatibility | |
103 | |
104 taken from | |
105 https://sourceforge.net/tracker/?func=detail&aid=3559816&group_id=52781&atid=468023 | |
106 | |
107 diff --git a/gsoap/stdsoap2.h b/gsoap/stdsoap2.h | |
108 index 8718592..ab5bed4 100644 | |
109 --- a/gsoap/stdsoap2.h | |
110 +++ b/gsoap/stdsoap2.h | |
2822 | 111 @@ -2213,13 +2213,13 @@ soap_wchar soap_get1(struct soap*); |
2702 | 112 SOAP_FMAC1 unsigned long SOAP_FMAC2 soap_strtoul(const char *s, char **t, int b); |
113 #endif | |
114 | |
115 -#ifdef WIN32 | |
116 +#if defined(WIN32) && !defined(__MINGW32__) | |
117 # define soap_strtoll _strtoi64 | |
118 #else | |
119 # define soap_strtoll strtoll | |
120 #endif | |
121 | |
122 -#ifdef WIN32 | |
123 +#if defined(WIN32) && !defined(__MINGW32__) | |
124 # define soap_strtoull _strtoui64 | |
125 #else | |
126 # define soap_strtoull strtoull | |
127 -- | |
128 1.7.11.4 | |
129 |