findutils: update to 4.7.0.

- Drop unnecessary patches (changes upstreamed)
- Fix xlint issues
This commit is contained in:
Peter Bui 2019-09-28 12:55:06 -04:00 committed by Leah Neukirchen
parent ccf1aa63b1
commit 7e0d63f4af
5 changed files with 6 additions and 67 deletions

View File

@ -1,11 +0,0 @@
--- gl/lib/freadahead.c
+++ gl/lib/freadahead.c
@@ -30,7 +30,7 @@ extern size_t __sreadahead (FILE *);
size_t
freadahead (FILE *fp)
{
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
if (fp->_IO_write_ptr > fp->_IO_write_base)
return 0;
return (fp->_IO_read_end - fp->_IO_read_ptr)

View File

@ -1,21 +0,0 @@
--- gl/lib/fseeko.c
+++ gl/lib/fseeko.c
@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence)
#endif
/* These tests are based on fpurge.c. */
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
if (fp->_IO_read_end == fp->_IO_read_ptr
&& fp->_IO_write_ptr == fp->_IO_write_base
&& fp->_IO_save_base == NULL)
@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int whence)
return -1;
}
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
fp->_flags &= ~_IO_EOF_SEEN;
fp->_offset = pos;
#elif defined __sferror || defined __DragonFly__ || defined __ANDROID__

View File

@ -1,15 +0,0 @@
--- gl/lib/mountlist.c
+++ gl/lib/mountlist.c
@@ -37,6 +37,12 @@
# include <sys/param.h>
#endif
+#if MAJOR_IN_MKDEV
+# include <sys/mkdev.h>
+#elif MAJOR_IN_SYSMACROS
+# include <sys/sysmacros.h>
+#endif
+
#if defined MOUNTED_GETFSSTAT /* OSF_1 and Darwin1.3.x */
# if HAVE_SYS_UCRED_H
# include <grp.h> /* needed on OSF V4.0 for definition of NGROUPS,

View File

@ -1,14 +0,0 @@
--- gl/lib/stdio-impl.h
+++ gl/lib/stdio-impl.h
@@ -18,6 +18,12 @@
the same implementation of stdio extension API, except that some fields
have different naming conventions, or their access requires some casts. */
+/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this
+ problem by defining it ourselves. FIXME: Do not rely on glibc
+ internals. */
+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
+# define _IO_IN_BACKUP 0x100
+#endif
/* BSD stdio derived implementations. */

View File

@ -1,16 +1,16 @@
# Template file for 'findutils' # Template file for 'findutils'
pkgname=findutils pkgname=findutils
version=4.6.0 version=4.7.0
revision=4 revision=1
bootstrap=yes bootstrap=yes
build_style=gnu-configure build_style=gnu-configure
configure_args="--program-prefix=g" configure_args="--program-prefix=g"
short_desc="The GNU Find Utilities" short_desc="GNU Find Utilities"
maintainer="Enno Boland <gottox@voidlinux.org>" maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3" license="GPL-3.0-or-later"
homepage="http://www.gnu.org/software/findutils" homepage="http://www.gnu.org/software/findutils"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
checksum=ded4c9f73731cd48fec3b6bdaccce896473b6d8e337e9612e16cf1431bb1169d checksum=c5fefbdf9858f7e4feb86f036e1247a54c79fc2d8e4b7064d5aaa1f47dfa789a
alternatives=" alternatives="
xargs:xargs:/usr/bin/gxargs xargs:xargs:/usr/bin/gxargs