mxe-octave: src/gnutls-1-fixes.patch annotate

annotate src/gnutls-1-fixes.patch @ 2264:335b2c80a2db

update package gnutls --- src/gnutls-1-fixes.patch | 40 +++++++++++++++++++++++++++++++++------- src/gnutls.mk | 4 ++-- 2 files changed, 35 insertions(+), 9 deletions(-)

author	Mark Brand <mabrand@mabrand.nl>
date	Fri, 02 Mar 2012 22:27:33 +0100
parents	572d4140383a
children	634e7a651e29

rev	line source
1923 fb1d95da571b package gnutls: fixed .pc file Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1 This file is part of mingw-cross-env.
fb1d95da571b package gnutls: fixed .pc file Mark Brand <mabrand@mabrand.nl> parents: diff changeset	2 See doc/index.html for further information.
fb1d95da571b package gnutls: fixed .pc file Mark Brand <mabrand@mabrand.nl> parents: diff changeset	3
fb1d95da571b package gnutls: fixed .pc file Mark Brand <mabrand@mabrand.nl> parents: diff changeset	4 Contains ad hoc patches for cross building.
fb1d95da571b package gnutls: fixed .pc file Mark Brand <mabrand@mabrand.nl> parents: diff changeset	5
2264 335b2c80a2db update package gnutls Mark Brand <mabrand@mabrand.nl> parents: 2246 diff changeset	6 From 19d2c3dbe60872e57b6e897f8a6f66c8b11ca103 Mon Sep 17 00:00:00 2001
1923 fb1d95da571b package gnutls: fixed .pc file Mark Brand <mabrand@mabrand.nl> parents: diff changeset	7 From: mingw-cross-env
2057 8ad4a821fc50 upgrade package gnutls Mark Brand <mabrand@mabrand.nl> parents: 1953 diff changeset	8 Date: Fri, 28 Oct 2011 09:23:41 +0200
2264 335b2c80a2db update package gnutls Mark Brand <mabrand@mabrand.nl> parents: 2246 diff changeset	9 Subject: [PATCH 1/3] add missing static library linking
1923 fb1d95da571b package gnutls: fixed .pc file Mark Brand <mabrand@mabrand.nl> parents: diff changeset	10
fb1d95da571b package gnutls: fixed .pc file Mark Brand <mabrand@mabrand.nl> parents: diff changeset	11
fb1d95da571b package gnutls: fixed .pc file Mark Brand <mabrand@mabrand.nl> parents: diff changeset	12 diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in
2246 572d4140383a update package gnutls Mark Brand <mabrand@mabrand.nl> parents: 2204 diff changeset	13 index c45f8f3..57d0dbb 100644
1923 fb1d95da571b package gnutls: fixed .pc file Mark Brand <mabrand@mabrand.nl> parents: diff changeset	14 --- a/lib/gnutls.pc.in
fb1d95da571b package gnutls: fixed .pc file Mark Brand <mabrand@mabrand.nl> parents: diff changeset	15 +++ b/lib/gnutls.pc.in
2246 572d4140383a update package gnutls Mark Brand <mabrand@mabrand.nl> parents: 2204 diff changeset	16 @@ -19,6 +19,6 @@ Description: Transport Security Layer implementation for the GNU system
1923 fb1d95da571b package gnutls: fixed .pc file Mark Brand <mabrand@mabrand.nl> parents: diff changeset	17 URL: http://www.gnu.org/software/gnutls/
fb1d95da571b package gnutls: fixed .pc file Mark Brand <mabrand@mabrand.nl> parents: diff changeset	18 Version: @VERSION@
fb1d95da571b package gnutls: fixed .pc file Mark Brand <mabrand@mabrand.nl> parents: diff changeset	19 Libs: -L${libdir} -lgnutls
2057 8ad4a821fc50 upgrade package gnutls Mark Brand <mabrand@mabrand.nl> parents: 1953 diff changeset	20 -Libs.private: @LTLIBNETTLE@
2128 e54452862e8b package gnutls: clean up Mark Brand <mabrand@mabrand.nl> parents: 2057 diff changeset	21 +Libs.private: @LTLIBNETTLE@ @LIBS@
1923 fb1d95da571b package gnutls: fixed .pc file Mark Brand <mabrand@mabrand.nl> parents: diff changeset	22 @GNUTLS_REQUIRES_PRIVATE@
fb1d95da571b package gnutls: fixed .pc file Mark Brand <mabrand@mabrand.nl> parents: diff changeset	23 Cflags: -I${includedir}
fb1d95da571b package gnutls: fixed .pc file Mark Brand <mabrand@mabrand.nl> parents: diff changeset	24 --
2264 335b2c80a2db update package gnutls Mark Brand <mabrand@mabrand.nl> parents: 2246 diff changeset	25 1.7.9.2
2128 e54452862e8b package gnutls: clean up Mark Brand <mabrand@mabrand.nl> parents: 2057 diff changeset	26
1923 fb1d95da571b package gnutls: fixed .pc file Mark Brand <mabrand@mabrand.nl> parents: diff changeset	27
2264 335b2c80a2db update package gnutls Mark Brand <mabrand@mabrand.nl> parents: 2246 diff changeset	28 From 02fe82f7e712f6be7dd7305501551ac2661ca540 Mon Sep 17 00:00:00 2001
2128 e54452862e8b package gnutls: clean up Mark Brand <mabrand@mabrand.nl> parents: 2057 diff changeset	29 From: mingw-cross-env
e54452862e8b package gnutls: clean up Mark Brand <mabrand@mabrand.nl> parents: 2057 diff changeset	30 Date: Thu, 24 Nov 2011 15:06:06 +0100
2264 335b2c80a2db update package gnutls Mark Brand <mabrand@mabrand.nl> parents: 2246 diff changeset	31 Subject: [PATCH 2/3] disable doc and test (mingw-cross-env specific)
2128 e54452862e8b package gnutls: clean up Mark Brand <mabrand@mabrand.nl> parents: 2057 diff changeset	32
e54452862e8b package gnutls: clean up Mark Brand <mabrand@mabrand.nl> parents: 2057 diff changeset	33
e54452862e8b package gnutls: clean up Mark Brand <mabrand@mabrand.nl> parents: 2057 diff changeset	34 diff --git a/Makefile.am b/Makefile.am
2264 335b2c80a2db update package gnutls Mark Brand <mabrand@mabrand.nl> parents: 2246 diff changeset	35 index 0afe4bd..da7436a 100644
2128 e54452862e8b package gnutls: clean up Mark Brand <mabrand@mabrand.nl> parents: 2057 diff changeset	36 --- a/Makefile.am
e54452862e8b package gnutls: clean up Mark Brand <mabrand@mabrand.nl> parents: 2057 diff changeset	37 +++ b/Makefile.am
2246 572d4140383a update package gnutls Mark Brand <mabrand@mabrand.nl> parents: 2204 diff changeset	38 @@ -23,7 +23,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-valgrind-tests
2128 e54452862e8b package gnutls: clean up Mark Brand <mabrand@mabrand.nl> parents: 2057 diff changeset	39
2246 572d4140383a update package gnutls Mark Brand <mabrand@mabrand.nl> parents: 2204 diff changeset	40 SUBDIRS = gl lib extra po
2128 e54452862e8b package gnutls: clean up Mark Brand <mabrand@mabrand.nl> parents: 2057 diff changeset	41
2246 572d4140383a update package gnutls Mark Brand <mabrand@mabrand.nl> parents: 2204 diff changeset	42 -SUBDIRS += src doc tests
572d4140383a update package gnutls Mark Brand <mabrand@mabrand.nl> parents: 2204 diff changeset	43 +SUBDIRS += src
2128 e54452862e8b package gnutls: clean up Mark Brand <mabrand@mabrand.nl> parents: 2057 diff changeset	44
e54452862e8b package gnutls: clean up Mark Brand <mabrand@mabrand.nl> parents: 2057 diff changeset	45 if HAVE_GUILE
e54452862e8b package gnutls: clean up Mark Brand <mabrand@mabrand.nl> parents: 2057 diff changeset	46 SUBDIRS += guile
e54452862e8b package gnutls: clean up Mark Brand <mabrand@mabrand.nl> parents: 2057 diff changeset	47 --
2264 335b2c80a2db update package gnutls Mark Brand <mabrand@mabrand.nl> parents: 2246 diff changeset	48 1.7.9.2
335b2c80a2db update package gnutls Mark Brand <mabrand@mabrand.nl> parents: 2246 diff changeset	49
335b2c80a2db update package gnutls Mark Brand <mabrand@mabrand.nl> parents: 2246 diff changeset	50
335b2c80a2db update package gnutls Mark Brand <mabrand@mabrand.nl> parents: 2246 diff changeset	51 From 5f28dc1975988edd7a9527a9e587341cd4cc3101 Mon Sep 17 00:00:00 2001
335b2c80a2db update package gnutls Mark Brand <mabrand@mabrand.nl> parents: 2246 diff changeset	52 From: mingw-cross-env
335b2c80a2db update package gnutls Mark Brand <mabrand@mabrand.nl> parents: 2246 diff changeset	53 Date: Fri, 2 Mar 2012 21:39:39 +0100
335b2c80a2db update package gnutls Mark Brand <mabrand@mabrand.nl> parents: 2246 diff changeset	54 Subject: [PATCH 3/3] no fchmod() for MinGW32
335b2c80a2db update package gnutls Mark Brand <mabrand@mabrand.nl> parents: 2246 diff changeset	55
335b2c80a2db update package gnutls Mark Brand <mabrand@mabrand.nl> parents: 2246 diff changeset	56 taken from
335b2c80a2db update package gnutls Mark Brand <mabrand@mabrand.nl> parents: 2246 diff changeset	57 http://lists.gnu.org/archive/html/gnutls-devel/2012-03/msg00005.html
2128 e54452862e8b package gnutls: clean up Mark Brand <mabrand@mabrand.nl> parents: 2057 diff changeset	58
2264 335b2c80a2db update package gnutls Mark Brand <mabrand@mabrand.nl> parents: 2246 diff changeset	59 diff --git a/src/libopts/makeshell.c b/src/libopts/makeshell.c
335b2c80a2db update package gnutls Mark Brand <mabrand@mabrand.nl> parents: 2246 diff changeset	60 index 1730c81..45d170b 100644
335b2c80a2db update package gnutls Mark Brand <mabrand@mabrand.nl> parents: 2246 diff changeset	61 --- a/src/libopts/makeshell.c
335b2c80a2db update package gnutls Mark Brand <mabrand@mabrand.nl> parents: 2246 diff changeset	62 +++ b/src/libopts/makeshell.c
335b2c80a2db update package gnutls Mark Brand <mabrand@mabrand.nl> parents: 2246 diff changeset	63 @@ -164,7 +164,9 @@ optionParseShell(tOptions * pOpts)
335b2c80a2db update package gnutls Mark Brand <mabrand@mabrand.nl> parents: 2246 diff changeset	64 printf(SHOW_PROG_ENV, pOpts->pzPROGNAME);
335b2c80a2db update package gnutls Mark Brand <mabrand@mabrand.nl> parents: 2246 diff changeset	65
335b2c80a2db update package gnutls Mark Brand <mabrand@mabrand.nl> parents: 2246 diff changeset	66 fflush(stdout);
335b2c80a2db update package gnutls Mark Brand <mabrand@mabrand.nl> parents: 2246 diff changeset	67 +#ifndef __MINGW32__
335b2c80a2db update package gnutls Mark Brand <mabrand@mabrand.nl> parents: 2246 diff changeset	68 fchmod(STDOUT_FILENO, 0755);
335b2c80a2db update package gnutls Mark Brand <mabrand@mabrand.nl> parents: 2246 diff changeset	69 +#endif
335b2c80a2db update package gnutls Mark Brand <mabrand@mabrand.nl> parents: 2246 diff changeset	70 fclose(stdout);
335b2c80a2db update package gnutls Mark Brand <mabrand@mabrand.nl> parents: 2246 diff changeset	71 if (ferror(stdout)) {
335b2c80a2db update package gnutls Mark Brand <mabrand@mabrand.nl> parents: 2246 diff changeset	72 fputs(zOutputFail, stderr);
335b2c80a2db update package gnutls Mark Brand <mabrand@mabrand.nl> parents: 2246 diff changeset	73 --
335b2c80a2db update package gnutls Mark Brand <mabrand@mabrand.nl> parents: 2246 diff changeset	74 1.7.9.2
335b2c80a2db update package gnutls Mark Brand <mabrand@mabrand.nl> parents: 2246 diff changeset	75

Mercurial > mxe-octave

annotate src/gnutls-1-fixes.patch @ 2264:335b2c80a2db