Mercurial > mxe-octave
annotate src/gnutls-1-fixes.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 | fc2b5e19d737 |
| children | 9d1dbbcac6ea |
| 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 |
| 3595 | 4 From dbae911f9d1b79fde473c1ca23e5535c7d1db39c 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 | |
| 3595 | 7 Subject: [PATCH 1/5] 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 | |
| 3595 | 12 index a81d85f..44fe48a 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 |
| 3595 | 19 -AM_INIT_AUTOMAKE([1.12.2 subdir-objects no-dist-gzip dist-xz dist-lzip -Wall -Wno-override]) |
| 20 +AM_INIT_AUTOMAKE([1.12.2 subdir-objects 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 -- | |
| 3595 | 25 1.8.4.5 |
| 2389 | 26 |
| 2570 | 27 |
| 3595 | 28 From 951caab5f444f0c90cb43b5937c7273963e443d8 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 |
| 3595 | 31 Subject: [PATCH 2/5] 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 |
| 3595 | 37 index 44fe48a..1e80e23 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 |
| 3595 | 40 @@ -41,6 +41,7 @@ ggl_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]) |
| 3595 | 45 AM_PROG_CC_C_O |
| 46 AC_PROG_YACC | |
| 47 AC_CHECK_PROG([AUTOGEN], [autogen], [autogen], [/bin/true]) | |
|
2748
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
48 -- |
| 3595 | 49 1.8.4.5 |
| 3267 | 50 |
| 51 | |
| 3595 | 52 From ade9bae0c0af5b6eec402c228c8d048e8a7b5ce6 Mon Sep 17 00:00:00 2001 |
| 3267 | 53 From: Mark Brand <mabrand@mabrand.nl> |
| 54 Date: Mon, 4 Feb 2013 16:11:12 +0100 | |
| 3595 | 55 Subject: [PATCH 3/5] 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 -- | |
| 3595 | 71 1.8.4.5 |
| 3267 | 72 |
| 73 | |
| 3595 | 74 From 36afa9bd2427b6c71c49c832d8a06686920ac8c9 Mon Sep 17 00:00:00 2001 |
| 3267 | 75 From: Tony Theodore <tonyt@logyst.com> |
| 76 Date: Wed, 6 Feb 2013 08:43:43 +0100 | |
| 3595 | 77 Subject: [PATCH 4/5] 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 |
| 3595 | 81 index 1e80e23..0415ead 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 |
| 3595 | 88 -AM_INIT_AUTOMAKE([1.12.2 subdir-objects no-dist-gzip dist-xz -Wall -Wno-override]) |
| 89 +AM_INIT_AUTOMAKE([1.11.1 subdir-objects 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 -- |
| 3595 | 94 1.8.4.5 |
| 95 | |
| 96 | |
| 97 From fc0b1030e357d2de86417a1a442d5ef3643e6fc0 Mon Sep 17 00:00:00 2001 | |
| 98 From: Mark Brand <mabrand@mabrand.nl> | |
| 99 Date: Wed, 5 Feb 2014 09:42:41 +0100 | |
| 100 Subject: [PATCH 5/5] gnulib fix-ups for error, setenv, unsetenv | |
| 101 | |
| 2768 | 102 |
| 3595 | 103 diff --git a/src/gl/Makefile.am b/src/gl/Makefile.am |
| 104 index c25328d..14d592b 100644 | |
| 105 --- a/src/gl/Makefile.am | |
| 106 +++ b/src/gl/Makefile.am | |
| 107 @@ -121,7 +121,7 @@ EXTRA_DIST += errno.in.h | |
| 108 | |
| 109 EXTRA_DIST += error.c error.h | |
| 110 | |
| 111 -EXTRA_libgnu_gpl_la_SOURCES += error.c | |
| 112 +libgnu_gpl_la_SOURCES += error.c | |
| 113 | |
| 114 ## end gnulib module error | |
| 115 | |
| 116 @@ -230,7 +230,7 @@ libgnu_gpl_la_SOURCES += progname.h progname.c | |
| 117 | |
| 118 EXTRA_DIST += setenv.c | |
| 119 | |
| 120 -EXTRA_libgnu_gpl_la_SOURCES += setenv.c | |
| 121 +libgnu_gpl_la_SOURCES += setenv.c | |
| 122 | |
| 123 ## end gnulib module setenv | |
| 124 | |
| 125 @@ -914,7 +914,7 @@ EXTRA_DIST += unistd.in.h | |
| 126 | |
| 127 EXTRA_DIST += unsetenv.c | |
| 128 | |
| 129 -EXTRA_libgnu_gpl_la_SOURCES += unsetenv.c | |
| 130 +libgnu_gpl_la_SOURCES += unsetenv.c | |
| 131 | |
| 132 ## end gnulib module unsetenv | |
| 133 | |
| 134 -- | |
| 135 1.8.4.5 | |
| 136 |