From 7ac46f11795439373b5839840ee85882de1c918b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 11:53:00 +0000 Subject: [PATCH 1/3] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- guile22.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/guile22.spec b/guile22.spec index 71af635..d0ca83d 100644 --- a/guile22.spec +++ b/guile22.spec @@ -6,7 +6,7 @@ Name: guile22 Version: 2.2.7 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A GNU implementation of Scheme for application extensibility Source: ftp://ftp.gnu.org/pub/gnu/guile/guile-%{version}.tar.xz URL: http://www.gnu.org/software/guile/ @@ -161,6 +161,9 @@ fi %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 2.2.7-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 2.2.7-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From a757ca509c1e5db73ee02013a8acfd90bc5a3605 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Fri, 17 Mar 2023 09:55:25 +0100 Subject: [PATCH 2/3] Port configure script to C99 Related to: --- guile22-configure-c99.patch | 24 ++++++++++++++++++++++++ guile22-configure-tz-c99.patch | 31 +++++++++++++++++++++++++++++++ guile22.spec | 7 ++++++- 3 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 guile22-configure-c99.patch create mode 100644 guile22-configure-tz-c99.patch diff --git a/guile22-configure-c99.patch b/guile22-configure-c99.patch new file mode 100644 index 0000000..356e227 --- /dev/null +++ b/guile22-configure-c99.patch @@ -0,0 +1,24 @@ +Avoid an implicit declaration of exit. Partial backport of this +upstream commit: + +commit a91b95cca2d397c84f8b9bbd602d40209a7092ce +Author: Andy Wingo +Date: Wed Jan 20 21:52:54 2021 +0100 + + Update Gnulib to v0.1-4379-g2ef5a9b4b + + Also bump required autoconf version to 2.64, as required by Gnulib. + +diff --git a/m4/round.m4 b/m4/round.m4 +index 45b7df4591e83648..1561225a5355366d 100644 +--- a/m4/round.m4 ++++ b/m4/round.m4 +@@ -57,7 +57,7 @@ int main() + * (double) (1U << ((DBL_MANT_DIG + 3) / 5)) + * (double) (1U << ((DBL_MANT_DIG + 4) / 5)); + volatile double x = 0.5 - 0.5 / TWO_MANT_DIG; +- exit (x < 0.5 && round (x) != 0.0); ++ return x < 0.5 && round (x) != 0.0; + }]])], [gl_cv_func_round_works=yes], [gl_cv_func_round_works=no], + [case "$host_os" in + netbsd* | aix*) gl_cv_func_round_works="guessing no";; diff --git a/guile22-configure-tz-c99.patch b/guile22-configure-tz-c99.patch new file mode 100644 index 0000000..40d51ec --- /dev/null +++ b/guile22-configure-tz-c99.patch @@ -0,0 +1,31 @@ +Avoid implicit ints in the guile_cv_localtime_cache check. It cause +the check to always fail with strict(er) C99 compilers that do not +support implicit int. + +Submitted upstream: + + + + +diff --git a/configure.ac b/configure.ac +index 92966ce3432b11f4..ec542c1f58bd835e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1167,7 +1167,7 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[#include + # include + #endif + extern char **environ; +-unset_TZ () ++int unset_TZ () + { + char **from, **to; + for (to = from = environ; (*to = *from); from++) +@@ -1176,7 +1176,7 @@ unset_TZ () + } + char TZ_GMT0[] = "TZ=GMT0"; + char TZ_PST8[] = "TZ=PST8"; +-main() ++int main() + { + time_t now = time ((time_t *) 0); + int hour_GMT0, hour_unset; diff --git a/guile22.spec b/guile22.spec index d0ca83d..d8a8e6a 100644 --- a/guile22.spec +++ b/guile22.spec @@ -6,7 +6,7 @@ Name: guile22 Version: 2.2.7 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A GNU implementation of Scheme for application extensibility Source: ftp://ftp.gnu.org/pub/gnu/guile/guile-%{version}.tar.xz URL: http://www.gnu.org/software/guile/ @@ -23,6 +23,8 @@ Patch1: guile-multilib.patch Patch3: guile-threadstest.patch Patch4: disable-out-of-memory-test.patch Patch5: guile-configure.patch +Patch6: guile22-configure-tz-c99.patch +Patch7: guile22-configure-c99.patch %description GUILE (GNU's Ubiquitous Intelligent Language for Extension) is a library @@ -161,6 +163,9 @@ fi %changelog +* Fri Mar 17 2023 Florian Weimer - 2.2.7-8 +- Port configure script to C99 + * Thu Jan 19 2023 Fedora Release Engineering - 2.2.7-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From a9371e5e52c2cdcb6a117bac0c64baac4c41c397 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 05:59:20 +0000 Subject: [PATCH 3/3] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- guile22.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/guile22.spec b/guile22.spec index d8a8e6a..976901e 100644 --- a/guile22.spec +++ b/guile22.spec @@ -6,7 +6,7 @@ Name: guile22 Version: 2.2.7 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A GNU implementation of Scheme for application extensibility Source: ftp://ftp.gnu.org/pub/gnu/guile/guile-%{version}.tar.xz URL: http://www.gnu.org/software/guile/ @@ -163,6 +163,9 @@ fi %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 2.2.7-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Mar 17 2023 Florian Weimer - 2.2.7-8 - Port configure script to C99