From 916b13d5a65834fabd255e94a2483a31d28caa94 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Apr 26 2024 19:06:51 +0000 Subject: Version 9.2.4 - Drop upstreamed template-id and janus-ref patches --- diff --git a/pl.spec b/pl.spec index fd63520..9c73a6c 100644 --- a/pl.spec +++ b/pl.spec @@ -12,7 +12,7 @@ %global swipl_arch %{_target_cpu}-linux Name: pl -Version: 9.2.3 +Version: 9.2.4 Release: %autorelease Summary: SWI-Prolog - Edinburgh compatible Prolog compiler #LICENSE: BSD-2-Clause @@ -162,12 +162,6 @@ Patch3: swipl-9.0.4-zlib.patch # Fix an LTO type mismatch # https://github.com/SWI-Prolog/packages-semweb/pull/113 Patch4: swipl-9.2.3-lto-mismatch.patch -# Fix warnings about template IDs -# https://github.com/SWI-Prolog/packages-cpp/pull/80 -Patch5: swipl-9.2.3-template-id.patch -# Avoid a use-after-free scenario in swipy -# https://github.com/SWI-Prolog/packages-swipy/pull/8 -Patch6: swipl-9.2.3-janus-ref.patch # See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} diff --git a/sources b/sources index fb4526e..ef10868 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (userguide.html.tgz) = baa16d8f06a666e77ef45aaf7708e877710bfcb8fc0fb519bc70c54619c45def2d2ab4feaa0f1a1875b2a2270e8907551b63582da1b4beaa5b50f013a41d7ab9 -SHA512 (swipl-9.2.3_repackaged.tar.gz) = 6285ae08a47613fc4895ffd807e1fb0e10be210895f0bb9db3860ceaa24b9bf2df02bec99d21a9b647127d7c52851a0fea2d78811ab83cc51e2d8bbae1a07d1d +SHA512 (swipl-9.2.4_repackaged.tar.gz) = b0de421011c117e6ccb85212398f7cb84c3f1d8e97986c5d05ac6d31d0375c32c410d5cc73749a0f727a27f36284345cb96472a69dac9d1eaffc85b38678c268 diff --git a/swipl-9.2.3-janus-ref.patch b/swipl-9.2.3-janus-ref.patch deleted file mode 100644 index 0cfc557..0000000 --- a/swipl-9.2.3-janus-ref.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- swipl-9.2.3/packages/swipy/janus/janus.c.orig 2024-04-04 08:11:51.000000000 -0600 -+++ swipl-9.2.3/packages/swipy/janus/janus.c 2024-04-05 12:02:46.639224747 -0600 -@@ -426,7 +426,6 @@ py_register_module(term_t name, term_t o - goto out; - - m = check_error(PyImport_Import(idobj)); -- Py_DECREF(idobj); - if ( m ) - { PyObject *old = NULL; - if ( mod ) -@@ -434,12 +433,11 @@ py_register_module(term_t name, term_t o - rc = py_add_hashmap(py_module_table, as, m, &old); - if ( old ) - Py_DECREF(old); -- return rc; - } -+out: -+ Py_DECREF(idobj); - } - --out: -- Py_CLEAR(idobj); - return rc; - } - diff --git a/swipl-9.2.3-template-id.patch b/swipl-9.2.3-template-id.patch deleted file mode 100644 index 517c6be..0000000 --- a/swipl-9.2.3-template-id.patch +++ /dev/null @@ -1,66 +0,0 @@ -Fixes these warnings: - -In file included from /builddir/build/BUILD/swipl-9.2.3/packages/cpp/test_cpp.cpp:63: -/builddir/build/BUILD/swipl-9.2.3/packages/cpp/SWI-cpp2.h:182:26: warning: template-id not allowed for constructor in C++20 [-Wtemplate-id-cdtor] - 182 | explicit WrappedC(C_t v) - | ^~~ -/builddir/build/BUILD/swipl-9.2.3/packages/cpp/SWI-cpp2.h:182:26: note: remove the ‘< >’ -/builddir/build/BUILD/swipl-9.2.3/packages/cpp/SWI-cpp2.h:185:16: warning: template-id not allowed for constructor in C++20 [-Wtemplate-id-cdtor] - 185 | WrappedC( const WrappedC&) = default; - | ^ -/builddir/build/BUILD/swipl-9.2.3/packages/cpp/SWI-cpp2.h:185:16: note: remove the ‘< >’ -/builddir/build/BUILD/swipl-9.2.3/packages/cpp/SWI-cpp2.h:190:3: warning: template-id not allowed for destructor in C++20 [-Wtemplate-id-cdtor] - 190 | ~WrappedC() { } - | ^ -/builddir/build/BUILD/swipl-9.2.3/packages/cpp/SWI-cpp2.h:190:3: note: remove the ‘< >’ -/builddir/build/BUILD/swipl-9.2.3/packages/cpp/SWI-cpp2.h:1670:45: warning: template-id not allowed for constructor in C++20 [-Wtemplate-id-cdtor] - 1670 | explicit PlForeignContextPtr(PlControl handle) - | ^~~~~~~~~ -/builddir/build/BUILD/swipl-9.2.3/packages/cpp/SWI-cpp2.h:1670:45: note: remove the ‘< >’ -/builddir/build/BUILD/swipl-9.2.3/packages/cpp/SWI-cpp2.h:1674:35: warning: template-id not allowed for constructor in C++20 [-Wtemplate-id-cdtor] - 1674 | PlForeignContextPtr(const PlForeignContextPtr&) = delete; - | ^ -/builddir/build/BUILD/swipl-9.2.3/packages/cpp/SWI-cpp2.h:1674:35: note: remove the ‘< >’ -/builddir/build/BUILD/swipl-9.2.3/packages/cpp/SWI-cpp2.h:1675:36: warning: template-id not allowed for constructor in C++20 [-Wtemplate-id-cdtor] - 1675 | PlForeignContextPtr(PlForeignContextPtr&&) = delete; - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -/builddir/build/BUILD/swipl-9.2.3/packages/cpp/SWI-cpp2.h:1675:36: note: remove the ‘< >’ - ---- swipl-9.2.3/packages/cpp/SWI-cpp2.h.orig 2024-03-26 01:39:06.000000000 -0600 -+++ swipl-9.2.3/packages/cpp/SWI-cpp2.h 2024-04-05 10:26:48.084014514 -0600 -@@ -179,15 +179,15 @@ public: - - friend C_t *PlUnwrapAsPtr(WrappedC* obj) { return obj ? obj->unwrap_as_ptr() : nullptr; } - -- explicit WrappedC(C_t v) -+ explicit WrappedC(C_t v) - : C_(v) { } - -- WrappedC( const WrappedC&) = default; -- WrappedC& operator =(const WrappedC&) = default; -+ WrappedC( const WrappedC&) = default; -+ WrappedC& operator =(const WrappedC&) = default; - // This simple wrapper class doesn't need a move constructor or - // move operator =. - -- ~WrappedC() { } -+ ~WrappedC() { } - - operator bool() const = delete; // Use not_null(), is_null() instead - bool operator ==(WrappedC o) const { return C_ == o.C_; } -@@ -1667,12 +1667,12 @@ class PlForeignContextPtr - { - public: - [[deprecated("Use PlControl::context_unique_ptr")]] -- explicit PlForeignContextPtr(PlControl handle) -+ explicit PlForeignContextPtr(PlControl handle) - { ptr_.reset(static_cast(handle.foreign_context_address())); - } - -- PlForeignContextPtr(const PlForeignContextPtr&) = delete; -- PlForeignContextPtr(PlForeignContextPtr&&) = delete; -+ PlForeignContextPtr(const PlForeignContextPtr&) = delete; -+ PlForeignContextPtr(PlForeignContextPtr&&) = delete; - PlForeignContextPtr& operator =(const PlForeignContextPtr&) = delete; - PlForeignContextPtr& operator =(PlForeignContextPtr&&) = delete; -