Version 9.2.9

- Use zlib-ng instead of the zlib compatibility interface

JavaConfig.java

@@ -0,0 +1,153 @@
+/* JavaConfig - tool for getting paths for current java environment.
+ * © 2011, 2012, 2014, 2017  Petr Písař <ppisar@redhat.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+class JavaConfig {
+  private static String output = "";
+
+
+  /*
+   * Append text to output with proper padding or terminates if text is null.
+   * @param text String to append.
+   */
+  private static void concatenate(String text) {
+    if (text == null) {
+      System.exit(2);
+    }
+    output = (output.equals("") ? ""  : output + " " ) + text;
+  }
+
+
+  /*
+   * Show usage message and terminates program with given @exit_code.
+   * @param exit_code code to return
+   * */
+  private static void usage(int exitCode) {
+    System.out.print(
+        "JavaConfig [OPTIONS]\n" +
+        "  --home         Output path to Java home\n" +
+        "  --libs-only-L  Output -L linker flags\n" +
+        "  --version      Output Java version on first separate line\n"
+    );
+    System.exit(exitCode);
+  }
+
+
+  /*
+   * @Return path to Java home or null in case of error.
+   */
+  public static String home() {
+    return System.getProperty("java.home");
+  }
+
+
+  /*
+   * @Return formated libary search path as -L compiler flag,
+   * null if error occured.
+   * */
+  public static String libsOnlyL() {
+    String value;
+    String architecture = System.getProperty("os.arch");
+    String home = home();
+    String filesep = System.getProperty("file.separator");
+    String paths[];
+   
+    /* The java.library.path works up to JDK 1.6. */
+    if (null == (value = System.getProperty("java.library.path"))) {
+      return null;
+    }
+
+    /* The java.library.path does not work since JDK 1.7. See
+     * <https://bugzilla.redhat.com/show_bug.cgi?id=740762>.
+     * The "client" subdirectory is need on AArch64 since JDK 1.8. See
+     * <https://bugzilla.redhat.com/show_bug.cgi?id=1112012>. */
+    if (null == architecture || null == home || null == filesep) {
+      return null;
+    }
+
+    /* Experimental 32-bit ARM openjdk variant uses lib/aarch32. See
+     * <https://bugzilla.redhat.com/show_bug.cgi?id=1412953>. */
+    if (architecture.contentEquals("arm") && home.contains("aarch32")) {
+      architecture = "aarch32";
+    }
+
+    value = value + ":" +
+      home + filesep + "lib" + filesep + architecture + ":" +
+      home + filesep + "lib" + filesep + architecture + filesep + "server" +
+        ":" +
+      home + filesep + "lib" + filesep + architecture + filesep + "client";
+
+
+    /* Convert the colon-delimited paths to LDFLAGS format */
+    paths = value.split(":");
+
+    for (int i = 0; i < paths.length; i++) {
+      if (paths[i].equals("")) {
+        continue;
+      }
+      
+      if (i == 0) {
+        value = "-L" + paths[i];
+      } else {
+        value = value + " -L" + paths[i];
+      }
+    }
+    value = value + " -Wl,-rpath," + home + filesep + "lib" + architecture +
+	    filesep + "server";
+
+    return value;
+  }
+
+
+  /*
+   * @Return version of Java home or null in case of error.
+   */
+  public static String version() {
+    return System.getProperty("java.version");
+  }
+
+
+  /*
+   * Entry point to this class.
+   */
+  public static void main(String argv[]) {
+    if (argv.length < 1) {
+      usage(1);
+    }
+
+    for (int i = 0; i < argv.length; i++) {
+      if (argv[i].equals("--home")) {
+          concatenate(home());
+      } else if (argv[i].equals("--libs-only-L")) {
+          concatenate(libsOnlyL());
+      } else if (argv[i].equals("--version")) {
+          /* pkg-config prints version on first line */
+          String version = version();
+          if (null == version) {
+            System.exit(2);
+          }
+          System.out.println(version);
+      } else {
+          usage(1);
+      }
+    }
+
+    if (!output.equals("")) {
+      System.out.println(output);
+    }
+    System.exit(0);
+  }
+}

