Mercurial > mxe-octave
annotate src/gnutls-1-fixes.patch @ 3267:cce4bedf4c3d
new version of gnutls
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 16 Oct 2013 23:45:07 -0400 |
| parents | 0ddfaea74200 |
| children | fc2b5e19d737 |
| rev | line source |
|---|---|
|
2333
f653602a0500
Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents:
2285
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. |
| 1923 | 3 |
| 3267 | 4 From 05cd16c35674665009d16f2469b9124c16638237 Mon Sep 17 00:00:00 2001 |
| 2389 | 5 From: Mark Brand <mabrand@mabrand.nl> |
| 6 Date: Tue, 3 Apr 2012 13:58:42 +0200 | |
| 3267 | 7 Subject: [PATCH 1/4] Revert "make dist will also make lzip compressed tarball" |
| 2389 | 8 |
| 9 This reverts commit 97ac1bc58274f651338444693bd75441ba12f46f. | |
| 10 | |
| 11 diff --git a/configure.ac b/configure.ac | |
| 3267 | 12 index 6459403..f8dd727 100644 |
| 2389 | 13 --- a/configure.ac |
| 14 +++ b/configure.ac | |
| 3267 | 15 @@ -26,7 +26,7 @@ AC_CONFIG_AUX_DIR([build-aux]) |
| 2389 | 16 AC_CONFIG_MACRO_DIR([m4]) |
| 3267 | 17 AC_CANONICAL_HOST |
| 2389 | 18 |
| 3267 | 19 -AM_INIT_AUTOMAKE([1.12.2 no-dist-gzip dist-xz dist-lzip -Wall -Wno-override]) |
| 20 +AM_INIT_AUTOMAKE([1.12.2 no-dist-gzip dist-xz -Wall -Wno-override]) | |
| 2389 | 21 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) |
| 3267 | 22 AC_CONFIG_HEADERS([config.h]) |
| 2389 | 23 |
| 24 -- | |
| 3267 | 25 1.8.1.4 |
| 2389 | 26 |
| 2570 | 27 |
| 3267 | 28 From 6d7644c82de49b38afda2a171d1195861ebd9db0 Mon Sep 17 00:00:00 2001 |
|
2748
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
29 From: Mark Brand <mabrand@mabrand.nl> |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
30 Date: Wed, 6 Jun 2012 09:57:24 +0200 |
| 3267 | 31 Subject: [PATCH 2/4] AM_PROG_AR for automake 1.12 compatibility |
|
2748
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
32 |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
33 Taken from |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
34 http://lists.gnu.org/archive/html/automake/2012-05/msg00014.html |
| 2264 | 35 |
|
2748
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
36 diff --git a/configure.ac b/configure.ac |
| 3267 | 37 index f8dd727..2c05458 100644 |
|
2748
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
38 --- a/configure.ac |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
39 +++ b/configure.ac |
| 3267 | 40 @@ -40,6 +40,7 @@ gl_EARLY |
|
2748
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
41 AM_PROG_AS |
| 3267 | 42 AM_PROG_AR |
|
2748
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
43 AC_PROG_CXX |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
44 +m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
45 |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
46 # For includes/gnutls/gnutls.h.in. |
| 3267 | 47 AC_SUBST(MAJOR_VERSION, `echo $PACKAGE_VERSION | sed 's/\(.*\)\..*\..*/\1/g'`) |
|
2748
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
48 -- |
| 3267 | 49 1.8.1.4 |
| 50 | |
| 51 | |
| 52 From 7afa4d386bb2076890113a5d4e665c39583ff025 Mon Sep 17 00:00:00 2001 | |
| 53 From: Mark Brand <mabrand@mabrand.nl> | |
| 54 Date: Mon, 4 Feb 2013 16:11:12 +0100 | |
| 55 Subject: [PATCH 3/4] add missing private lib to pc file | |
|
2748
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
56 |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
57 |
| 3267 | 58 diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in |
| 59 index a25fcdf..3860c68 100644 | |
| 60 --- a/lib/gnutls.pc.in | |
| 61 +++ b/lib/gnutls.pc.in | |
| 62 @@ -19,6 +19,6 @@ Description: Transport Security Layer implementation for the GNU system | |
| 63 URL: http://www.gnutls.org/ | |
| 64 Version: @VERSION@ | |
| 65 Libs: -L${libdir} -lgnutls | |
| 66 -Libs.private: @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBPTHREAD@ @LTLIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ | |
| 67 +Libs.private: @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBPTHREAD@ @LTLIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ -lcrypt32 | |
| 68 @GNUTLS_REQUIRES_PRIVATE@ | |
| 69 Cflags: -I${includedir} | |
| 70 -- | |
| 71 1.8.1.4 | |
| 72 | |
| 73 | |
| 74 From 903e858e59718f03fd3b3bef00fab897b0313007 Mon Sep 17 00:00:00 2001 | |
| 75 From: Tony Theodore <tonyt@logyst.com> | |
| 76 Date: Wed, 6 Feb 2013 08:43:43 +0100 | |
| 77 Subject: [PATCH 4/4] relax automake version check | |
|
2748
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
78 |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
79 |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
80 diff --git a/configure.ac b/configure.ac |
| 3267 | 81 index 2c05458..dd45228 100644 |
|
2748
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
82 --- a/configure.ac |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
83 +++ b/configure.ac |
| 3267 | 84 @@ -26,7 +26,7 @@ AC_CONFIG_AUX_DIR([build-aux]) |
|
2748
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
85 AC_CONFIG_MACRO_DIR([m4]) |
| 3267 | 86 AC_CANONICAL_HOST |
|
2748
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
87 |
| 3267 | 88 -AM_INIT_AUTOMAKE([1.12.2 no-dist-gzip dist-xz -Wall -Wno-override]) |
| 89 +AM_INIT_AUTOMAKE([1.11.1 no-dist-gzip dist-xz -Wall -Wno-override]) | |
|
2748
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
90 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) |
| 3267 | 91 AC_CONFIG_HEADERS([config.h]) |
|
2748
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
92 |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
93 -- |
| 3267 | 94 1.8.1.4 |
| 2768 | 95 |