$ git diff --patch-with-stat --summary fca6da31be28c3154a726e2d94aca3397daa1355..6d4e21a9ef311c7759c70e08c7de74f7ebdda114
.abf.yml | 2 +-
...de-3.7-check-for-__builtin_mul_overflow_p.patch | 56 ++++++++++------------
recode.spec | 11 ++---
3 files changed, 31 insertions(+), 38 deletions(-)
diff --git a/.abf.yml b/.abf.yml
index 819ceca..5d44655 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
sources:
- recode-3.7.3.tar.gz: 077cd66357e8e203845b25e49b058fd2d8b7926c
+ recode-3.7.6.tar.gz: 8c02c0c892f7f67909e993771e18f9a391b07ba1
diff --git a/recode-3.7-check-for-__builtin_mul_overflow_p.patch b/recode-3.7-check-for-__builtin_mul_overflow_p.patch
index 1035567..a4ca96e 100644
--- a/recode-3.7-check-for-__builtin_mul_overflow_p.patch
+++ b/recode-3.7-check-for-__builtin_mul_overflow_p.patch
@@ -1,8 +1,8 @@
-diff -up recode-3.7.3/configure.ac.1~ recode-3.7.3/configure.ac
---- recode-3.7.3/configure.ac.1~ 2019-09-01 19:31:02.291767452 +0200
-+++ recode-3.7.3/configure.ac 2019-09-01 19:35:35.608166037 +0200
-@@ -40,6 +40,18 @@ AC_PROG_LEX
- AM_PATH_PYTHON([2.2])
+diff -Naur recode-3.7.6/configure.ac recode-3.7.6.tpg/configure.ac
+--- recode-3.7.6/configure.ac 2019-09-13 12:23:45.000000000 +0000
++++ recode-3.7.6.tpg/configure.ac 2019-10-04 19:39:35.646912872 +0000
+@@ -40,6 +40,18 @@
+ AM_PATH_PYTHON([3.5])
gl_INIT
+AC_CACHE_CHECK([for gcc 7-compatible __builtin_mul_overflow_p],
@@ -20,10 +20,10 @@ diff -up recode-3.7.3/configure.ac.1~ recode-3.7.3/configure.ac
dnl help2man
dnl Set a value even if not found, so that an invocation via build-aux/missing works
AC_PATH_PROG([HELP2MAN], [help2man], [help2man])
-diff -up recode-3.7.3/lib/intprops.h.1~ recode-3.7.3/lib/intprops.h
---- recode-3.7.3/lib/intprops.h.1~ 2018-09-24 21:59:32.000000000 +0200
-+++ recode-3.7.3/lib/intprops.h 2019-09-01 19:31:02.292767457 +0200
-@@ -227,14 +227,11 @@
+diff -Naur recode-3.7.6/lib/intprops.h recode-3.7.6.tpg/lib/intprops.h
+--- recode-3.7.6/lib/intprops.h 2019-05-21 15:48:02.000000000 +0000
++++ recode-3.7.6.tpg/lib/intprops.h 2019-10-04 19:41:17.423489785 +0000
+@@ -227,9 +227,6 @@
# define _GL_HAS_BUILTIN_OVERFLOW 0
#endif
@@ -33,15 +33,9 @@ diff -up recode-3.7.3/lib/intprops.h.1~ recode-3.7.3/lib/intprops.h
/* The _GL*_OVERFLOW macros have the same restrictions as the
*_RANGE_OVERFLOW macros, except that they do not assume that operands
(e.g., A and B) have the same type as MIN and MAX. Instead, they assume
- that the result (e.g., A + B) has that type. */
--#if _GL_HAS_BUILTIN_OVERFLOW_P
-+#if HAVE_BUILTIN_MUL_OVERFLOW_P
- # define _GL_ADD_OVERFLOW(a, b, min, max) \
- __builtin_add_overflow_p (a, b, (__typeof__ ((a) + (b))) 0)
- # define _GL_SUBTRACT_OVERFLOW(a, b, min, max) \
-diff -up recode-3.7.3/lib/mbrtowc.c.1~ recode-3.7.3/lib/mbrtowc.c
---- recode-3.7.3/lib/mbrtowc.c.1~ 2018-09-22 21:59:52.000000000 +0200
-+++ recode-3.7.3/lib/mbrtowc.c 2019-09-01 19:31:02.292767457 +0200
+diff -Naur recode-3.7.6/lib/mbrtowc.c recode-3.7.6.tpg/lib/mbrtowc.c
+--- recode-3.7.6/lib/mbrtowc.c 2019-05-21 15:47:52.000000000 +0000
++++ recode-3.7.6.tpg/lib/mbrtowc.c 2019-10-04 19:42:17.746838090 +0000
@@ -36,7 +36,7 @@
# include "verify.h"
@@ -51,9 +45,9 @@ diff -up recode-3.7.3/lib/mbrtowc.c.1~ recode-3.7.3/lib/mbrtowc.c
# define FALLTHROUGH ((void) 0)
# else
# define FALLTHROUGH __attribute__ ((__fallthrough__))
-diff -up recode-3.7.3/lib/quotearg.c.1~ recode-3.7.3/lib/quotearg.c
---- recode-3.7.3/lib/quotearg.c.1~ 2018-01-14 23:00:06.000000000 +0100
-+++ recode-3.7.3/lib/quotearg.c 2019-09-01 19:31:02.292767457 +0200
+diff -Naur recode-3.7.6/lib/quotearg.c recode-3.7.6.tpg/lib/quotearg.c
+--- recode-3.7.6/lib/quotearg.c 2018-01-14 22:00:06.000000000 +0000
++++ recode-3.7.6.tpg/lib/quotearg.c 2019-10-04 19:42:36.804949007 +0000
@@ -55,7 +55,7 @@
#define INT_BITS (sizeof (int) * CHAR_BIT)
@@ -63,9 +57,9 @@ diff -up recode-3.7.3/lib/quotearg.c.1~ recode-3.7.3/lib/quotearg.c
# define FALLTHROUGH ((void) 0)
# else
# define FALLTHROUGH __attribute__ ((__fallthrough__))
-diff -up recode-3.7.3/lib/vasnprintf.c.1~ recode-3.7.3/lib/vasnprintf.c
---- recode-3.7.3/lib/vasnprintf.c.1~ 2018-09-24 21:59:33.000000000 +0200
-+++ recode-3.7.3/lib/vasnprintf.c 2019-09-01 19:31:02.293767462 +0200
+diff -Naur recode-3.7.6/lib/vasnprintf.c recode-3.7.6.tpg/lib/vasnprintf.c
+--- recode-3.7.6/lib/vasnprintf.c 2019-05-21 15:48:02.000000000 +0000
++++ recode-3.7.6.tpg/lib/vasnprintf.c 2019-10-04 19:43:09.958142891 +0000
@@ -119,7 +119,7 @@
#endif
@@ -75,10 +69,10 @@ diff -up recode-3.7.3/lib/vasnprintf.c.1~ recode-3.7.3/lib/vasnprintf.c
# define FALLTHROUGH ((void) 0)
# else
# define FALLTHROUGH __attribute__ ((__fallthrough__))
-diff -up recode-3.7.3/lib/xalloc-oversized.h.1~ recode-3.7.3/lib/xalloc-oversized.h
---- recode-3.7.3/lib/xalloc-oversized.h.1~ 2018-01-14 23:00:06.000000000 +0100
-+++ recode-3.7.3/lib/xalloc-oversized.h 2019-09-01 19:31:02.293767462 +0200
-@@ -41,7 +41,7 @@ typedef size_t __xalloc_count_type;
+diff -Naur recode-3.7.6/lib/xalloc-oversized.h recode-3.7.6.tpg/lib/xalloc-oversized.h
+--- recode-3.7.6/lib/xalloc-oversized.h 2018-01-14 22:00:06.000000000 +0000
++++ recode-3.7.6.tpg/lib/xalloc-oversized.h 2019-10-04 19:44:14.384522781 +0000
+@@ -41,7 +41,7 @@
positive and N must be nonnegative. This is a macro, not a
function, so that it works correctly even when SIZE_MAX < N. */
@@ -87,9 +81,9 @@ diff -up recode-3.7.3/lib/xalloc-oversized.h.1~ recode-3.7.3/lib/xalloc-oversize
# define xalloc_oversized(n, s) \
__builtin_mul_overflow_p (n, s, (__xalloc_count_type) 1)
#elif 5 <= __GNUC__ && !defined __ICC && !__STRICT_ANSI__
-diff -up recode-3.7.3/src/common.h.1~ recode-3.7.3/src/common.h
---- recode-3.7.3/src/common.h.1~ 2019-08-16 14:24:39.000000000 +0200
-+++ recode-3.7.3/src/common.h 2019-09-01 19:31:02.293767462 +0200
+diff -Naur recode-3.7.6/src/common.h recode-3.7.6.tpg/src/common.h
+--- recode-3.7.6/src/common.h 2019-08-27 20:28:50.000000000 +0000
++++ recode-3.7.6.tpg/src/common.h 2019-10-04 19:44:27.507600631 +0000
@@ -43,7 +43,7 @@
#define N_(Text) Text
diff --git a/recode.spec b/recode.spec
index 2461daf..fa09ee8 100644
--- a/recode.spec
+++ b/recode.spec
@@ -9,7 +9,7 @@
Summary: GNU recode
Name: recode
-Version: 3.7.3
+Version: 3.7.6
Release: 1
Group: Text tools
License: GPLv2
@@ -20,7 +20,7 @@ BuildRequires: libtool
BuildRequires: flex
BuildRequires: texinfo
BuildRequires: gettext-devel
-BuildRequires: pkgconfig(python2)
+BuildRequires: pkgconfig(python)
BuildRequires: help2man
BuildRequires: perl-Locale-gettext
@@ -44,18 +44,17 @@ Requires: %{libname} = %{version}-%{release}
Development files for the %{libname} library.
%prep
-%setup -q
-%autopatch -p1
+%autosetup -p1
%build
export CFLAGS="%{optflags} -D_REENTRANT -fPIC"
autoreconf -fiv
-export PYTHON=%{__python2}
+
%configure \
--disable-static \
--without-included-gettext
-%make_build -j1 PYTHON=%{__python2}
+%make_build -j1
%install
%make_install