wget: bump version

This commit is contained in:
Jerome Duval
2015-03-03 17:26:14 +00:00
parent 65314676a4
commit b714e25f33
2 changed files with 38 additions and 15 deletions

View File

@@ -1,14 +1,14 @@
From d95daf9cb193a1fad78540947f57e8737c170835 Mon Sep 17 00:00:00 2001 From 16a5b177ebc8fdf7c9ba666292fd08179c111f7e Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com> From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 19 May 2014 15:38:37 +0000 Date: Mon, 19 May 2014 15:38:37 +0000
Subject: apply wget-1.14.patch Subject: apply wget-1.14.patch
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index 3cbe618..e617bb2 100644 index 01ea237..c31da2c 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -170,6 +170,7 @@ AC_HEADER_STDBOOL @@ -231,6 +231,7 @@ AC_HEADER_STDBOOL
AC_CHECK_HEADERS(unistd.h sys/time.h) AC_CHECK_HEADERS(unistd.h sys/time.h)
AC_CHECK_HEADERS(termios.h sys/ioctl.h sys/select.h utime.h sys/utime.h) AC_CHECK_HEADERS(termios.h sys/ioctl.h sys/select.h utime.h sys/utime.h)
AC_CHECK_HEADERS(stdint.h inttypes.h pwd.h wchar.h) AC_CHECK_HEADERS(stdint.h inttypes.h pwd.h wchar.h)
@@ -38,10 +38,10 @@ index 777e973..5a8b75d 100644
diff --git a/src/config.h.in b/src/config.h.in diff --git a/src/config.h.in b/src/config.h.in
index 879ce64..22bd801 100644 index 3953a4d..26c33a8 100644
--- a/src/config.h.in --- a/src/config.h.in
+++ b/src/config.h.in +++ b/src/config.h.in
@@ -699,6 +699,9 @@ @@ -741,6 +741,9 @@
/* Define to 1 if you have the <langinfo.h> header file. */ /* Define to 1 if you have the <langinfo.h> header file. */
#undef HAVE_LANGINFO_H #undef HAVE_LANGINFO_H
@@ -51,7 +51,7 @@ index 879ce64..22bd801 100644
/* Define to 1 if you have the `dl' library (-ldl). */ /* Define to 1 if you have the `dl' library (-ldl). */
#undef HAVE_LIBDL #undef HAVE_LIBDL
@@ -711,6 +714,9 @@ @@ -753,6 +756,9 @@
/* Define to 1 if you have the <libintl.h> header file. */ /* Define to 1 if you have the <libintl.h> header file. */
#undef HAVE_LIBINTL_H #undef HAVE_LIBINTL_H
@@ -62,7 +62,7 @@ index 879ce64..22bd801 100644
#undef HAVE_LIBNSL #undef HAVE_LIBNSL
diff --git a/src/connect.c b/src/connect.c diff --git a/src/connect.c b/src/connect.c
index 1fb1819..f2c832b 100644 index c9dd6fb..0afc248 100644
--- a/src/connect.c --- a/src/connect.c
+++ b/src/connect.c +++ b/src/connect.c
@@ -46,7 +46,7 @@ as that of the covered work. */ @@ -46,7 +46,7 @@ as that of the covered work. */
@@ -95,26 +95,49 @@ index 84f3d13..e664e7f 100644
1.8.3.4 1.8.3.4
From 429d0bbb2c9d1243d009df399045028cc062684e Mon Sep 17 00:00:00 2001 From 578731992b9028da3ffee8b498d0c294ded0bb00 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com> From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 19 May 2014 15:47:24 +0000 Date: Mon, 19 May 2014 15:47:24 +0000
Subject: apply and augment wget-1.14-build-fixes.patch Subject: apply and augment wget-1.14-build-fixes.patch
diff --git a/src/utils.c b/src/utils.c diff --git a/src/utils.c b/src/utils.c
index 78c282e..6a21164 100644 index 3cc7d97..9f173f3 100644
--- a/src/utils.c --- a/src/utils.c
+++ b/src/utils.c +++ b/src/utils.c
@@ -64,7 +64,9 @@ as that of the covered work. */ @@ -65,7 +65,9 @@ as that of the covered work. */
#include <sys/stat.h>
/* For TIOCGWINSZ and friends: */ /* For TIOCGWINSZ and friends: */
#ifndef WINDOWS
+#ifndef __HAIKU__ +#ifndef __HAIKU__
#include <sys/ioctl.h> # include <sys/ioctl.h>
+#endif +#endif
#include <termios.h> # include <termios.h>
#endif
--
1.8.3.4
From 375ccd60aa09df33db4ae51fbe7ab297e43478ae Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 3 Mar 2015 17:18:24 +0000
Subject: gettext version issue
diff --git a/configure.ac b/configure.ac
index c31da2c..6a30b9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -177,7 +177,7 @@ dnl
dnl Gettext
dnl
AM_GNU_GETTEXT([external],[need-ngettext])
-AM_GNU_GETTEXT_VERSION([0.17])
+AM_GNU_GETTEXT_VERSION([0.18])
AC_PROG_RANLIB
/* Needed for Unix version of run_with_timeout. */
-- --
1.8.3.4 1.8.3.4

View File

@@ -6,7 +6,7 @@ scripts.
" "
HOMEPAGE="http://www.gnu.org/software/wget" HOMEPAGE="http://www.gnu.org/software/wget"
SRC_URI="http://ftp.gnu.org/gnu/wget/wget-$portVersion.tar.gz" SRC_URI="http://ftp.gnu.org/gnu/wget/wget-$portVersion.tar.gz"
CHECKSUM_SHA256="3b834ce69366d4681f295307fce36ee14e122c4ee68a4d1291b62b0b26755a77" CHECKSUM_SHA256="311a28f211117a338501009bfaba5bfeb9cd71564a7b9ad5775b8f5f4369f972"
LICENSE="GNU GPL v3" LICENSE="GNU GPL v3"
COPYRIGHT="1996-2014 Free Software Foundation" COPYRIGHT="1996-2014 Free Software Foundation"
REVISION="1" REVISION="1"