diff --git a/wget/PKGBUILD b/wget/PKGBUILD index ba64dfc0..7df74b55 100644 --- a/wget/PKGBUILD +++ b/wget/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Alexey Pavlov pkgname=wget -pkgver=1.19.5 +pkgver=1.20 pkgrel=1 pkgdesc="A network utility to retrieve files from the Web" arch=('i686' 'x86_64') @@ -18,10 +18,10 @@ source=(https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.lz{,.sig} 1.13.4-sysconfdir.patch wget-1.14-msys2.patch fix-gettext-version.patch) -sha256sums=('29fbe6f3d5408430c572a63fe32bd43d5860f32691173dfd84edc06869edca75' +sha256sums=('b0b80f565ac27f5e56c847431c75b4f8fcb31af9dad2bf5ce947d89651f3681e' 'SKIP' 'c397093e82b50bcc6a4112a14b22d7426e67ce853d0dae65170aec6d7def4de8' - '162f4e63fe759e2eb7a507179d02f840143ee914b7f9a32bbb65afbfd6aa3640' + 'd36e1ca26e16f3fa0085a53136203070dcba32cec111edb3ef2667cb6e18fc3d' '47c50fc5157ab878da8d40e8e07d8aa778a2a6e8f625260bca646796f32501f7') validpgpkeys=('7845120B07CBD8D6ECE5FF2B2A1743EDA91A35B6') # Tim Rühsen diff --git a/wget/wget-1.14-msys2.patch b/wget/wget-1.14-msys2.patch index ff31474c..f2319230 100644 --- a/wget/wget-1.14-msys2.patch +++ b/wget/wget-1.14-msys2.patch @@ -1,24 +1,3 @@ -diff -Naur wget-1.14-orig/build-aux/compile wget-1.14/build-aux/compile ---- wget-1.14-orig/build-aux/compile 2012-08-06 00:17:15.000000000 +0400 -+++ wget-1.14/build-aux/compile 2013-07-18 11:12:55.990234400 +0400 -@@ -54,7 +54,7 @@ - MINGW*) - file_conv=mingw - ;; -- CYGWIN*) -+ CYGWIN*|MSYS*) - file_conv=cygwin - ;; - *) -@@ -68,7 +68,7 @@ - mingw/*) - file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` - ;; -- cygwin/*) -+ cygwin/*|msys/*) - file=`cygpath -m "$file" || echo "$file"` - ;; - wine/*) diff -Naur wget-1.19.3-orig/build-aux/config.guess wget-1.19.3/build-aux/config.guess --- wget-1.19.3-orig/build-aux/config.guess 2012-08-06 00:15:33.000000000 +0400 +++ wget-1.19.3/build-aux/config.guess 2013-07-18 11:13:39.849609400 +0400 @@ -80,18 +59,6 @@ diff -Naur wget-1.14-orig/build-aux/config.rpath wget-1.14/build-aux/config.rpat shrext=.dll library_names_spec='$libname.dll.a $libname.lib' ;; -diff -Naur wget-1.14-orig/lib/Makefile.am wget-1.14/lib/Makefile.am ---- wget-1.14-orig/lib/Makefile.am 2012-08-06 00:16:46.000000000 +0400 -+++ wget-1.14/lib/Makefile.am 2013-07-18 11:14:12.365234400 +0400 -@@ -759,7 +759,7 @@ - case '$(host_os)' in \ - darwin[56]*) \ - need_charset_alias=true ;; \ -- darwin* | cygwin* | mingw* | pw32* | cegcc*) \ -+ darwin* | cygwin* | msys* | mingw* | pw32* | cegcc*) \ - need_charset_alias=false ;; \ - *) \ - need_charset_alias=true ;; \ diff -Naur wget-1.14-orig/m4/btowc.m4 wget-1.14/m4/btowc.m4 --- wget-1.14-orig/m4/btowc.m4 2012-07-14 15:09:25.000000000 +0400 +++ wget-1.14/m4/btowc.m4 2013-07-18 11:14:48.240234400 +0400