diff --git a/common/shlibs b/common/shlibs index ea29a776a98..6c971e40146 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2719,7 +2719,7 @@ libpayeeidentifier_nationalAccount.so.4 kmymoney-4.8.0_1 libpayeeidentifier_iban_bic.so.4 kmymoney-4.8.0_1 libkmm_payeeidentifier.so kmymoney-4.8.0_1 libbotan-2.so.0 botan-2.0.0_1 -libswipl.so.7.2 swi-prolog-7.2.3_5 +libswipl.so.7.4 swi-prolog-7.4.1_1 libpcre2-16.so.0 libpcre2-10.22_1 libpcre2-32.so.0 libpcre2-10.22_1 libpcre2-8.so.0 libpcre2-10.22_1 @@ -2782,7 +2782,6 @@ libgcroots.so.0 uim-1.8.6_1 libdecoration.so.0 compiz-core-0.8.12.3_1 libcompizconfig.so.0 libcompizconfig-0.8.12.1_1 libemeraldengine.so.0 emerald-0.8.12.4_1 - libhangul.so.1 libhangul-0.1.0_1 libmutter-clutter-1.0.so mutter-3.22.0_1 libmutter-cogl-pango.so mutter-3.22.0_1 diff --git a/srcpkgs/swi-prolog/patches/libressl.patch b/srcpkgs/swi-prolog/patches/libressl.patch deleted file mode 100644 index 22efdac5a72..00000000000 --- a/srcpkgs/swi-prolog/patches/libressl.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- packages/ssl/ssl4pl.c.orig -+++ packages/ssl/ssl4pl.c -@@ -84,7 +84,6 @@ - static functor_t FUNCTOR_crl1; - static functor_t FUNCTOR_revocations1; - static functor_t FUNCTOR_revoked2; --static functor_t FUNCTOR_session_key1; - static functor_t FUNCTOR_master_key1; - static functor_t FUNCTOR_session_id1; - static functor_t FUNCTOR_client_random1; -@@ -1127,8 +1126,8 @@ - - if (!PL_get_atom(method, &method_name)) - return PL_domain_error("ssl_method", method); -- if (method_name == ATOM_sslv3) -- ssl_method = SSLv3_method(); -+ if (0) -+ ; - #ifdef HAVE_SSLV2_METHOD - else if (method_name == ATOM_sslv2) - ssl_method = SSLv2_method(); -@@ -1736,10 +1735,6 @@ - PL_INTEGER, (int)session->ssl_version)) - return FALSE; - -- if ( !add_key_string(list_t, FUNCTOR_session_key1, -- session->key_arg_length, session->key_arg) ) -- return FALSE; -- - if ( !add_key_string(list_t, FUNCTOR_master_key1, - session->master_key_length, session->master_key) ) - return FALSE; -@@ -1860,7 +1855,6 @@ - FUNCTOR_crl1 = PL_new_functor(PL_new_atom("crl"), 1); - FUNCTOR_revoked2 = PL_new_functor(PL_new_atom("revoked"), 2); - FUNCTOR_revocations1 = PL_new_functor(PL_new_atom("revocations"), 1); -- FUNCTOR_session_key1 = PL_new_functor(PL_new_atom("session_key"), 1); - FUNCTOR_master_key1 = PL_new_functor(PL_new_atom("master_key"), 1); - FUNCTOR_session_id1 = PL_new_functor(PL_new_atom("session_id"), 1); - FUNCTOR_client_random1 = PL_new_functor(PL_new_atom("client_random"), 1); diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template index 8c4fc65a9f5..1f89ff4ec12 100644 --- a/srcpkgs/swi-prolog/template +++ b/srcpkgs/swi-prolog/template @@ -1,17 +1,19 @@ # Template file for 'swi-prolog' pkgname=swi-prolog -version=7.2.3 -revision=6 +version=7.4.1 +revision=1 wrksrc="swipl-${version}" build_style=gnu-configure hostmakedepends="pkg-config" -makedepends="gmp-devel readline-devel libressl-devel zlib-devel libarchive-devel libXft-devel libjpeg-turbo-devel libXpm-devel libXinerama-devel unixodbc-devel libXt-devel" +makedepends="gmp-devel libXft-devel libXinerama-devel libXpm-devel libXt-devel + libarchive-devel libjpeg-turbo-devel libressl-devel readline-devel + unixodbc-devel zlib-devel" short_desc="Comprehensive free Prolog environment" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " license="LGPL-2.1" homepage="http://www.swi-prolog.org/" distfiles="http://www.swi-prolog.org/download/stable/src/swipl-${version}.tar.gz" -checksum=43657d51b7c5887bc2d2bced50a9822b86a08a6841399b8e76ee877f51d646b5 +checksum=891e314e8f5d856ef71d8bbce5d255a18b0c8f227628748bb0e1e19473273cc1 nocross=yes post_extract() {