diff --git a/common/shlibs b/common/shlibs index e1e2291d5f..7c473a0760 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1435,7 +1435,7 @@ libgda-xslt-5.0.so.4 libgda-5.1.2_1 libamtk-5.so.0 amtk-5.0.0_1 libdevhelp-3.so.6 devhelp-libs-3.30.0_1 libunistring.so.2 libunistring-0.9.4_1 -libguile-2.0.so.22 libguile-2.0.9_3 +libguile-2.2.so.1 libguile-2.2.7_1 libopts.so.25 libopts-5.18.4_6 libanjuta-3.so.0 anjuta-3.8.4_1 libgmlib.so.1 gmtk-1.0.8_1 diff --git a/srcpkgs/guile/patches/non-static.patch b/srcpkgs/guile/patches/non-static.patch deleted file mode 100644 index 8896762df8..0000000000 --- a/srcpkgs/guile/patches/non-static.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- libguile/finalizers.c 2014-05-02 15:15:57.000000000 +0200 -+++ libguile/finalizers.c 2019-01-04 14:32:52.336586516 +0100 -@@ -164,7 +164,7 @@ - - - #ifndef HAVE_GC_SET_FINALIZER_NOTIFIER --static void -+void - GC_set_finalizer_notifier (void (*notifier) (void)) - { - GC_finalizer_notifier = notifier; ---- libguile/gc.c 2016-12-15 01:03:33.000000000 +0100 -+++ libguile/gc.c 2019-01-04 14:35:56.357579179 +0100 -@@ -196,7 +196,7 @@ - /* Compatibility. */ - - #ifndef HAVE_GC_GET_HEAP_USAGE_SAFE --static void -+void - GC_get_heap_usage_safe (GC_word *pheap_size, GC_word *pfree_bytes, - GC_word *punmapped_bytes, GC_word *pbytes_since_gc, - GC_word *ptotal_bytes) -@@ -214,7 +214,7 @@ - #endif - - #ifndef HAVE_GC_GET_FREE_SPACE_DIVISOR --static GC_word -+GC_word - GC_get_free_space_divisor (void) - { - return GC_free_space_divisor; -@@ -586,7 +586,7 @@ - } - - #ifndef HAVE_GC_SET_FINALIZE_ON_DEMAND --static void -+void - GC_set_finalize_on_demand (int foo) - { - GC_finalize_on_demand = foo; diff --git a/srcpkgs/guile/template b/srcpkgs/guile/template index ffea17c384..9e73558546 100644 --- a/srcpkgs/guile/template +++ b/srcpkgs/guile/template @@ -1,7 +1,7 @@ # Template file for 'guile' pkgname=guile -version=2.0.14 -revision=9 +version=2.2.7 +revision=1 build_style=gnu-configure configure_args="--disable-static --disable-error-on-warning" hostmakedepends="pkg-config texinfo" @@ -12,7 +12,7 @@ maintainer="Orphaned " license="GPL-3.0-or-later, LGPL-3.0-or-later" homepage="http://www.gnu.org/software/${pkgname}" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=8aeb2f353881282fe01694cce76bb72f7ffdd296a12c7a1a39255c27b0dfe5f1 +checksum=44b4c5fbbe257ccdebea18420212c9b3e90c3c86a54920d8554039fc6769a007 subpackages="libguile guile-devel" if [ "$CROSS_BUILD" ]; then @@ -31,7 +31,6 @@ libguile_package() { short_desc+=" - runtime library" pkg_install() { vmove "usr/lib/*.so.*" - vmove "usr/lib/libguilereadline*.so" vmkdir usr/share/gdb/auto-load/usr/lib mv ${PKGDESTDIR}/usr/lib/*.scm ${PKGDESTDIR}/usr/share/gdb/auto-load/usr/lib }