Merge pull request #3620 from lazka/diffutils-3.9

diffutils: Update to 3.9
This commit is contained in:
Christoph Reiter 2023-03-12 11:22:27 +01:00 committed by GitHub
commit 7e894a738b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 21 deletions

View File

@ -1,26 +1,22 @@
# Maintainer: Alexey Pavlov <alexpux@gmail.com>
pkgname=diffutils
pkgver=3.8
pkgrel=4
pkgver=3.9
pkgrel=1
pkgdesc="Utility programs used for creating patch files"
arch=('i686' 'x86_64')
url="https://www.gnu.org/software/diffutils"
license=('spdx:GPL-3.0-or-later')
depends=('sh' 'libiconv' 'libintl')
makedepends=('autotools' 'gcc' 'gettext-devel' 'libiconv-devel')
source=(https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}
gnulib-weak.patch)
sha256sums=('a6bdd7d1b31266d11c4f4de6c1b748d4607ab0231af5188fc2533d0ae2438fec'
'SKIP'
'bf5185de612006c938ca1e82ea3e59f177948bfd2cbcaba7d647e00e0e380a3b')
source=(https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig})
sha256sums=('d80d3be90a201868de83d78dad3413ad88160cc53bcc36eb9eaf7c20dbf023f1'
'SKIP')
validpgpkeys=('155D3FC500C834486D1EEA677FD9FCCB000BEEEE') # Jim Meyering <jim@meyering.net>
prepare() {
cd ${srcdir}/${pkgname}-${pkgver}
patch -p1 -i ${srcdir}/gnulib-weak.patch
autoreconf -fiv
}

View File

@ -1,12 +0,0 @@
--- diffutils-3.8/m4/threadlib.m4.orig 2021-12-29 09:21:24.516000000 +0100
+++ diffutils-3.8/m4/threadlib.m4 2021-12-29 09:21:40.882799400 +0100
@@ -101,6 +101,9 @@
#pragma weak fputs
int main ()
{
+#ifdef __CYGWIN__
+ return 1;
+#endif
return (fputs == NULL);
}]])],
[gl_cv_have_weak=yes],