Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package lalinference for openSUSE:Factory checked in at 2024-12-03 20:46:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lalinference (Old) and /work/SRC/openSUSE:Factory/.lalinference.new.28523 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lalinference" Tue Dec 3 20:46:35 2024 rev:14 rq:1227914 version:4.1.7 Changes: -------- --- /work/SRC/openSUSE:Factory/lalinference/lalinference.changes 2024-09-15 12:39:59.469524257 +0200 +++ /work/SRC/openSUSE:Factory/.lalinference.new.28523/lalinference.changes 2024-12-03 20:47:44.044357717 +0100 @@ -1,0 +2,7 @@ +Mon Dec 2 15:18:22 UTC 2024 - Atri Bhattacharya <[email protected]> + +- Add lalinference-swig-stringval-not-value.patch: For + compatibility with swig 4.3.0, prefer 'stringval' before 'value' + attribute (upstream commit 9dba245a). + +------------------------------------------------------------------- New: ---- lalinference-swig-stringval-not-value.patch BETA DEBUG BEGIN: New: - Add lalinference-swig-stringval-not-value.patch: For compatibility with swig 4.3.0, prefer 'stringval' before 'value' BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lalinference.spec ++++++ --- /var/tmp/diff_new_pack.PKcwBc/_old 2024-12-03 20:47:44.488376288 +0100 +++ /var/tmp/diff_new_pack.PKcwBc/_new 2024-12-03 20:47:44.488376288 +0100 @@ -41,6 +41,8 @@ Source: https://software.igwn.org/sources/source/lalsuite/%{pname}-%{version}.tar.xz # PATCH-FIX-UPSTREAM lalinference-printf-data-type-consistency.patch [email protected] -- Cast data passed to printf from size_t to long to make it consistent with the format "%li"; this fixes build failures on i586 Patch0: lalinference-printf-data-type-consistency.patch +# PATCH-FIX-UPSTREAM +Patch1: https://git.ligo.org/lscsoft/lalsuite/-/commit/9dba245ab3692ecf691247a442704f13c075ed34.patch#/lalinference-swig-stringval-not-value.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module numpy-devel >= 1.7} BuildRequires: fdupes @@ -133,6 +135,7 @@ %description -n %{name}-data This package provides the data files for lalinference. +%if %{with octave} %package -n octave-lalinference Summary: Octave bindings for LAL Inference Group: Productivity/Scientific/Physics @@ -148,9 +151,14 @@ %description -n octave-lalinference This package provides the necessary files for using LAL Inference with octave. +%endif %prep -%autosetup -p1 -n %{pname}-%{version} +# Upstream commits are -p1 against the full lalsuite, but -p2 against individual lal* pkgs +# Patch0 is not upstream and uses -p1, so we have a mix of -p1 and -p2 patches +%autosetup -N -n %{pname}-%{version} +%patch -P0 -p1 +%patch -P1 -p2 %build %{python_expand # Necessary to run %%configure with all python flavors ++++++ lalinference-swig-stringval-not-value.patch ++++++ >From 9dba245ab3692ecf691247a442704f13c075ed34 Mon Sep 17 00:00:00 2001 From: Karl Wette <[email protected]> Date: Thu, 24 Oct 2024 18:06:30 +1100 Subject: [PATCH] common/swig/generate_swig_iface.py: prefer "stringval" before "value" attribute - As of SWIG 4.3.0 "value" attribute contains quote characters - "stringval" attribute appears to still contain the raw string --- common/swig/generate_swig_iface.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/common/swig/generate_swig_iface.py b/common/swig/generate_swig_iface.py index 530b026d5d..eaee2d41ce 100644 --- a/common/swig/generate_swig_iface.py +++ b/common/swig/generate_swig_iface.py @@ -195,9 +195,11 @@ class SwigSymbols(object): """Parse a swiglal macro """ cdecl_name = get_swig_attr(cdecl, 'name') - cdecl_value = get_swig_attr(cdecl, 'value') + cdecl_value = get_swig_attr(cdecl, 'stringval') if not cdecl_value: - raise ValueError("cdecl '{}' has no value".format(cdecl_name)) + cdecl_value = get_swig_attr(cdecl, 'value') + if not cdecl_value: + raise ValueError("cdecl '{}' has no value".format(cdecl_name)) macro = re.sub(r'\s', '', cdecl_value) if cdecl_name == '__swiglal__': if macro in clear_macros: -- GitLab
