Mercurial > mxe-octave

comparison src/gsoap-1-fixes.patch @ 1672:1ece1ce033b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
package gsoap: fix .pc files
author Mark Brand <mabrand@mabrand.nl>
date Thu, 17 Mar 2011 09:30:44 +0100
parents 1c5aa5278ec2
children cc3dcfeeecdb
comparison
equal deleted inserted replaced
1671:86ab2f6ea088 1672:1ece1ce033b9
4 Contains ad hoc patches for cross building. 4 Contains ad hoc patches for cross building.
5 5
6 From 71debfc0517651491ba4a63a40a7687233107b82 Mon Sep 17 00:00:00 2001 6 From 71debfc0517651491ba4a63a40a7687233107b82 Mon Sep 17 00:00:00 2001
7 From: mingw-cross-env 7 From: mingw-cross-env
8 Date: Wed, 29 Sep 2010 20:40:24 +0200 8 Date: Wed, 29 Sep 2010 20:40:24 +0200
9 Subject: [PATCH 1/3] link dom 9 Subject: [PATCH 1/4] link dom
10 10
11 This patch has been taken from: 11 This patch has been taken from:
12 http://sourceforge.net/tracker/index.php?func=detail&aid=2937534&group_id=52781&atid=468023 12 http://sourceforge.net/tracker/index.php?func=detail&aid=2937534&group_id=52781&atid=468023
13 13
14 diff --git a/gsoap/Makefile.am b/gsoap/Makefile.am 14 diff --git a/gsoap/Makefile.am b/gsoap/Makefile.am
47 +BUILT_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp $(lib_LIBRARIES) 47 +BUILT_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp $(lib_LIBRARIES)
48 48
49 include_HEADERS = stdsoap2.h 49 include_HEADERS = stdsoap2.h
50 50
51 -- 51 --
52 1.7.1 52 1.7.4.1
53 53
54 54
55 From 9686ca99a2a69112f7a8cea46158908c2598787f Mon Sep 17 00:00:00 2001 55 From 9686ca99a2a69112f7a8cea46158908c2598787f Mon Sep 17 00:00:00 2001
56 From: mingw-cross-env 56 From: mingw-cross-env
57 Date: Wed, 29 Sep 2010 20:42:09 +0200 57 Date: Wed, 29 Sep 2010 20:42:09 +0200
58 Subject: [PATCH 2/3] winsock2 58 Subject: [PATCH 2/4] winsock2
59 59
60 This patch has been taken from: 60 This patch has been taken from:
61 http://sourceforge.net/tracker/?func=detail&aid=3071779&group_id=52781&atid=468023 61 http://sourceforge.net/tracker/?func=detail&aid=3071779&group_id=52781&atid=468023
62 62
63 diff --git a/README.txt b/README.txt 63 diff --git a/README.txt b/README.txt
271 +# include <winsock2.h> /* Visual Studio 2005 users: you must install the Platform SDK (R2) */ 271 +# include <winsock2.h> /* Visual Studio 2005 users: you must install the Platform SDK (R2) */
272 /* # include <winsock2.h> */ /* Alternative: use winsock2 (not available with eVC), enable this line and comment out the line above */ 272 /* # include <winsock2.h> */ /* Alternative: use winsock2 (not available with eVC), enable this line and comment out the line above */
273 # else 273 # else
274 # include <winsock2.h> /* Borland C */ 274 # include <winsock2.h> /* Borland C */
275 -- 275 --
276 1.7.1 276 1.7.4.1
277 277
278 278
279 From 7d42e796bf5fa5faa16baa41a0b259638210d239 Mon Sep 17 00:00:00 2001 279 From 7d42e796bf5fa5faa16baa41a0b259638210d239 Mon Sep 17 00:00:00 2001
280 From: mingw-cross-env 280 From: mingw-cross-env
281 Date: Wed, 29 Sep 2010 20:44:00 +0200 281 Date: Wed, 29 Sep 2010 20:44:00 +0200
282 Subject: [PATCH 3/3] add missing -lgpg-error 282 Subject: [PATCH 3/4] add missing -lgpg-error
283 283
284 This patch has been taken from: 284 This patch has been taken from:
285 http://sourceforge.net/tracker/?func=detail&aid=3071775&group_id=52781&atid=468023 285 http://sourceforge.net/tracker/?func=detail&aid=3071775&group_id=52781&atid=468023
286 286
287 diff --git a/configure.in b/configure.in 287 diff --git a/configure.in b/configure.in
298 + SAMPLE_SSL_LIBS="-lgnutls -lgcrypt -lgpg-error -lz" 298 + SAMPLE_SSL_LIBS="-lgnutls -lgcrypt -lgpg-error -lz"
299 WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a" 299 WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a"
300 else 300 else
301 AC_MSG_RESULT(no) 301 AC_MSG_RESULT(no)
302 -- 302 --
303 1.7.1 303 1.7.4.1
304 304
305
306 From 161e8b5835f8863d88445a2e169bcc0118fcebf5 Mon Sep 17 00:00:00 2001
307 From: mingw-cross-env
308 Date: Thu, 17 Mar 2011 09:16:28 +0100
309 Subject: [PATCH 4/4] add dependencies in .pc files
310
311 fix
312
313 diff --git a/gsoap++.pc.in b/gsoap++.pc.in
314 index 6eb3746..1e93039 100644
315 --- a/gsoap++.pc.in
316 +++ b/gsoap++.pc.in
317 @@ -7,5 +7,5 @@ Name: GSoap
318 Description: SOAP C++ Web Services
319 Version: @VERSION@
320 Requires:
321 -Libs: -L${libdir} -lgsoap++
322 +Libs: -L${libdir} -lgsoap++ @SAMPLE_EXTRA_LIBS@
323 Cflags: -DWITH_DOM -I${includedir}
324 diff --git a/gsoap.pc.in b/gsoap.pc.in
325 index 91d226f..d11e5fc 100644
326 --- a/gsoap.pc.in
327 +++ b/gsoap.pc.in
328 @@ -7,5 +7,5 @@ Name: GSoap
329 Description: SOAP C Web Services
330 Version: @VERSION@
331 Requires:
332 -Libs: -L${libdir} -lgsoap
333 +Libs: -L${libdir} -lgsoap @SAMPLE_EXTRA_LIBS@
334 Cflags: -DWITH_DOM -I${includedir}
335 diff --git a/gsoapssl++.pc.in b/gsoapssl++.pc.in
336 index e8c8f4f..07515fe 100644
337 --- a/gsoapssl++.pc.in
338 +++ b/gsoapssl++.pc.in
339 @@ -7,5 +7,5 @@ Name: GSoap
340 Description: SOAP C++ Web Services with SSL and ZLIB
341 Version: @VERSION@
342 Requires:
343 -Libs: -L${libdir} -lgsoapssl++
344 +Libs: -L${libdir} -lgsoapssl++ @SAMPLE_SSL_LIBS@ @SAMPLE_EXTRA_LIBS@
345 Cflags: -DWITH_OPENSSL -DWITH_DOM -DWITH_COOKIES -DWITH_GZIP -I${includedir}
346 diff --git a/gsoapssl.pc.in b/gsoapssl.pc.in
347 index d3df1a8..1a4a1db 100644
348 --- a/gsoapssl.pc.in
349 +++ b/gsoapssl.pc.in
350 @@ -7,5 +7,5 @@ Name: GSoap
351 Description: SOAP C Web Services with SSL and ZLIB
352 Version: @VERSION@
353 Requires:
354 -Libs: -L${libdir} -lgsoapssl
355 +Libs: -L${libdir} -lgsoapssl @SAMPLE_SSL_LIBS@ @SAMPLE_EXTRA_LIBS@
356 Cflags: -DWITH_OPENSSL -DWITH_DOM -DWITH_COOKIES -DWITH_GZIP -I${includedir}
357 --
358 1.7.4.1
359