From 5e23cdc2afb472691f6829eebc71b1bdbccd0360 Mon Sep 17 00:00:00 2001 From: Willy Sudiarto Raharjo Date: Thu, 14 Nov 2024 01:27:18 +0700 Subject: [PATCH] development/autogen: Updated for version 5.18.16. Signed-off-by: Willy Sudiarto Raharjo --- development/autogen/autogen.SlackBuild | 15 ++++---- development/autogen/autogen.info | 8 ++--- development/autogen/guile-3.0.patch | 50 ++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 13 deletions(-) create mode 100644 development/autogen/guile-3.0.patch diff --git a/development/autogen/autogen.SlackBuild b/development/autogen/autogen.SlackBuild index 257d4bf1ec3..201ece92f07 100644 --- a/development/autogen/autogen.SlackBuild +++ b/development/autogen/autogen.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for autogen # Copyright 2012 crocket crockabiscuit@gmail.com -# Copyright 2013-2018 Willy Sudiarto Raharjo +# Copyright 2013-2024 Willy Sudiarto Raharjo # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,8 +26,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=autogen -VERSION=${VERSION:-5.18.14} -BUILD=${BUILD:-2} +VERSION=${VERSION:-5.18.16} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -39,9 +39,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -80,8 +77,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# Patched for guile 2.2.x -patch -p1 < $CWD/guile-2.2.patch +patch -p1 < $CWD/guile-3.0.patch +sed -i 's/ -Werror / /' configure autoreconf CFLAGS="$SLKCFLAGS -Wno-error" \ @@ -111,7 +108,7 @@ rm -f $PKG/usr/info/dir gzip -9 $PKG/usr/info/*.info* mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO VERSION \ +cp -a AUTHORS COPYING NEWS README THANKS TODO VERSION \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/development/autogen/autogen.info b/development/autogen/autogen.info index 49da49c53f1..3c8f650515c 100644 --- a/development/autogen/autogen.info +++ b/development/autogen/autogen.info @@ -1,10 +1,10 @@ PRGNAM="autogen" -VERSION="5.18.14" +VERSION="5.18.16" HOMEPAGE="https://www.gnu.org/software/autogen/" -DOWNLOAD="https://ftp.gnu.org/gnu/autogen/rel5.18.14/autogen-5.18.14.tar.xz" -MD5SUM="c4d9a1641cb1bad4a3cc4108de6d867a" +DOWNLOAD="https://ftp.gnu.org/gnu/autogen/rel5.18.16/autogen-5.18.16.tar.xz" +MD5SUM="27c28df902a9fdb2b64f008a0a49fd05" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="guile2.2" +REQUIRES="" MAINTAINER="Willy Sudiarto Raharjo" EMAIL="willysr@slackbuilds.org" diff --git a/development/autogen/guile-3.0.patch b/development/autogen/guile-3.0.patch new file mode 100644 index 00000000000..218c83cd0a1 --- /dev/null +++ b/development/autogen/guile-3.0.patch @@ -0,0 +1,50 @@ +# Patch origin: https://sourceforge.net/p/autogen/bugs/196/#1a10 + +Index: autogen-5.18.16/agen5/guile-iface.h +=================================================================== +--- autogen-5.18.16.orig/agen5/guile-iface.h ++++ autogen-5.18.16/agen5/guile-iface.h +@@ -9,16 +9,13 @@ + # 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 */ +Index: autogen-5.18.16/configure +=================================================================== +--- autogen-5.18.16.orig/configure ++++ autogen-5.18.16/configure +@@ -14798,7 +14798,7 @@ $as_echo "no" >&6; } + PKG_CONFIG="" + fi + fi +- _guile_versions_to_search="2.2 2.0 1.8" ++ _guile_versions_to_search="3.0 2.2 2.0 1.8" + if test -n "$GUILE_EFFECTIVE_VERSION"; then + _guile_tmp="" + for v in $_guile_versions_to_search; do +Index: autogen-5.18.16/config/guile.m4 +=================================================================== +--- autogen-5.18.16.orig/config/guile.m4 ++++ autogen-5.18.16/config/guile.m4 +@@ -61,7 +61,7 @@ + # + AC_DEFUN([GUILE_PKG], + [PKG_PROG_PKG_CONFIG +- _guile_versions_to_search="m4_default([$1], [2.2 2.0 1.8])" ++ _guile_versions_to_search="m4_default([$1], [3.0 2.2 2.0 1.8])" + if test -n "$GUILE_EFFECTIVE_VERSION"; then + _guile_tmp="" + for v in $_guile_versions_to_search; do