diff --git a/lal-7.2.0.tar.xz b/lal-7.2.0.tar.xz deleted file mode 100644 index 3ffc265..0000000 --- a/lal-7.2.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7858e07148491b6d6b9fb727722800a5efd24ba30cff1b1a1e475804517583e4 -size 2371888 diff --git a/lal-7.2.4.tar.xz b/lal-7.2.4.tar.xz new file mode 100644 index 0000000..aea5e21 --- /dev/null +++ b/lal-7.2.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e00d15216fca06b35b2b0c27fa360ed5042c700d5dd3eaf8f249957a1e199ccf +size 2372060 diff --git a/lal.changes b/lal.changes index f334f67..6568a8f 100644 --- a/lal.changes +++ b/lal.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Nov 26 02:40:59 UTC 2022 - Stefan BrĂ¼ns + +- Update to version 7.2.4: + * No release notes. +- Fix build with Swig 4.1.0, add swig_4_1_compat.patch + ------------------------------------------------------------------- Fri Aug 19 11:54:33 UTC 2022 - Atri Bhattacharya diff --git a/lal.spec b/lal.spec index 37b9b39..bb0aff8 100644 --- a/lal.spec +++ b/lal.spec @@ -1,5 +1,5 @@ # -# spec file for package lal +# spec file # # Copyright (c) 2022 SUSE LLC # @@ -36,13 +36,15 @@ # No support for octave >= 6 %bcond_with octave Name: lal%{psuffix} -Version: 7.2.0 +Version: 7.2.4 Release: 0 Summary: A collection of various gravitational wave data analysis routines License: GPL-2.0-only Group: Productivity/Scientific/Physics URL: https://wiki.ligo.org/Computing/LALSuite Source: https://software.igwn.org/sources/source/lalsuite/lal-%{version}.tar.xz +# PATCH-FIX-UPSTREAM -- See https://git.ligo.org/lscsoft/lalsuite/-/commit/847f9f1bf9c8e029db6426de098a963d542ab08b.patch +Patch0: swig_4_1_compat.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module numpy-devel} BuildRequires: %{python_module numpy} diff --git a/swig_4_1_compat.patch b/swig_4_1_compat.patch new file mode 100644 index 0000000..592f647 --- /dev/null +++ b/swig_4_1_compat.patch @@ -0,0 +1,38 @@ +From 847f9f1bf9c8e029db6426de098a963d542ab08b Mon Sep 17 00:00:00 2001 +From: Karl Wette +Date: Fri, 25 Nov 2022 17:15:19 +1100 +Subject: [PATCH] SWIG: compatibility with version 4.1.0 + +- -py3 is deprecated +- %typemaps_string_alloc() needs an extra argument +--- + gnuscripts/lalsuite_swig.m4 | 8 +++++++- + lal/swig/SWIGCommon.i | 8 ++++++++ + 2 files changed, 15 insertions(+), 1 deletion(-) + +diff --git a/swig/SWIGCommon.i b/swig/SWIGCommon.i +index caf7d8f365..bb6dc62e6e 100644 +--- a/swig/SWIGCommon.i ++++ b/swig/SWIGCommon.i +@@ -1809,10 +1809,18 @@ if (strides[I-1] == 0) { + return res; + } + } ++#if SWIG_VERSION >= 0x040100 ++%typemaps_string_alloc(%checkcode(STRING), %checkcode(char), ++ SWIGWARN_TYPEMAP_CHARLEAK_MSG, char, LALchar, ++ SWIG_AsLALcharPtrAndSize, SWIG_FromLALcharPtrAndSize, ++ strlen, SWIG_strnlen, %swiglal_new_copy_array, XLALFree, ++ "", CHAR_MIN, CHAR_MAX); ++#else + %typemaps_string_alloc(%checkcode(STRING), %checkcode(char), char, LALchar, + SWIG_AsLALcharPtrAndSize, SWIG_FromLALcharPtrAndSize, + strlen, SWIG_strnlen, %swiglal_new_copy_array, XLALFree, + "", CHAR_MIN, CHAR_MAX); ++#endif + + /// + /// Typemaps for string pointers. By default, treat arguments of type char** as output-only +-- +GitLab +