[arch-commits] Commit in m4/repos (3 files)

2019-11-13 Thread Evangelos Foutras via arch-commits 
Date: Wednesday, November 13, 2019 @ 17:51:32
  Author: foutrelis
Revision: 368419

archrelease: copy trunk to staging-x86_64

Added:
  m4/repos/staging-x86_64/
  m4/repos/staging-x86_64/PKGBUILD
(from rev 368418, m4/trunk/PKGBUILD)
  m4/repos/staging-x86_64/m4-1.4.18-glibc-change-work-around.patch
(from rev 368418, m4/trunk/m4-1.4.18-glibc-change-work-around.patch)

--+
 PKGBUILD |   40 ++
 m4-1.4.18-glibc-change-work-around.patch |  115 +
 2 files changed, 155 insertions(+)

Copied: m4/repos/staging-x86_64/PKGBUILD (from rev 368418, m4/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-11-13 17:51:32 UTC (rev 368419)
@@ -0,0 +1,40 @@
+# Maintainer: Allan McRae 
+# Contributor: Andreas Radke 
+
+pkgname=m4
+pkgver=1.4.18
+pkgrel=3
+pkgdesc="The GNU macro processor"
+arch=('x86_64')
+url="https://www.gnu.org/software/m4;
+license=('GPL3')
+groups=('base-devel')
+depends=('glibc' 'bash')
+source=(https://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.xz{,.sig}
+m4-1.4.18-glibc-change-work-around.patch)
+md5sums=('730bb15d96fffe47e148d1e09235af82'
+ 'SKIP'
+ '01968e8f3a5be62de1c849668db8042b')
+validpgpkeys=('71C2CC22B1C4602927D2F3AAA7A16B4A2527436A')   # Eric Blake
+
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i $srcdir/m4-1.4.18-glibc-change-work-around.patch
+}
+
+build() {
+  cd $pkgname-$pkgver  
+  ./configure --prefix=/usr
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make prefix=${pkgdir}/usr install
+}

Copied: m4/repos/staging-x86_64/m4-1.4.18-glibc-change-work-around.patch (from 
rev 368418, m4/trunk/m4-1.4.18-glibc-change-work-around.patch)
===
--- staging-x86_64/m4-1.4.18-glibc-change-work-around.patch 
(rev 0)
+++ staging-x86_64/m4-1.4.18-glibc-change-work-around.patch 2019-11-13 
17:51:32 UTC (rev 368419)
@@ -0,0 +1,115 @@
+diff -up m4-1.4.18/lib/fflush.c.orig m4-1.4.18/lib/fflush.c
+--- m4-1.4.18/lib/fflush.c.orig2018-05-02 12:35:59.536851666 +0200
 m4-1.4.18/lib/fflush.c 2018-05-02 12:37:02.768958606 +0200
+@@ -33,7 +33,7 @@
+ #undef fflush
+ 
+ 
+-#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 */
+ 
+ /* Clear the stream's ungetc buffer, preserving the value of ftello (fp).  */
+ static void
+@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp)
+ 
+ #endif
+ 
+-#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 (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && 
defined __SNPT
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
+@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream)
+   if (stream == NULL || ! freading (stream))
+ return fflush (stream);
+ 
+-#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 */
+ 
+   clear_ungetc_buffer_preserving_position (stream);
+ 
+diff -up m4-1.4.18/lib/fpending.c.orig m4-1.4.18/lib/fpending.c
+--- m4-1.4.18/lib/fpending.c.orig  2018-05-02 12:35:32.305806774 +0200
 m4-1.4.18/lib/fpending.c   2018-05-02 12:35:44.944827347 +0200
