2020-06-17 14:56:53 +02:00
|
|
|
Orig-From: Jan Engelhardt <jengelh@inai.de>
|
|
|
|
Orig-Date: 2015-02-03 00:43:03.433735818 +0100
|
|
|
|
From: Paolo Stivanin <info@paolostivanin.com>
|
|
|
|
Date: 2020-06-17 08:54:21+0000
|
|
|
|
|
|
|
|
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.
|
|
|
|
|
2022-01-22 22:26:41 +01:00
|
|
|
(Also temporarily fixup the version field; cf.
|
|
|
|
https://github.com/beltoforion/muparser/issues/111)
|
|
|
|
|
2022-01-22 22:13:16 +01:00
|
|
|
---
|
2022-01-22 22:26:41 +01:00
|
|
|
CMakeLists.txt | 4 ++--
|
|
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
2022-01-22 22:13:16 +01:00
|
|
|
|
|
|
|
Index: muparser-2.3.3/CMakeLists.txt
|
|
|
|
===================================================================
|
|
|
|
--- muparser-2.3.3.orig/CMakeLists.txt
|
|
|
|
+++ muparser-2.3.3/CMakeLists.txt
|
2022-01-22 22:26:41 +01:00
|
|
|
@@ -13,7 +13,7 @@ project(muParserProject)
|
|
|
|
# Bump versions on release
|
|
|
|
set(MUPARSER_VERSION_MAJOR 2)
|
|
|
|
set(MUPARSER_VERSION_MINOR 3)
|
|
|
|
-set(MUPARSER_VERSION_PATCH 2)
|
|
|
|
+set(MUPARSER_VERSION_PATCH 3)
|
|
|
|
set(MUPARSER_VERSION ${MUPARSER_VERSION_MAJOR}.${MUPARSER_VERSION_MINOR}.${MUPARSER_VERSION_PATCH})
|
|
|
|
|
|
|
|
# Build options
|
2022-01-22 22:13:16 +01:00
|
|
|
@@ -75,7 +75,7 @@ endif()
|
|
|
|
|
2020-06-17 14:54:36 +02:00
|
|
|
set_target_properties(muparser PROPERTIES
|
|
|
|
VERSION ${MUPARSER_VERSION}
|
|
|
|
- SOVERSION ${MUPARSER_VERSION_MAJOR}
|
2022-01-22 22:13:16 +01:00
|
|
|
+ SOVERSION ${MUPARSER_VERSION}
|
2020-06-17 14:54:36 +02:00
|
|
|
)
|
2015-02-03 00:54:01 +01:00
|
|
|
|
2022-01-22 22:13:16 +01:00
|
|
|
if(ENABLE_SAMPLES)
|