licenses.txt

@@ -1,221 +0,0 @@
-The swipl project is released under the BSD-2-Clause license.  Exceptions are
-noted below.  The status of each file is indicated with the following codes:
-
-BD = in the swi-prolog-bdb package
-CL = in the swi-prolog-cli package
-CP = in the swi-prolog-core-packages package
-CR = in the swi-prolog-core package
-DC = in the swi-prolog-doc package
-FL = in the swi-prolog-full package
-JV = in the swi-prolog-java pacakge
-MN = in the main package, swi-prolog
-NP = not packaged; these files do not influence the package License field
-OD = in the swi-prolog-odbc package
-TS = in the swi-prolog-test package
-WN = in the swi-prolog-win package
-
-bcrypt-Solar-Designer
----------------------
-CL packages/ssl/crypt_blowfish.{c,h}
-
-Beerware
---------
-CP packages/clib/md5passwd.c
-
-Brian-Gladman-3-Clause OR GPL-1.0-or-later
-------------------------------------------
-CP packages/clib/sha1/brg_endian.h
-CP packages/clib/sha1/brg_types.h
-CP packages/clib/sha1/hmac.{c,h}
-CP packages/clib/sha1/pwd2key.{c,h}
-CP packages/clib/sha1/sha*
-CR src/pl-termhash.{c,h}
-
-BSD-2-Clause AND BSD-3-Clause
------------------------------
-CL packages/libedit/libedit4pl.c
-
-BSD-2-Clause AND FBM AND HPND-Pbmplus
--------------------------------------
-WN packages/xpce/src/img/gifwrite.c
-
-BSD-2-Clause AND GPL-2.0-or-later
----------------------------------
-TS src/Tests/core/test_coroutining.pl
-
-BSD-2-Clause AND IJG
---------------------
-WN packages/xpce/src/img/jdatadst.c
-WN packages/xpce/src/img/jdatasrc.c
-
-BSD-2-Clause AND LicenseRef-Fedora-Public-Domain
-------------------------------------------------
-CR library/aggregate.pl
-WN packages/xpce/src/gra/colour.c
-
-BSD-2-Clause AND MIT
---------------------
-CP packages/http/http_stream.pl
-CP packages/http/multipart.c
-
-BSD-2-Clause AND Unicode-DFS-2016
----------------------------------
-CR library/blocks.pl
-
-BSD-2-Clause OR Artistic-2.0
-----------------------------
-CP library/ugraphs.pl
-
-BSD-3-Clause
-------------
-CP packages/clib/bsd-crypt.c
-NP packages/libedit/libedit/*
-NP packages/odbc/cmake/FindODBC.cmake
-NP packages/protobufs/interop/google/protobuf/unittest*
-CL packages/tipc/tipcutils/tipc-config.c
-NP packages/xpce/cmake/FindFontConfig.cmake
-CR src/libbf/mersenne-twister.{c,h}
-
-CC-BY-SA-3.0
-------------
-DC man/main.doc
-WN packages/xpce/man/course/doc.doc
-WN packages/xpce/man/info/titlepage.def
-
-dtoa
-----
-CR src/os/dtoa.c
-
-Free for non-commercial use
----------------------------
-NP bench/unify.pl (removed from tarball)
-NP bench/simple_analyzer.pl (removed from tarball)
-
-GFDL-1.3-no-invariants-or-later
--------------------------------
-CP packages/sweep/sweep.texi
-
-GPL-1.0-or-later OR Artistic-1.0-Perl
--------------------------------------
-CP packages/nlp/double_metaphone.c
-
-GPL-2.0-or-later
-----------------
-NP repackage.sh (not included in the upstream tarball)
-NP packages/xpce/man/info/texinfo.tex
-
-GPL-2.0-or-later WITH Bison-exception-2.2 AND LicenseRef-Fedora-Public-Domain
------------------------------------------------------------------------------
-WN packages/xpce/src/gnu/getdate.c
-
-GPL-2.0-or-later with SWI-exception
------------------------------------
-CP packages/clpqr/*
-CP packages/http/http_server_health.pl
-TS src/Tests/compile/test_autoload.pl
-TS tests/library/test_pio.pl
-
-GPL-3.0-or-later
-----------------
-CP packages/sweep/emacs-module.h
-
-Knuth-CTAN
-----------
-DC man/name.bst
-WN packages/xpce/TeX/name.bst
-
-LGPL-2.0-only
--------------
-NP cmake/TestSignalType.cmake
-
-LGPL-2.0-or-later
------------------
-CP packages/nlp/isub.c
-
-LGPL-2.1-or-later
------------------
-TS src/Tests/core/test_arith.pl
-TS src/Tests/core/test_bips.pl
-TS src/Tests/core/test_dcg.pl
-TS src/Tests/core/test_sort.pl
-TS src/Tests/core/test_subsumes.pl
-
-LicenseRef-Fedora-Public-Domain
--------------------------------
-NP bench/programs/derive.pl
-NP bench/programs/divide10.pl
-NP bench/programs/eval.pl
-NP bench/programs/fib.pl
-NP bench/programs/log10.pl
-NP bench/programs/nreverse.pl
-NP bench/programs/ops8.pl
-NP bench/programs/qsort.pl
-NP bench/programs/queens_clpfd.pl
-NP bench/programs/query.pl
-NP bench/programs/serialise.pl
-NP bench/programs/sieve.pl
-NP bench/programs/times10.pl
-CR library/dialect/bim.pl
-NP packages/clib/demo/*
-NP packages/cpp/likes.cpp
-NP packages/http/examples/demo_body.pl
-NP packages/http/examples/demo_daemon.pl
-CP packages/semweb/murmur.{c,h}
-NP packages/ssl/https.pl
-NP packages/stomp/examples/*
-NP packages/swipy/tests/russel.pl
-WN packages/xpce/man/course/bib.pl
-WN packages/xpce/man/course/fam.pl
-WN packages/xpce/man/course/ftp.pl
-WN packages/xpce/man/course/learner.pl
-WN packages/xpce/man/course/lib/prompt.pl
-WN packages/xpce/man/info/dialog.pl
-WN packages/xpce/man/info/which.pl
-WN packages/xpce/man/info/window.pl
-WN packages/xpce/man/reference/class/image.doc
-WN packages/xpce/man/userguide/examples/graphedit.pl
-WN packages/xpce/src/gnu/getdate-source.y
-WN packages/xpce/src/gnu/y.tab
-NP scripts/swipl-bt
-CR src/pl-hash.{c,h}
-CR src/libtai/*
-NP src/tools/functions.pm
-NP src/tools/update-deps
-
-LPPL-1.3c
----------
-DC man/bk9.clo
-DC man/swipl.cls
-
-MIT
----
-NP bench/programs/chat_parser.pl
-NP packages/http/web/js/jquery*
-CP packages/mqi/python/*
-NP packages/pcre/cmake/FindPCRE.cmake
-NP packages/swipy/test_xsb_janus.pl
-NP packages/swipy/xsb_tests/*
-CR src/libbf/cutils.{c,h}
-CR src/libbf/libbf.{c,h}
-
-MIT AND Unicode-DFS-2015
-------------------------
-CP packages/utf8proc/*
-
-Spencer-99 AND TCL AND PostgreSQL
----------------------------------
-WN packages/xpce/src/rgx/*
-
-W3C
----
-CP packages/sgml/DTD/*
-
-X11
----
-NP packages/xpce/deps/xpm/*
-
-Zlib
-----
-CP packages/clib/md5.{c,h}
-CP packages/semweb/md5.{c,h}
-CR src/minizip/*

sources

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

swipl-10.0.0-secure-getenv.patch

@@ -1,13 +0,0 @@
---- swipl-10.0.0/packages/libedit/libedit/src/CMakeLists.txt.orig	2025-11-30 01:13:23.000000000 -0700
-+++ swipl-10.0.0/packages/libedit/libedit/src/CMakeLists.txt	2025-12-05 15:40:03.894414328 -0700
-@@ -116,7 +116,10 @@ check_symbol_exists(unvis "vis.h" HAVE_U
- check_symbol_exists(endpwent "pwd.h" HAVE_ENDPWENT)
- check_symbol_exists(getpwuid_r "pwd.h" HAVE_GETPW_R_POSIX)
- check_symbol_exists(isascii "ctype.h" HAVE_ISASCII)
-+set(OLD_CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS})
-+list(APPEND CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
- check_symbol_exists(secure_getenv "stdlib.h" HAVE_SECURE_GETENV)
-+set(CMAKE_REQUIRED_DEFINITIONS ${OLD_CMAKE_REQUIRED_DEFINITIONS})
- check_symbol_exists(wcsdup "wchar.h" HAVE_WCSDUP)
- 
- include(CheckIncludeFile)

swipl-8.2.0-Remove-files-locations-from-swipl-1-manual.patch

@@ -17,7 +17,7 @@ diff --git a/src/swipl.1.in b/src/swipl.1.in
 index e6eeda5..81c5abb 100644
 --- a/src/swipl.1.in
 +++ b/src/swipl.1.in
-@@ -449,38 +449,6 @@ to find the local installation directory
+@@ -396,38 +396,6 @@ to find the local installation directory
  .I ~/.config/swi-prolog/init.pl
  Personal initialisation files consulted by SWI-Prolog on startup.
  The exact location depends on the OS.
@@ -56,7 +56,7 @@ index e6eeda5..81c5abb 100644
  .SH SEE ALSO
  .PP
  The SWI-Prolog web-home at
-@@ -490,9 +458,6 @@ Jan\ Wielemaker
+@@ -437,9 +405,6 @@ Jan\ Wielemaker
  .IR "SWI-Prolog Reference Manual" " at"
  .I http://www.swi-prolog.org/pldoc/index.html
  .PP

swipl-8.2.1-Fix-JNI.patch

@@ -18,7 +18,7 @@ diff --git a/packages/jpl/jpl.pl b/packages/jpl/jpl.pl
 index 024dd79..ffeccd9 100644
 --- a/packages/jpl/jpl.pl
 +++ b/packages/jpl/jpl.pl
-@@ -3823,7 +3823,8 @@ prolog:error_message(java_exception(Ex))
+@@ -3960,7 +3960,8 @@ prolog:error_message(java_exception(Ex))
  :- multifile user:file_search_path/2.
  :- dynamic   user:file_search_path/2.
  
@@ -28,7 +28,7 @@ index 024dd79..ffeccd9 100644
  
  classpath(DirOrJar) :-
      getenv('CLASSPATH', ClassPath),
-@@ -3992,7 +3993,7 @@ add_jpl_to_classpath :-
+@@ -4140,7 +4141,7 @@ add_jpl_to_classpath :-
  
  libjpl(File) :-
      (   current_prolog_flag(unix, true)

swipl-9.2.7-inclpr-math.patch

@@ -1,10 +0,0 @@
---- swipl-9.2.7/packages/inclpr/CMakeLists.txt.orig	2023-12-11 03:16:08.000000000 -0700
-+++ swipl-9.2.7/packages/inclpr/CMakeLists.txt	2024-09-18 09:37:46.320423903 -0600
-@@ -15,6 +15,7 @@ swipl_plugin(inclpr_priv
- swipl_plugin(inclpr
- 	     NOINDEX
- 	     C_SOURCES inclpr.c
-+	     C_LIBS m
- 	     PL_LIBS inclpr.pl)
- 
- swipl_examples(benchmarks.pl)