+@@ -32,7 +32,7 @@ __fpending (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 || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, 
Linux libc5 */
+   return fp->_IO_write_ptr - fp->_IO_write_base;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+   /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
+diff -up m4-1.4.18/lib/fpurge.c.orig m4-1.4.18/lib/fpurge.c
+--- m4-1.4.18/lib/fpurge.c.orig2018-05-02 12:38:13.586078669 +0200
 m4-1.4.18/lib/fpurge.c 2018-05-02 12:38:38.785121867 +0200
+@@ -62,7 +62,7 @@ fpurge (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 || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, 
Linux libc5 */
+   fp->_IO_read_end = fp->_IO_read_ptr;
+

[arch-commits] Commit in m4/repos (3 files)

2018-11-03 Thread Allan McRae via arch-commits 
Date: Saturday, November 3, 2018 @ 23:10:31
  Author: allan
Revision: 337792

archrelease: copy trunk to testing-x86_64

Added:
  m4/repos/testing-x86_64/
  m4/repos/testing-x86_64/PKGBUILD
(from rev 337791, m4/trunk/PKGBUILD)
  m4/repos/testing-x86_64/m4-1.4.18-glibc-change-work-around.patch
(from rev 337791, m4/trunk/m4-1.4.18-glibc-change-work-around.patch)

--+
 PKGBUILD |   40 ++
 m4-1.4.18-glibc-change-work-around.patch |  115 +
 2 files changed, 155 insertions(+)

Copied: m4/repos/testing-x86_64/PKGBUILD (from rev 337791, m4/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2018-11-03 23:10:31 UTC (rev 337792)
@@ -0,0 +1,40 @@
+# Maintainer: Allan McRae 
+# Contributor: Andreas Radke 
+
+pkgname=m4
+pkgver=1.4.18
+pkgrel=2
+pkgdesc="The GNU macro processor"
+arch=('x86_64')
+url="http://www.gnu.org/software/m4;
+license=('GPL3')
+groups=('base-devel')
+depends=('glibc' 'bash')
+source=(ftp://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.xz{,.sig}
+m4-1.4.18-glibc-change-work-around.patch)
+md5sums=('730bb15d96fffe47e148d1e09235af82'
+ 'SKIP'
+ '01968e8f3a5be62de1c849668db8042b')
+validpgpkeys=('71C2CC22B1C4602927D2F3AAA7A16B4A2527436A')   # Eric Blake
+
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i $srcdir/m4-1.4.18-glibc-change-work-around.patch
+}
+
+build() {
+  cd $pkgname-$pkgver  
+  ./configure --prefix=/usr
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make prefix=${pkgdir}/usr install
+}

Copied: m4/repos/testing-x86_64/m4-1.4.18-glibc-change-work-around.patch (from 
rev 337791, m4/trunk/m4-1.4.18-glibc-change-work-around.patch)
===
--- testing-x86_64/m4-1.4.18-glibc-change-work-around.patch 
(rev 0)
+++ testing-x86_64/m4-1.4.18-glibc-change-work-around.patch 2018-11-03 
23:10:31 UTC (rev 337792)
@@ -0,0 +1,115 @@
+diff -up m4-1.4.18/lib/fflush.c.orig m4-1.4.18/lib/fflush.c
+--- m4-1.4.18/lib/fflush.c.orig2018-05-02 12:35:59.536851666 +0200
 m4-1.4.18/lib/fflush.c 2018-05-02 12:37:02.768958606 +0200
+@@ -33,7 +33,7 @@
+ #undef fflush
+ 
+ 
+-#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 */
+ 
+ /* Clear the stream's ungetc buffer, preserving the value of ftello (fp).  */
+ static void
+@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp)
+ 
+ #endif
+ 
+-#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 (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && 
defined __SNPT
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
+@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream)
+   if (stream == NULL || ! freading (stream))
+ return fflush (stream);
+ 
+-#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 */
+ 
+   clear_ungetc_buffer_preserving_position (stream);
+ 
+diff -up m4-1.4.18/lib/fpending.c.orig m4-1.4.18/lib/fpending.c
+--- m4-1.4.18/lib/fpending.c.orig  2018-05-02 12:35:32.305806774 +0200
 m4-1.4.18/lib/fpending.c   2018-05-02 12:35:44.944827347 +0200
+@@ -32,7 +32,7 @@ __fpending (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 || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, 
Linux libc5 */
+   return fp->_IO_write_ptr - fp->_IO_write_base;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+   /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
+diff -up m4-1.4.18/lib/fpurge.c.orig m4-1.4.18/lib/fpurge.c
+--- m4-1.4.18/lib/fpurge.c.orig2018-05-02 12:38:13.586078669 +0200
 m4-1.4.18/lib/fpurge.c 2018-05-02 12:38:38.785121867 +0200
+@@ -62,7 +62,7 @@ fpurge (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 || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, 
Linux libc5 */
+   fp->_IO_read_end = fp->_IO_read_ptr;
+   fp->_IO_write_ptr