Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

development/autogen: Updated for version 5.18.16. #8732

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions development/autogen/autogen.SlackBuild
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Slackware build script for autogen

# Copyright 2012 crocket [email protected]
# Copyright 2013-2018 Willy Sudiarto Raharjo <[email protected]>
# Copyright 2013-2024 Willy Sudiarto Raharjo <[email protected]>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
Expand All @@ -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}

Expand All @@ -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
Expand Down Expand Up @@ -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" \
Expand Down Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions development/autogen/autogen.info
Original file line number Diff line number Diff line change
@@ -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="[email protected]"
50 changes: 50 additions & 0 deletions development/autogen/guile-3.0.patch
Original file line number Diff line number Diff line change
@@ -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