diff --git a/srcpkgs/lbzip2/patches/fseterr.patch b/srcpkgs/lbzip2/patches/fseterr.patch new file mode 100644 index 00000000000..ce2dcc9a81a --- /dev/null +++ b/srcpkgs/lbzip2/patches/fseterr.patch @@ -0,0 +1,50 @@ +diff --git lib/fseterr.c lib/fseterr.c +index 1e212e4..81f51ed 100644 +--- lib/fseterr.c ++++ lib/fseterr.c +@@ -1,5 +1,5 @@ + /* Set the error indicator of a stream. +- Copyright (C) 2007-2014 Free Software Foundation, Inc. ++ Copyright (C) 2007-2018 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by +@@ -12,7 +12,7 @@ + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License +- along with this program. If not, see . */ ++ along with this program. If not, see . */ + + #include + +@@ -23,21 +23,26 @@ + + #include "stdio-impl.h" + ++/* This file is not used on systems that have the __fseterr function, ++ namely musl libc. */ ++ + void + fseterr (FILE *fp) + { + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 ++ /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_flags |= _IO_ERR_SEEN; +-#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ ++#elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ ++ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ + fp_->_flags |= __SERR; + #elif defined __EMX__ /* emx+gcc */ + fp->_flags |= _IOERR; + #elif defined __minix /* Minix */ + fp->_flags |= _IOERR; +-#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */ ++#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */ + fp_->_flag |= _IOERR; + #elif defined __UCLIBC__ /* uClibc */ + fp->__modeflags |= __FLAG_ERROR; diff --git a/srcpkgs/lbzip2/template b/srcpkgs/lbzip2/template index 1d61523b689..c6973fe171b 100644 --- a/srcpkgs/lbzip2/template +++ b/srcpkgs/lbzip2/template @@ -1,11 +1,11 @@ # Template file for 'lbzip2' pkgname=lbzip2 version=2.5 -revision=1 +revision=2 build_style=gnu-configure short_desc="Parallel bzip2 compression utility" maintainer="bra1nwave " -license="GPL-3" +license="GPL-3.0-or-later" homepage="http://lbzip2.org/" -distfiles="http://archive.lbzip2.org/${pkgname}-${version}.tar.gz" +distfiles="http://archive.lbzip2.org/lbzip2-${version}.tar.gz" checksum=46c75ee93cc95eedc6005625442b2b8e59a2bef3ba80987d0491f055185650e9