[Git][debian-gis-team/otb][master] 2 commits: Add patch to fix FTBFS with MuParser 2.3.3. (closes: #1009413)

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch master at Debian GIS Project / otb


Commits:
22ad0a45 by Bas Couwenberg at 2022-04-13T07:40:56+02:00
Add patch to fix FTBFS with MuParser 2.3.3. (closes: #1009413)

- - - - -
01643fe5 by Bas Couwenberg at 2022-04-13T07:41:20+02:00
Set distribution to unstable.

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/muparser.patch
- + debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+otb (8.0.0+dfsg-2) unstable; urgency=medium
+
+  * Team upload.
+  * Add patch to fix FTBFS with MuParser 2.3.3.
+    (closes: #1009413)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 13 Apr 2022 07:37:04 +0200
+
 otb (8.0.0+dfsg-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/muparser.patch
=====================================
@@ -0,0 +1,16 @@
+Description: Fix version detection for MuParser 2.3.3 (Release).
+Author: Bas Couwenberg <sebastic at debian.org>
+Bug-Debian: https://bugs.debian.org/1009413
+Forwarded: https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/-/issues/2274
+
+--- a/CMake/FindMuParser.cmake
++++ b/CMake/FindMuParser.cmake
+@@ -47,7 +47,7 @@ if(EXISTS "${MUPARSER_INCLUDE_DIR}/muPar
+     MUPARSER_VERSION_OLD_STYLE "${_muParserDef_h_CONTENTS}")
+ 
+   # Try to find the version for muparser >= 2.3
+-  string(REGEX REPLACE ".*static *const *string_type *ParserVersion *= *string_type\\(_T\\(\"([0-9.]+)\"\\)\\);.*" 
++  string(REGEX REPLACE ".*static *const *string_type *ParserVersion *= *string_type\\(_T\\(\"([0-9.]+)([^0-9.]+)?\"\\)\\);.*" 
+       "\\1" MUPARSER_VERSION "${MUPARSER_VERSION_OLD_STYLE}")
+   
+   if(MUPARSER_VERSION MATCHES "^[0-9]+\$")


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+muparser.patch



View it on GitLab: https://salsa.debian.org/debian-gis-team/otb/-/compare/b616cc267a7094f8924d1590dbfa3ce35adb54c9...01643fe5cfe7f5a5dd21c511b289902f52a4e38c

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/otb/-/compare/b616cc267a7094f8924d1590dbfa3ce35adb54c9...01643fe5cfe7f5a5dd21c511b289902f52a4e38c
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20220413/e60ba7ba/attachment-0001.htm>