From 0b6b79699334472a53f9a63d04f58ac18c16860b Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Fri, 9 Feb 2018 13:23:29 +0300 Subject: [PATCH] patch: Update to 2.7.6 --- patch/PKGBUILD | 6 +++--- patch/msys2-patch-2.7.1.patch | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/patch/PKGBUILD b/patch/PKGBUILD index acd7dfdb61d..698649f95ed 100644 --- a/patch/PKGBUILD +++ b/patch/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Alexey Pavlov pkgname=patch -pkgver=2.7.5 +pkgver=2.7.6 pkgrel=1 pkgdesc="A utility to apply patch files to original sources" arch=('i686' 'x86_64') @@ -14,9 +14,9 @@ optdepends=('ed: for patch -e functionality') source=(https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig} msys2-patch-2.7.1.patch msys2-patch-manifest.patch) -sha256sums=('fd95153655d6b95567e623843a0e77b81612d502ecf78a489a4aed7867caa299' +sha256sums=('ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd' 'SKIP' - '9be45bcfb141c17b7501ed10cc88d50967d6c2cc1bba2f1273a47ca7e316ffe0' + 'abcb73c2e0941d49335a864e28e59ba1ad6477deef981a2e89374004e658b791' '714da1a384d3e0acca5351980b0b3b1b09b66140fabe2e74dfd313652f964de9') prepare() { diff --git a/patch/msys2-patch-2.7.1.patch b/patch/msys2-patch-2.7.1.patch index fd329acde95..a5f8f5e824a 100644 --- a/patch/msys2-patch-2.7.1.patch +++ b/patch/msys2-patch-2.7.1.patch @@ -59,8 +59,8 @@ diff -Naur patch-2.7.1/build-aux/config.guess patch-2.7.1-p/build-aux/config.gue + amd64:MSYS*:*:* | x86_64:MSYS*:*:*) + echo x86_64-unknown-msys + exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin + prep*:SunOS:5.*:*) + echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; diff -Naur patch-2.7.1/lib/gnulib.mk patch-2.7.1-p/lib/gnulib.mk --- patch-2.7.1/lib/gnulib.mk 2012-09-28 20:40:58 +0400 @@ -104,7 +104,7 @@ diff -Naur patch-2.7.1/m4/malloc.m4 patch-2.7.1-p/m4/malloc.m4 @@ -30,7 +30,7 @@ [case "$host_os" in # Guess yes on platforms where we know the result. - *-gnu* | freebsd* | netbsd* | openbsd* \ + *-gnu* | gnu* | freebsd* | netbsd* | openbsd* \ - | hpux* | solaris* | cygwin* | mingw*) + | hpux* | solaris* | cygwin* | msys* | mingw*) ac_cv_func_malloc_0_nonnull=yes ;; @@ -114,14 +114,14 @@ diff -Naur patch-2.7.1/m4/printf.m4 patch-2.7.1-p/m4/printf.m4 --- patch-2.7.1/m4/printf.m4 2012-08-01 06:44:13 +0400 +++ patch-2.7.1-p/m4/printf.m4 2013-02-24 13:48:31 +0400 @@ -735,7 +735,7 @@ - openbsd*) gl_cv_func_printf_directive_ls="guessing no";; - irix*) gl_cv_func_printf_directive_ls="guessing no";; - solaris*) gl_cv_func_printf_directive_ls="guessing no";; -- cygwin*) gl_cv_func_printf_directive_ls="guessing no";; + openbsd*) gl_cv_func_printf_directive_ls="guessing no";; + irix*) gl_cv_func_printf_directive_ls="guessing no";; + solaris*) gl_cv_func_printf_directive_ls="guessing no";; +- cygwin*) gl_cv_func_printf_directive_ls="guessing no";; + cygwin* | msys*) gl_cv_func_printf_directive_ls="guessing no";; - beos* | haiku*) gl_cv_func_printf_directive_ls="guessing no";; - *) gl_cv_func_printf_directive_ls="guessing yes";; - esac + beos* | haiku*) gl_cv_func_printf_directive_ls="guessing no";; + # Guess yes on native Windows. + mingw*) gl_cv_func_printf_directive_ls="guessing yes";; @@ -812,7 +812,7 @@ [ changequote(,)dnl @@ -146,7 +146,7 @@ diff -Naur patch-2.7.1/m4/realloc.m4 patch-2.7.1-p/m4/realloc.m4 @@ -30,7 +30,7 @@ [case "$host_os" in # Guess yes on platforms where we know the result. - *-gnu* | freebsd* | netbsd* | openbsd* \ + *-gnu* | gnu* | freebsd* | netbsd* | openbsd* \ - | hpux* | solaris* | cygwin* | mingw*) + | hpux* | solaris* | cygwin* | msys* | mingw*) ac_cv_func_realloc_0_nonnull=yes ;;