From cca072132609d9dd41cd2b0203ac4e3ec5443c36 Mon Sep 17 00:00:00 2001 From: Tom Schoonjans Date: Sun, 13 Feb 2022 10:51:06 +0000 Subject: [PATCH 1/4] Update changelog --- Changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Changelog b/Changelog index 11696bfa..33a87ce8 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,10 @@ +Version 4.1.2 Tom Schoonjans + +- Fix edge case in CS_Photo_Partial, where Kissel edge energies don't actually +correspond to the first energy in the list of energies (reported by Ulla +Vainio, and fixed by Oleg Shirokobrod) +- Fix memory leak in SWIG generated Python bindings (reported by David Vine) + Version 4.1.1 Tom Schoonjans - Do not use distutils in autoconf macros, as it will not be available in From 7405702304cb7096fd8fc124c8c52db36b58427a Mon Sep 17 00:00:00 2001 From: Tom Schoonjans Date: Sun, 13 Feb 2022 10:51:46 +0000 Subject: [PATCH 2/4] Bump version to 4.1.2 --- .bumpversion.cfg | 2 +- configure.ac | 2 +- idl/libxrlidl.dlm | 2 +- java/GoogleAnalyticsThread.java | 2 +- java/build.gradle.in | 2 +- meson.build | 2 +- xraylib.spec | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 9da2c540..9fe30129 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 4.1.1 +current_version = 4.1.2 commit = False tag = False diff --git a/configure.ac b/configure.ac index d03a5b1a..86c38d67 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ -AC_INIT([xraylib],[4.1.1],[Tom.Schoonjans@me.com]) +AC_INIT([xraylib],[4.1.2],[Tom.Schoonjans@me.com]) AC_PREREQ([2.60]) AC_CONFIG_SRCDIR([include/xraylib.h]) AC_CONFIG_AUX_DIR([build-aux]) diff --git a/idl/libxrlidl.dlm b/idl/libxrlidl.dlm index 8ba01ae4..e18e09f0 100644 --- a/idl/libxrlidl.dlm +++ b/idl/libxrlidl.dlm @@ -16,7 +16,7 @@ MODULE XRAYLIB DESCRIPTION IDL XRAYLIB BINDINGS -VERSION 4.1.1 +VERSION 4.1.2 SOURCE A.Brunetti, M. S. del Rio, T. Schoonjans, T. Ikonen, B. Golosio, A. Simionovici, A. Somogyi diff --git a/java/GoogleAnalyticsThread.java b/java/GoogleAnalyticsThread.java index d8d84867..d28f6770 100644 --- a/java/GoogleAnalyticsThread.java +++ b/java/GoogleAnalyticsThread.java @@ -14,7 +14,7 @@ public class GoogleAnalyticsThread extends Thread { private static final String GOOGLE_ANALYTICS_ENDPOINT = "https://www.google-analytics.com/collect"; private static final String GOOGLE_ANALYTICS_TRACKING_ID = "UA-42595764-5"; private static final String GOOGLE_ANALYTICS_APPLICATION_NAME = "xraylib"; - private static final String GOOGLE_ANALYTICS_APPLICATION_VERSION = "4.1.1"; + private static final String GOOGLE_ANALYTICS_APPLICATION_VERSION = "4.1.2"; private static final String GOOGLE_ANALYTICS_HIT_TYPE = "event"; public void run() { diff --git a/java/build.gradle.in b/java/build.gradle.in index d4474709..b5e2ffba 100644 --- a/java/build.gradle.in +++ b/java/build.gradle.in @@ -12,7 +12,7 @@ plugins { id "biz.aQute.bnd.builder" version "5.3.0" } -version = '4.1.1' +version = '4.1.2' group = 'com.github.tschoonj' sourceCompatibility = '1.8' targetCompatibility = '1.8' diff --git a/meson.build b/meson.build index aabce27b..93e21d1d 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project('xraylib', 'c', meson_version: '>= 0.56.0', - version: '4.1.1', + version: '4.1.2', license: 'BSD', default_options: ['cpp_std=c++11',] ) diff --git a/xraylib.spec b/xraylib.spec index ba0b6512..9a441b73 100644 --- a/xraylib.spec +++ b/xraylib.spec @@ -18,7 +18,7 @@ %define perl_vendor_autolib %{perl_vendor_archlib}/auto Name: xraylib -Version: 4.1.1 +Version: 4.1.2 Release: 1%{?dist} Summary: A library for X-ray matter interactions cross sections for X-ray fluorescence applications: core C library Group: Applications/Engineering and Scientific From e7f828783b449d334bad34003c501001433f007b Mon Sep 17 00:00:00 2001 From: Tom Schoonjans Date: Sun, 13 Feb 2022 10:53:46 +0000 Subject: [PATCH 3/4] Bump libtool revision number --- configure.ac | 2 +- meson.build | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 86c38d67..e5a1343c 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ AC_CANONICAL_HOST LIB_CURRENT=12 -LIB_REVISION=0 +LIB_REVISION=1 LIB_AGE=1 AC_SUBST(LIB_CURRENT) AC_SUBST(LIB_REVISION) diff --git a/meson.build b/meson.build index 93e21d1d..6e6bb790 100644 --- a/meson.build +++ b/meson.build @@ -14,7 +14,7 @@ project('xraylib', # # been preserved, change to C+1:0:A+1 # # c) If the interface is the same as the previous version, change to C:R+1:A lib_current = 12 -lib_revision = 0 +lib_revision = 1 lib_age = 1 version = '@0@.@1@.@2@'.format((lib_current - lib_age), lib_age, lib_revision) @@ -188,4 +188,4 @@ ENDPROGRAM f2003_main endif endif -endif \ No newline at end of file +endif From fa952be71b44efeb5ef9fc70e23b5026962fc2c8 Mon Sep 17 00:00:00 2001 From: Tom Schoonjans Date: Sun, 13 Feb 2022 11:17:54 +0000 Subject: [PATCH 4/4] Update xraylib.h with new version number --- include/xraylib.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/xraylib.h b/include/xraylib.h index 70427d1e..da1d7887 100644 --- a/include/xraylib.h +++ b/include/xraylib.h @@ -24,7 +24,7 @@ extern "C" { #define XRAYLIB_MAJOR 4 #define XRAYLIB_MINOR 1 -#define XRAYLIB_MICRO 1 +#define XRAYLIB_MICRO 2 #ifndef PI