diff --git a/.checkpackageignore b/.checkpackageignore index 4ec39f9f36..e502d52138 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -407,7 +407,6 @@ package/gpsd/S50gpsd Shellcheck lib_sysv.Indent lib_sysv.Variables package/gptfdisk/0001-gptcurses-partially-revert-Tweaks-for-building-on-th.patch lib_patch.Upstream package/gstreamer1/gstd/0001-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch lib_patch.Upstream package/guile/0001-calculate-csqrt_manually.patch lib_patch.Upstream -package/guile/0002-Makefile.am-fix-build-without-makeinfo.patch lib_patch.Upstream package/gutenprint/0001-use-pregen-xmli18n-header.patch lib_patch.Upstream package/gutenprint/0002-cups-support-replaces-static-with-static-libtool-lib.patch lib_patch.Upstream package/harfbuzz/0001-meson.build-check-for-pthread.h.patch lib_patch.Upstream diff --git a/package/guile/0002-Makefile.am-fix-build-without-makeinfo.patch b/package/guile/0002-Makefile.am-fix-build-without-makeinfo.patch deleted file mode 100644 index 0d16f92387..0000000000 --- a/package/guile/0002-Makefile.am-fix-build-without-makeinfo.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 9304ad88a5f4b083d348563c5de00da53b34cf46 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 6 Mar 2020 23:20:39 +0100 -Subject: [PATCH] Makefile.am: fix build without makeinfo - -Don't build doc subdir if makeinfo is not available otherwise build -fails on: - -make[4]: Entering directory '/nvmedata/autobuild/instance-7/output-1/build/host-guile-2.0.14/doc/ref' - MAKEINFO guile.info -/nvmedata/autobuild/instance-7/output-1/build/host-guile-2.0.14/build-aux/missing: line 81: makeinfo: command not found -WARNING: 'makeinfo' is missing on your system. - You should only need it if you modified a '.texi' file, or - any other file indirectly affecting the aspect of the manual. - You might want to install the Texinfo package: - - The spurious makeinfo call might also be the consequence of - using a buggy 'make' (AIX, DU, IRIX), in which case you might - want to install GNU make: - - -Fixes: - - http://autobuild.buildroot.org/results/9605aac6f760bfff190d0ab95fa50f65486ffe90 - -Signed-off-by: Fabrice Fontaine -[Upstream status: sent to bug-guile@gnu.org] ---- - Makefile.am | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index ebbf6d476..2270afb9f 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -38,8 +38,12 @@ SUBDIRS = \ - test-suite \ - benchmark-suite \ - gc-benchmarks \ -- am \ -+ am -+ -+if HAVE_MAKEINFO -+SUBDIRS += \ - doc -+endif - - DIST_SUBDIRS = $(SUBDIRS) prebuilt - --- -2.25.0 - diff --git a/package/guile/guile.hash b/package/guile/guile.hash index b671edad9d..4db8b1855b 100644 --- a/package/guile/guile.hash +++ b/package/guile/guile.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 1a2625ac72b2366e95792f3fe758fd2df775b4044a90a4a9787326e66c0d750d guile-3.0.9.tar.xz +sha256 818c79d236657a7fa96fb364137cc7b41b3bdee0d65c6174ca03769559579460 guile-3.0.11.tar.xz # Locally computed sha256 b51c6f20e6d029cb5b3e5bf235ac562c9a188c5bdc4ffcdc663897772d6e0260 LICENSE sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/guile/guile.mk b/package/guile/guile.mk index 82daaf5ad4..467a21f5a2 100644 --- a/package/guile/guile.mk +++ b/package/guile/guile.mk @@ -4,7 +4,7 @@ # ################################################################################ -GUILE_VERSION = 3.0.9 +GUILE_VERSION = 3.0.11 GUILE_SOURCE = guile-$(GUILE_VERSION).tar.xz GUILE_SITE = $(BR2_GNU_MIRROR)/guile GUILE_INSTALL_STAGING = YES