Date: Wednesday, November 9, 2022 @ 23:36:09
Author: foutrelis
Revision: 461045
Fix build with guile 3.0
Added:
autogen/trunk/guile-3.0.patch
Modified:
autogen/trunk/PKGBUILD
-----------------+
PKGBUILD | 6 +++++-
guile-3.0.patch | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 55 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-11-09 23:25:27 UTC (rev 461044)
+++ PKGBUILD 2022-11-09 23:36:09 UTC (rev 461045)
@@ -11,15 +11,19 @@
license=('GPL3')
depends=('guile' 'libxml2' 'perl')
makedepends=('autogen' 'chrpath')
-source=(https://ftp.gnu.org/gnu/${pkgname}/rel${pkgver}/${pkgname}-${pkgver}.tar.xz{,.sig}
10_libopts_tarball_perms.diff)
+source=(https://ftp.gnu.org/gnu/${pkgname}/rel${pkgver}/${pkgname}-${pkgver}.tar.xz{,.sig}
+ guile-3.0.patch
+ 10_libopts_tarball_perms.diff)
validpgpkeys=('44A088E295C3A722C450590EC9EF76DEB74EE762'
'3EEE51D1355B8EC40D9F3122495143D05D0712D1') # Bruce Korb
<[email protected]>
sha512sums=('5f12c982dbe27873f5649a96049bf019ff183c90cc0c8a9196556b0ca02e72940cd422f6d6601f68cc7d8763b1124f2765c3b1a6335fc92ba07f84b03d2a53a1'
'SKIP'
+
'4864c9f20448b7eea0e36b35b15408baf5485f77fe7b1e9181c5636ab30c6871c74c654da05c6b84c8e6a057531c234a6a1e263b7465d54842c04bfc9c5b821d'
'687a725cc901b4acaa73e4503c933b949a99264647e0829902f3d9c7bc62867268cabdf2c31fe10dcfdec9b69397ef27592196b097e3c19c6b714ef84d4060a4')
prepare() {
cd $pkgname-$pkgver
+ patch -Np1 -i ${srcdir}/guile-3.0.patch
# Reproducible man page generation
export MAN_PAGE_DATE=$(LC_ALL=C date -u -d '@$(SOURCE_DATE_EPOCH)' +%Y-%m-%d)
patch -Np1 -i ${srcdir}/10_libopts_tarball_perms.diff
Added: guile-3.0.patch
===================================================================
--- guile-3.0.patch (rev 0)
+++ guile-3.0.patch 2022-11-09 23:36:09 UTC (rev 461045)
@@ -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
