Version 9.2.9

- Use zlib-ng instead of the zlib compatibility interface

pl.spec

@@ -12,12 +12,10 @@
 %global swipl_arch %{_target_cpu}-linux
 
 Name:       pl
-Version:    9.2.5
+Version:    9.2.9
 Release:    %autorelease
 Summary:    SWI-Prolog - Edinburgh compatible Prolog compiler
 #LICENSE:                               BSD-2-Clause
-#library/dialect/iso/iso_predicates.pl  BSD-2-Clause AND (GPL-2.0-or-later WITH
-#                                       SWI-Prolog extra clause or Artistic-2.0)
 #library/ugraphs.pl                     BSD-2-Clause AND (GPL-2.0-or-later WITH
 #                                       SWI-Prolog extra clause or Artistic-2.0)
 #library/unicode/blocks.pl              BSD-2-Clause AND Unicode-DFS-2016
@@ -144,7 +142,7 @@ Summary:    SWI-Prolog - Edinburgh compatible Prolog compiler
 #bench/simple_analyzer.pl               Free for non-commercial
 License:    BSD-2-Clause AND BSD-3-Clause AND (Brian-Gladman-3-Clause OR GPL-1.0-or-later) AND Beerware AND CC-BY-SA-3.0 AND (GPL-1.0-or-later OR Artistic-1.0-Perl) AND GPL-2.0-or-later AND GPL-2.0-or-later WITH SWI-Exception AND (GPL-2.0-or-later WITH SWI-Exception OR Artistic-2.0) AND LGPL-2.0-or-later AND LicenseRef-Fedora-Public-Domain AND LPPL-1.3a AND MIT AND Sleepycat AND Unicode-DFS-2015 AND Unicode-DFS-2016 AND Zlib AND dtoa
 URL:        https://www.swi-prolog.org/
-VCS:        https://github.com/SWI-Prolog/swipl
+VCS:        git:https://github.com/SWI-Prolog/swipl.git
 # Source0: %%{url}/download/stable/src/swipl-%%{version}.tar.gz
 # To create the repackaged archive, use ./repackage.sh %%{version}
 Source0:    swipl-%{version}_repackaged.tar.gz
@@ -157,9 +155,8 @@ Patch0:     swipl-8.2.1-Fix-JNI.patch
 Patch1:     swipl-8.2.0-Remove-files-locations-from-swipl-1-manual.patch
 # Unbundle libstemmer
 Patch2:     swipl-8.2.0-unbundle-libstemmer.patch
-# Fix an LTO type mismatch
-# https://github.com/SWI-Prolog/packages-semweb/pull/113
-Patch3:     swipl-9.2.3-lto-mismatch.patch
+# Use zlib-ng directly rather than via the zlib compatibility interface
+Patch3:     swipl-9.2.9-zlib-ng.patch
 
 # See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
 ExcludeArch:    %{ix86}
@@ -200,7 +197,7 @@ BuildRequires:  pkgconfig(freetype2)
 BuildRequires:  pkgconfig(xaw7)
 BuildRequires:  pkgconfig(xext)
 BuildRequires:  pkgconfig(xmu)
-BuildRequires:  pkgconfig(xrender)
+BuildRequires:  pkgconfig(xrandr)
 # bdb
 BuildRequires:  libdb-devel
 # mqi / swiplserver
@@ -213,7 +210,8 @@ BuildRequires:  pkgconfig(openssl)
 # jpl
 %ifarch %{java_arches}
 BuildRequires:  java-devel
-BuildRequires:  junit
+BuildRequires:  mvn(junit:junit)
+BuildRequires:  mvn(org.hamcrest:hamcrest)
 %endif
 # nlp
 BuildRequires:  libstemmer-devel
@@ -222,11 +220,11 @@ BuildRequires:  emacs-devel
 # uuid
 BuildRequires:  pkgconfig(ossp-uuid)
 # win
-BuildRequires:  pkgconfig(Qt5)
+BuildRequires:  pkgconfig(Qt6)
 # yaml
 BuildRequires:  pkgconfig(yaml-0.1)
 # zlib
-BuildRequires:  pkgconfig(zlib)
+BuildRequires:  pkgconfig(zlib-ng)
 # Doc building
 # Gated to Fedora as EL is currently missing tex(a4wide.sty)
 %if 0%{?fedora}
@@ -413,6 +411,7 @@ export DISABLE_PKGS="jpl"
   -DJQUERYDIR:PATH=%{_datadir}/javascript/jquery/latest \
   -DSWIPL_INSTALL_IN_LIB:BOOL=ON \
   -DSWIPL_VERSIONED_DIR:BOOL=ON \
+  -DUSE_TCMALLOC:BOOL=ON \
   -G Ninja
 
 # Help latex2html find the bibliographies

sources

@@ -1,2 +1,2 @@
 SHA512 (userguide.html.tgz) = baa16d8f06a666e77ef45aaf7708e877710bfcb8fc0fb519bc70c54619c45def2d2ab4feaa0f1a1875b2a2270e8907551b63582da1b4beaa5b50f013a41d7ab9
-SHA512 (swipl-9.2.5_repackaged.tar.gz) = 14e58a0510959bb9840042203081f5d3014ef2e3345d850e838e152498d5ae4c9cffc99f699f17fe1f8910909c02d8b014f6a408f344d401828687533973cc38
+SHA512 (swipl-9.2.9_repackaged.tar.gz) = 57f0e043c6f0985106c68a2bba3a558ee3eb19ecaa145d5968d963da005f3d1fe0ef62ba43f299b067bda3bb6e4212a9e121926a4d8452df9aa8cbbecf6b27e2

swipl-9.2.3-lto-mismatch.patch

@@ -1,11 +0,0 @@
---- swipl-9.2.3/packages/semweb/murmur.c.orig	2024-03-28 13:45:03.000000000 -0600
-+++ swipl-9.2.3/packages/semweb/murmur.c	2024-04-05 10:09:30.257172942 -0600
-@@ -67,7 +67,7 @@ rdf_murmer_hash(const void * key, size_t
- #define MIX(h,k,m) { k *= m; k ^= k >> r; k *= m; h *= m; h ^= k; }
- 
- unsigned int
--rdf_murmer_hash(const void *key, int len, unsigned int seed)
-+rdf_murmer_hash(const void *key, size_t len, unsigned int seed)
- { const unsigned int m = 0x5bd1e995;
-   const int r = 24;
-   const unsigned char * data = (const unsigned char *)key;