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

@@ -1,4 +1,4 @@
-libmuparser2_2_6
+libmuparser2_3_2
 muparser-devel
-	requires "libmuparser2_2_6-<targettype> = <version>"
+	requires "libmuparser2_3_2-<targettype> = <version>"
 

muparser-abiversion.diff

@@ -1,48 +1,12 @@
-From: Jan Engelhardt <jengelh@inai.de>
+diff -ru a/CMakeLists.txt b/CMakeLists.txt
-Date: 2015-02-03 00:43:03.433735818 +0100
+--- 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}
+ )
  
-muparser broke the ABI between 2.2.3 and 2.2.4 by changing.
+ # Install the export set for use with the install-tree
-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
-       ;;
- 
-       *-*-solaris2* )

muparser-optflags.patch

@@ -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 = \

muparser.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Wed Jun 17 08:54:21 UTC 2020 - Paolo Stivanin <info@paolostivanin.com>
+
+- 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 <jengelh@inai.de>
 

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
+%define lname	libmuparser2_3_2
-Version:        2.2.6.1
+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
+BuildRequires:  cmake
-Patch2:         muparser-abiversion.diff
-BuildRequires:  autoconf
-BuildRequires:  automake
 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
+%cmake \
-%configure --enable-samples --enable-shared
+    -DCMAKE_INSTALL_PREFIX=%{_prefix}
-# bakafile not parallel sife - duh
+%cmake_build
-make -j1
 
 %install
-%make_install
+%cmake_install
-rm -f "%buildroot/%_libdir"/*.la
 
 %post   -n %lname -p /sbin/ldconfig
 %postun -n %lname -p /sbin/ldconfig

v2.2.6.1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d2562853d972b6ddb07af47ce8a1cdeeb8bb3fa9e8da308746de391db67897b3
-size 755653

v2.3.2.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b35fc84e3667d432e3414c8667d5764dfa450ed24a99eeef7ee3f6647d44f301
+size 103979