diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2014-01-20 20:29:28 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2014-01-20 20:45:23 (GMT) |
| commit | ad174ec0fe03a224660070857c65f92967d1e0a4 (patch) | |
| tree | 560cb21766b8edf53086934772318096a1f43874 | |
| parent | 1491bf52b45a0c295567df5c0a641bbecb1f8ad7 (diff) | |
| download | mxe-ad174ec0fe03a224660070857c65f92967d1e0a4.zip mxe-ad174ec0fe03a224660070857c65f92967d1e0a4.tar.gz mxe-ad174ec0fe03a224660070857c65f92967d1e0a4.tar.bz2 | |
update package wget
| -rw-r--r-- | src/wget-1-pod.patch | 27 | ||||
| -rw-r--r-- | src/wget-2-cdecl.patch | 37 | ||||
| -rw-r--r-- | src/wget.mk | 7 |
3 files changed, 22 insertions, 49 deletions
diff --git a/src/wget-1-pod.patch b/src/wget-1-pod.patch index 36922da..d894cae 100644 --- a/src/wget-1-pod.patch +++ b/src/wget-1-pod.patch @@ -1,15 +1,21 @@ This file is part of MXE. See index.html for further information. -diff -urN a/doc/texi2pod.pl b/doc/texi2pod.pl ---- a/doc/texi2pod.pl 2012-06-09 11:37:53.000000000 +0100 -+++ b/doc/texi2pod.pl 2013-06-02 22:36:16.641048831 +0100 -@@ -291,10 +291,10 @@ - if (defined $1) { - my $thing = $1; - if ($ic =~ /\@asis/) { -- $_ = "\n=item $thing\n"; -+ $_ = "\n=item * $thing\n"; +From abe9b3992e846f154f05853a30486139d5bca8d6 Mon Sep 17 00:00:00 2001 +From: Tom Molesworth <tom@entitymodel.com> +Date: Mon, 20 Jan 2014 21:23:26 +0100 +Subject: [PATCH] Patch texi2pod.pl for perl-5.14+ + +As described in #200. Similar to #198, this time just needed to +add * bullets to the =item lines to avoid pod errors for the wget +exit codes. + +diff --git a/doc/texi2pod.pl b/doc/texi2pod.pl +index 9db6de1..f8f9544 100755 +--- a/doc/texi2pod.pl ++++ b/doc/texi2pod.pl +@@ -294,7 +294,7 @@ while(<$inf>) { + $_ = "\n=item C<$thing>\n"; } else { # Entity escapes prevent munging by the <> processing below. - $_ = "\n=item $ic\<$thing\>\n"; @@ -17,3 +23,6 @@ diff -urN a/doc/texi2pod.pl b/doc/texi2pod.pl } } else { $_ = "\n=item $ic\n"; +-- +1.8.4 + diff --git a/src/wget-2-cdecl.patch b/src/wget-2-cdecl.patch deleted file mode 100644 index 00cca53..0000000 --- a/src/wget-2-cdecl.patch +++ /dev/null @@ -1,37 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -This patch has been taken from: -X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blobdiff_plain;f=lib%2Fmsvc-inval.c;h=1873e23be4c9d46d95a8b7bea7ea5a07db430829;hp=ef2b8609446ec45000d5f08731400111e4f28d16;hb=86725346a1b116f3c2da26c124288f5f4495bf69;hpb=2845ecc459a4ad03de8397a2c942c2e91d2d3ed5 - -diff --git a/lib/msvc-inval.c b/lib/msvc-inval.c -index ef2b860..1873e23 100644 ---- a/lib/msvc-inval.c -+++ b/lib/msvc-inval.c -@@ -28,7 +28,7 @@ - - # if MSVC_INVALID_PARAMETER_HANDLING == DEFAULT_HANDLING - --static void cdecl -+static void __cdecl - gl_msvc_invalid_parameter_handler (const wchar_t *expression, - const wchar_t *function, - const wchar_t *file, -@@ -45,7 +45,7 @@ gl_msvc_invalid_parameter_handler (const wchar_t *expression, - - # if defined _MSC_VER - --static void cdecl -+static void __cdecl - gl_msvc_invalid_parameter_handler (const wchar_t *expression, - const wchar_t *function, - const wchar_t *file, -@@ -94,7 +94,7 @@ gl_msvc_inval_current (void) - } - } - --static void cdecl -+static void __cdecl - gl_msvc_invalid_parameter_handler (const wchar_t *expression, - const wchar_t *function, - const wchar_t *file, diff --git a/src/wget.mk b/src/wget.mk index afe35e8..efcb3be 100644 --- a/src/wget.mk +++ b/src/wget.mk @@ -2,8 +2,8 @@ # See index.html for further information. PKG := wget -$(PKG)_VERSION := 1.14 -$(PKG)_CHECKSUM := cfa0906e6f72c1c902c29b52d140c22ecdcd617e +$(PKG)_VERSION := 1.15 +$(PKG)_CHECKSUM := e9fb1d25fa04f9c69e74e656a3174dca02700ba1 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://ftp.gnu.org/gnu/$(PKG)/$($(PKG)_FILE) @@ -24,6 +24,7 @@ define $(PKG)_BUILD --build="`config.guess`" \ --prefix='$(PREFIX)/$(TARGET)' \ --with-ssl=gnutls \ - CFLAGS='-DIN6_ARE_ADDR_EQUAL=IN6_ADDR_EQUAL' + CFLAGS='-DIN6_ARE_ADDR_EQUAL=IN6_ADDR_EQUAL' \ + LIBS='-lpthread' $(MAKE) -C '$(1)' -j '$(JOBS)' install endef |