Date: Saturday, January 25, 2020 @ 19:15:05
Author: jlichtblau
Revision: 555547
archrelease: copy trunk to community-x86_64
Added:
lbzip2/repos/community-x86_64/PKGBUILD
(from rev 555546, lbzip2/trunk/PKGBUILD)
lbzip2/repos/community-x86_64/lbzip2-gnulib-build-fix.patch
(from rev 555546, lbzip2/trunk/lbzip2-gnulib-build-fix.patch)
Deleted:
lbzip2/repos/community-x86_64/PKGBUILD
-------------------------------+
PKGBUILD | 76 ++++++++++++++++++++++------------------
lbzip2-gnulib-build-fix.patch | 30 +++++++++++++++
2 files changed, 72 insertions(+), 34 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-01-25 19:14:52 UTC (rev 555546)
+++ PKGBUILD 2020-01-25 19:15:05 UTC (rev 555547)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Jaroslav Lichtblau <dragonl...@aur.archlinux.org>
-# Contributor: Dan Ziemba <zman0...@gmail.com>
-# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
-
-pkgname=lbzip2
-pkgver=2.5
-pkgrel=4
-pkgdesc="A parallel, SMP-based, bzip2-compatible compression utility"
-arch=('x86_64')
-url="http://lbzip2.org";
-license=('GPL3')
-depends=('glibc')
-source=(http://archive.lbzip2.org/$pkgname-$pkgver.tar.bz2)
-sha512sums=('63468178604df926bd2071c23b068bddcb6fcab54bac92a149224c5ed99a38cc7e8366ae21eecf12ad9c1a193827ef627d2517ac9a7a65791a959dfcacd96127')
-
-build() {
- cd "${srcdir}"/$pkgname-$pkgver
-
- ./configure --prefix=/usr
- make
-}
-
-check() {
- cd "${srcdir}"/$pkgname-$pkgver
-
- make check
-}
-
-package() {
- cd "${srcdir}"/$pkgname-$pkgver
-
- make DESTDIR="${pkgdir}" install
-}
Copied: lbzip2/repos/community-x86_64/PKGBUILD (from rev 555546,
lbzip2/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-01-25 19:15:05 UTC (rev 555547)
@@ -0,0 +1,42 @@
+# Maintainer: Jaroslav Lichtblau <svetlemo...@archlinux.org>
+# Contributor: Dan Ziemba <zman0...@gmail.com>
+# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
+
+pkgname=lbzip2
+pkgver=2.5
+pkgrel=5
+pkgdesc="A parallel, SMP-based, bzip2-compatible compression utility"
+arch=('x86_64')
+url="http://lbzip2.org";
+license=('GPL3')
+depends=('glibc')
+makedepends=('patch')
+source=(http://deb.debian.org/debian/pool/main/l/$pkgname/${pkgname}_${pkgver}.orig.tar.bz2
+ lbzip2-gnulib-build-fix.patch)
+sha256sums=('eec4ff08376090494fa3710649b73e5412c3687b4b9b758c93f73aa7be27555b'
+ '5eca4665b147655ce99f9ae5eff50e7db2714ba957e41e20b50d80533aeb6bef')
+
+prepare() {
+ cd "${srcdir}"/$pkgname-$pkgver
+
+ patch -Np1 -i "${srcdir}"/lbzip2-gnulib-build-fix.patch
+}
+
+build() {
+ cd "${srcdir}"/$pkgname-$pkgver
+
+ ./configure --prefix=/usr
+ make
+}
+
+check() {
+ cd "${srcdir}"/$pkgname-$pkgver
+
+ make check
+}
+
+package() {
+ cd "${srcdir}"/$pkgname-$pkgver
+
+ make DESTDIR="${pkgdir}" install
+}
Copied: lbzip2/repos/community-x86_64/lbzip2-gnulib-build-fix.patch (from rev
555546, lbzip2/trunk/lbzip2-gnulib-build-fix.patch)
===================================================================
--- lbzip2-gnulib-build-fix.patch (rev 0)
+++ lbzip2-gnulib-build-fix.patch 2020-01-25 19:15:05 UTC (rev 555547)
@@ -0,0 +1,30 @@
+diff --git a/lib/fseterr.c b/lib/fseterr.c
+index 82649c3ac..adb637256 100644
+--- a/lib/fseterr.c
++++ b/lib/fseterr.c
+@@ -29,7 +29,7 @@ fseterr (FILE *fp)
+ /* Most systems provide FILE as a struct and the necessary bitmask in
+ <stdio.h>, 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 || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */
+ fp->_flags |= _IO_ERR_SEEN;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android
*/
+diff --git a/lib/stdio-impl.h b/lib/stdio-impl.h
+index 78d896e9f..05c5752a2 100644
+--- a/lib/stdio-impl.h
++++ b/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. */
+
