fix FTBFS with GCC15 (resolves: rhbz#2336029)

- switch to autosetup macro
- correct license tag
This commit is contained in:
Dominik Mierzejewski 2025-01-09 13:03:58 +01:00
commit 74fa7efb5d
4 changed files with 39 additions and 51 deletions

View file

@ -1,41 +0,0 @@
From 54f8e4ac4e0bdf7622909c4cdf5768bebe72460c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Droz?= <raphael.droz+floss@gmail.com>
Date: Sun, 12 Jun 2016 23:14:12 -0300
Subject: [PATCH 3/3] build: fix compilation when used with GCC -std=gnu99 or
-std=gnu11 (default in GCC 5.0) * derived from patch #6 * fix Debian bug
#777764
---
configure | 2 +-
configure.ac | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index b09897b..86016ed 100755
--- a/configure
+++ b/configure
@@ -8431,7 +8431,7 @@ if test x$debug = xtrue; then
fi
if test x$GCC = xyes; then
- CFLAGS="-Wall $CFLAGS"
+ CFLAGS="-Wall -fgnu89-inline $CFLAGS"
fi
ac_config_files="$ac_config_files Makefile abook.spec po/Makefile.in"
diff --git a/configure.ac b/configure.ac
index 5a9ae3b..bcb0a58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -175,7 +175,7 @@ if test x$debug = xtrue; then
fi
if test x$GCC = xyes; then
- CFLAGS="-Wall $CFLAGS"
+ CFLAGS="-Wall -fgnu89-inline $CFLAGS"
fi
AC_CONFIG_FILES([Makefile abook.spec po/Makefile.in])
--
2.13.5

12
abook-extern-inline.patch Normal file
View file

@ -0,0 +1,12 @@
diff -up abook-0.6.1/database.h.orig abook-0.6.1/database.h
--- abook-0.6.1/database.h.orig 2015-10-04 04:38:25.000000000 +0200
+++ abook-0.6.1/database.h 2025-01-09 12:40:15.733159868 +0100
@@ -61,7 +61,7 @@ struct db_enumerator {
/*
* Field operations
*/
-inline int field_id(int i);
+extern inline int field_id(int i);
abook_field *find_standard_field(char *key, int do_declare);
abook_field *real_find_field(char *key, abook_field_list *list, int *nb);
#define find_field(key, list) real_find_field(key, list, NULL)

12
abook-wcwidth.patch Normal file
View file

@ -0,0 +1,12 @@
diff -up abook-0.6.1/configure.ac.orig abook-0.6.1/configure.ac
--- abook-0.6.1/configure.ac.orig 2015-10-04 04:37:39.000000000 +0200
+++ abook-0.6.1/configure.ac 2025-01-09 12:32:06.449796137 +0100
@@ -61,7 +61,7 @@ AC_CHECK_HEADER(wchar.h,[
AC_DEFINE(HAVE_WCHAR_H, 1, [Define if you have the <wchar.h> header file.])],
[ac_have_wchar_h=no])
AC_CHECK_FUNCS(mbtowc wcwidth mbrtowc mbsinit,,ac_widec_funcs=no)
-AC_CHECK_DECLS(wcwidth)
+AC_CHECK_DECLS([wcwidth], [], [], [[#include <wchar.h>]])
AC_CHECK_TYPE(wchar_t,,ac_widec_funcs=no)
if test x$ac_widec_funcs = xyes -a x$ac_have_wchar_h = xyes; then

View file

@ -1,8 +1,10 @@
Name: abook
Version: 0.6.1
Release: 27%{?dist}
# Automatically converted from old format: GPLv2+ - review is highly recommended.
License: GPL-2.0-or-later
Release: 28%{?dist}
# GPL-2.0-or-later, except:
# getopt.[ch]: LGPL-2.0-or-later
# getopt1.c: LGPL-2.0-or-later
License: GPL-2.0-or-later AND LGPL-2.0-or-later
URL: http://abook.sourceforge.net/
Summary: Text-based addressbook program for mutt
Source0: http://abook.sourceforge.net/devel/abook-%{version}.tar.gz
@ -12,8 +14,10 @@ Patch0: %{name}-preserve.patch
Patch1: 0001-fixed-bug-6.patch
# 02ac0ce doc: manpage mention of the -f option + fix for bug #8 (https://sourceforge.net/p/abook/bugs/8/)
Patch2: 0002-doc-manpage-mention-of-the-f-option-fix-for-bug-8.patch
# 54f8e4a build: fix compilation when used with GCC -std=gnu99 or -std=gnu11
Patch3: 0003-build-fix-compilation-when-used-with-GCC-std-gnu99-o.patch
# fix compilation when used with GCC -std=gnu99 or -std=gnu11
Patch3: abook-extern-inline.patch
# Fix detection of wcwidth()
Patch4: abook-wcwidth.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gettext-devel
@ -28,11 +32,7 @@ Abook is a small and powerful text-based addressbook program
designed for use with the mutt mail client.
%prep
%setup -q
%patch -P0 -p1 -b .p
%patch -P1 -p1
%patch -P2 -p1
%patch -P3 -p1
%autosetup -p1
autoreconf -vif
%build
@ -52,6 +52,11 @@ autoreconf -vif
%{_mandir}/man5/abookrc.*
%changelog
* Thu Jan 09 2025 Dominik Mierzejewski <dominik@greysector.net> - 0.6.1-28
- fix FTBFS with GCC15 (resolves: rhbz#2336029)
- switch to autosetup macro
- correct license tag
* Thu Jul 25 2024 Miroslav Suchý <msuchy@redhat.com> - 0.6.1-27
- convert license to SPDX