From a04ed1d562b2ff7f2ee46414cd90d4305e94267b Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 20:41:47 +0100 Subject: [PATCH] rebuilt with libguile 3.0 [release 5.18.16-2mamba;Sat Nov 28 2020] --- autogen-5.18.6-guile-3.0.patch | 20 ++++++++++++++++++++ autogen.spec | 33 +++++++++++++++++++-------------- 2 files changed, 39 insertions(+), 14 deletions(-) create mode 100644 autogen-5.18.6-guile-3.0.patch diff --git a/autogen-5.18.6-guile-3.0.patch b/autogen-5.18.6-guile-3.0.patch new file mode 100644 index 0000000..5eaaa18 --- /dev/null +++ b/autogen-5.18.6-guile-3.0.patch @@ -0,0 +1,20 @@ +--- autogen-5.18.16/agen5/guile-iface.h.orig 2020-11-28 10:36:31.397903848 +0000 ++++ autogen-5.18.16/agen5/guile-iface.h 2020-11-28 10:36:45.329662872 +0000 +@@ -9,16 +9,12 @@ + # error AutoGen does not work with this version of Guile + choke me. + +-#elif GUILE_VERSION < 203000 ++#else + # define AG_SCM_IS_PROC(_p) scm_is_true( scm_procedure_p(_p)) + # define AG_SCM_LIST_P(_l) scm_is_true( scm_list_p(_l)) + # define AG_SCM_PAIR_P(_p) scm_is_true( scm_pair_p(_p)) + # define AG_SCM_TO_LONG(_v) scm_to_long(_v) + # define AG_SCM_TO_ULONG(_v) ((unsigned long)scm_to_ulong(_v)) +- +-#else +-# error unknown GUILE_VERSION +- choke me. + #endif + + #endif /* MUTATING_GUILE_IFACE_H_GUARD */ diff --git a/autogen.spec b/autogen.spec index ea92525..f078e5c 100644 --- a/autogen.spec +++ b/autogen.spec @@ -1,6 +1,6 @@ Name: autogen Version: 5.18.16 -Release: 1mamba +Release: 2mamba Summary: Simplifies the creation and maintenance of programs Group: Development/Tools Vendor: openmamba @@ -9,6 +9,7 @@ Packager: Silvan Calarco URL: http://www.gnu.org/software/autogen Source0: http://ftp.gnu.org/gnu/autogen/rel%{version}/autogen-%{version}.tar.xz #Source0: http://downloads.sourceforge.net/autogen/autogen-%{version}.tar.gz +Patch0: autogen-5.18.6-guile-3.0.patch License: GPL, BSD ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -66,9 +67,10 @@ This package contains static libraries need for development. %prep %setup -q +%patch0 -p1 -# Workaround for guile 2.2 -sed -i "s|2.0 1.8|2.2 2.0 1.8|" configure +# Workaround for guile 3.0 +sed -i "s|2.0 1.8|3.0 2.0 1.8|" configure sed -i 's/ -Werror / /' configure @@ -129,10 +131,10 @@ rm -f %{buildroot}%{_datadir}/autogen/libopts-31.1.6.tar.gz %{_datadir}/autogen/* %{_infodir}/autogen.info-*.gz %{_infodir}/autogen.info.gz -%{_mandir}/man1/autogen.1.gz -%{_mandir}/man1/columns.1.gz -%{_mandir}/man1/getdefs.1.gz -%{_mandir}/man1/xml2ag.1.gz +%{_mandir}/man1/autogen.1* +%{_mandir}/man1/columns.1* +%{_mandir}/man1/getdefs.1* +%{_mandir}/man1/xml2ag.1* %doc AUTHORS COPYING %files -n libopts @@ -147,13 +149,13 @@ rm -f %{buildroot}%{_datadir}/autogen/libopts-31.1.6.tar.gz %{_includedir}/autoopts/*.h %{_libdir}/libopts.so %{_libdir}/autogen/tpl-config.tlib -%{_mandir}/man1/autoopts-config.1.gz -%{_mandir}/man3/ao_string_tokenize.3.gz -%{_mandir}/man3/configFileLoad.3.gz -%{_mandir}/man3/option*.3.gz -%{_mandir}/man3/streq*.3.gz -%{_mandir}/man3/strneqvcmp.3.gz -%{_mandir}/man3/strtransform.3.gz +%{_mandir}/man1/autoopts-config.1* +%{_mandir}/man3/ao_string_tokenize.3* +%{_mandir}/man3/configFileLoad.3* +%{_mandir}/man3/option*.3* +%{_mandir}/man3/streq*.3* +%{_mandir}/man3/strneqvcmp.3* +%{_mandir}/man3/strtransform.3* %{_datadir}/aclocal/*.m4 %{_libdir}/pkgconfig/autoopts.pc %doc pkg/libopts/README @@ -165,6 +167,9 @@ rm -f %{buildroot}%{_datadir}/autogen/libopts-31.1.6.tar.gz %{_libdir}/libopts.la %changelog +* Sat Nov 28 2020 Silvan Calarco 5.18.16-2mamba +- rebuilt with libguile 3.0 + * Sun Mar 22 2020 Automatic Build System 5.18.16-1mamba - automatic version update by autodist