diff --git a/clisp-bdb-mismatched-pointer.patch b/clisp-bdb-mismatched-pointer.patch new file mode 100644 index 0000000..9cc3fe0 --- /dev/null +++ b/clisp-bdb-mismatched-pointer.patch @@ -0,0 +1,13 @@ +--- modules/berkeley-db/bdb.c.orig 2023-07-18 14:03:05.000000000 -0600 ++++ modules/berkeley-db/bdb.c 2023-12-01 12:12:30.675503890 -0700 +@@ -2752,8 +2752,8 @@ DEFUN(BDB:TXN-RECOVER, dbe &key FIRST :N + DB_ENV *dbe = (DB_ENV*)bdb_handle(popSTACK(),`BDB::DBE`,BH_VALID); + u_int32_t tx_max; + DB_PREPLIST *preplist; +- int status, ii; +- u_int32_t retnum; ++ int status; ++ long ii, retnum; + SYSCALL(dbe->get_tx_max,(dbe,&tx_max)); + preplist = (DB_PREPLIST*)clisp_malloc(tx_max * sizeof(DB_PREPLIST)); + begin_blocking_system_call(); diff --git a/clisp.spec b/clisp.spec index 36dc2b4..2ed2f04 100644 --- a/clisp.spec +++ b/clisp.spec @@ -26,7 +26,7 @@ Version: 2.49.93 # - src/socket.d and modules/clx/mit-clx/doc.lisp are HPND # - src/xthread.d and modules/asdf/asdf.lisp are X11 License: GPL-2.0-or-later AND (GPL-2.0-or-later OR GFDL-1.2-or-later) AND LGPL-2.1-or-later AND HPND AND X11 -Release: 34%{?dist} +Release: 35%{?dist} URL: http://www.clisp.org/ Source0: %{forgesource} # Upstream dropped this file from the distribution @@ -45,7 +45,10 @@ Patch2: %{name}-register-volatile.patch # Perhaps we are racing with something else that allocates a pty. Disable # the test for now. Patch3: %{name}-pts-access.patch -Patch4: clisp-c99.patch +# Fix HAVE_DB_STAT_ACCEPT_TXN test in the Berkeley DB module +Patch4: %{name}-c99.patch +# Fix mismatched pointer types in the Berkeley DB module +Patch5: %{name}-bdb-mismatched-pointer.patch # Work around a problem inlining a function on ppc64le # See https://bugzilla.redhat.com/show_bug.cgi?id=2049371 @@ -444,6 +447,9 @@ make -C build base-mod-check %changelog +* Fri Dec 1 2023 Jerry James - 2.49.93-35 +- Fix a mismatched pointer type error with GCC 14 + * Wed Aug 16 2023 Jerry James - 2.49.93-34 - Build without pcre support (rhbz#2128278)