From 3bc338a68276fb8cb8f8600ff56ea2bd139b9315227c6ffe3f0f7d09689120ef Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 17 Jun 2020 12:54:36 +0000 Subject: [PATCH] Accepting request 815514 from home:polslinux:branches:science - Update to 2.3.2: * using OpenMP is now the default settings for cmake based builds * added optimization for trivial expressions * introduced a maximum length for expressions (5000 Character) * introduced a maximum length for identifiers (100 Characters) * removed the MUP_MATH_EXCEPTION macro and related functionality * removed ParserStack.h (replaced with std::stack) * removed macros for defining E and PI (replaced with a static constants) * the MUP_ASSERT macro is no longer removed in release builds for better protection against segmentation faults - Updated muparser-abiversion.diff as the project is now using cmake - Removed muparser-optflags.patch as the project is now using cmake and the Makefile.in file no longer exists OBS-URL: https://build.opensuse.org/request/show/815514 OBS-URL: https://build.opensuse.org/package/show/science/muparser?expand=0&rev=25 --- baselibs.conf | 4 +-- muparser-abiversion.diff | 58 ++++++++-------------------------------- muparser-optflags.patch | 13 --------- muparser.changes | 17 ++++++++++++ muparser.spec | 23 +++++++--------- v2.2.6.1.tar.gz | 3 --- v2.3.2.tar.gz | 3 +++ 7 files changed, 42 insertions(+), 79 deletions(-) delete mode 100644 muparser-optflags.patch delete mode 100644 v2.2.6.1.tar.gz create mode 100644 v2.3.2.tar.gz diff --git a/baselibs.conf b/baselibs.conf index 04ff3e8..d2da61b 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,4 @@ -libmuparser2_2_6 +libmuparser2_3_2 muparser-devel - requires "libmuparser2_2_6- = " + requires "libmuparser2_3_2- = " diff --git a/muparser-abiversion.diff b/muparser-abiversion.diff index 6755df3..8c7bb8d 100644 --- a/muparser-abiversion.diff +++ b/muparser-abiversion.diff @@ -1,48 +1,12 @@ -From: Jan Engelhardt -Date: 2015-02-03 00:43:03.433735818 +0100 - -muparser broke the ABI between 2.2.3 and 2.2.4 by changing. -The abidiff(1) report from libabigail: - - [C]'method std::size_t mu::ParserError::GetPos()' has some indirect sub-type changes: - return type changed: - entity changed from typedef std::size_t to int - name changed from 'long unsigned int' to 'int' - size changed from 64 to 32 bits - alignment changed from 64 to 32 bits - -Work around this messup by using the full version as unique SONAME. ---- - Makefile.in | 6 +++--- - build/autoconf/aclocal.m4 | 5 +++-- - 2 files changed, 6 insertions(+), 5 deletions(-) - -Index: muparser-2.2.4/Makefile.in -=================================================================== ---- muparser-2.2.4.orig/Makefile.in -+++ muparser-2.2.4/Makefile.in -@@ -143,7 +143,7 @@ COND_WINDOWS_IMPLIB_1___muParser_dll___i - @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__muParser_dll___targetsuf3 \ - @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .2.2.4.$(SO_SUFFIX) - @COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@__muParser_dll___targetsuf3 \ --@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@ = .$(SO_SUFFIX).2 -+@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@ = .$(SO_SUFFIX).2.2.6 - @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__muParser_dll___targetsuf3 \ - @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@ = -2.$(SO_SUFFIX) - @COND_USE_SOVERSION_0@__muParser_dll___targetsuf3 = .$(SO_SUFFIX) -Index: muparser-2.2.4/build/autoconf/aclocal.m4 -=================================================================== ---- muparser-2.2.4.orig/build/autoconf/aclocal.m4 -+++ muparser-2.2.4/build/autoconf/aclocal.m4 -@@ -1317,8 +1317,9 @@ AC_DEFUN([AC_BAKEFILE_SHARED_VERSIONS], - SONAME_FLAG="-Wl,-soname," - fi - USE_SOVERSION=1 -- USE_SOVERLINUX=1 -- USE_SOTWOSYMLINKS=1 -+ USE_SOVERLINUX=0 -+ USE_SOVERSOLARIS=1 -+ USE_SOTWOSYMLINKS=0 - ;; +diff -ru a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2020-06-17 10:52:15.574640873 +0200 ++++ b/CMakeLists.txt 2020-06-17 00:09:53.000000000 +0200 +@@ -74,7 +74,7 @@ + endif() + set_target_properties(muparser PROPERTIES + VERSION ${MUPARSER_VERSION} ++ SOVERSION ${MUPARSER_VERSION} +- SOVERSION ${MUPARSER_VERSION_MAJOR} + ) - *-*-solaris2* ) + # Install the export set for use with the install-tree diff --git a/muparser-optflags.patch b/muparser-optflags.patch deleted file mode 100644 index d48fb2a..0000000 --- a/muparser-optflags.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- muparser_v134/Makefile.in.orig 2010-11-10 17:20:25.613034414 +0100 -+++ muparser_v134/Makefile.in 2010-11-10 17:20:46.068784224 +0100 -@@ -104,8 +104,8 @@ - - ### Conditionally set variables: ### - --@COND_DEPS_TRACKING_0@CXXC = $(CXX) --@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX) -+@COND_DEPS_TRACKING_0@CXXC = $(CXX) $(CXXFLAGS) -+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX) $(CXXFLAGS) - @COND_DEBUG_0@DEBUG_BUILD_POSTFIX = - @COND_DEBUG_1@DEBUG_BUILD_POSTFIX = d - @COND_SHARED_0@__muParser_lib___depname = \ diff --git a/muparser.changes b/muparser.changes index 9d4d28b..3685d0e 100644 --- a/muparser.changes +++ b/muparser.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Wed Jun 17 08:54:21 UTC 2020 - Paolo Stivanin + +- Update to 2.3.2: + * using OpenMP is now the default settings for cmake based builds + * added optimization for trivial expressions + * introduced a maximum length for expressions (5000 Character) + * introduced a maximum length for identifiers (100 Characters) + * removed the MUP_MATH_EXCEPTION macro and related functionality + * removed ParserStack.h (replaced with std::stack) + * removed macros for defining E and PI (replaced with a static constants) + * the MUP_ASSERT macro is no longer removed in release builds + for better protection against segmentation faults +- Updated muparser-abiversion.diff as the project is now using cmake +- Removed muparser-optflags.patch as the project is now using cmake + and the Makefile.in file no longer exists + ------------------------------------------------------------------- Sat Aug 24 16:24:09 UTC 2019 - Jan Engelhardt diff --git a/muparser.spec b/muparser.spec index 6a1a8ba..a949509 100644 --- a/muparser.spec +++ b/muparser.spec @@ -1,7 +1,7 @@ # # spec file for package muparser # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,20 +17,17 @@ Name: muparser -%define lname libmuparser2_2_6 -Version: 2.2.6.1 +%define lname libmuparser2_3_2 +Version: 2.3.2 Release: 0 Summary: A math parser library License: MIT Group: Productivity/Scientific/Math URL: http://muparser.beltoforion.de/ - Source: https://github.com/beltoforion/muparser/archive/v%{version}.tar.gz +Patch0: muparser-abiversion.diff Source1: baselibs.conf -Patch1: muparser-optflags.patch -Patch2: muparser-abiversion.diff -BuildRequires: autoconf -BuildRequires: automake +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: pkg-config @@ -63,14 +60,12 @@ precalculating constant parts of the expression. %autosetup -p1 %build -sh build/autoconf/acregen.sh -%configure --enable-samples --enable-shared -# bakafile not parallel sife - duh -make -j1 +%cmake \ + -DCMAKE_INSTALL_PREFIX=%{_prefix} +%cmake_build %install -%make_install -rm -f "%buildroot/%_libdir"/*.la +%cmake_install %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig diff --git a/v2.2.6.1.tar.gz b/v2.2.6.1.tar.gz deleted file mode 100644 index 8b532ad..0000000 --- a/v2.2.6.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d2562853d972b6ddb07af47ce8a1cdeeb8bb3fa9e8da308746de391db67897b3 -size 755653 diff --git a/v2.3.2.tar.gz b/v2.3.2.tar.gz new file mode 100644 index 0000000..166f143 --- /dev/null +++ b/v2.3.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b35fc84e3667d432e3414c8667d5764dfa450ed24a99eeef7ee3f6647d44f301 +size 103979