[ovito] 03/05: Use packaged muparser instead of embedded version.

[Anton Gladky]

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository ovito.

commit 6190d35563ec1455b886acb7cf1bc1b017781baa
Author: Anton Gladky <gladk at debian.org>
Date:   Mon Apr 7 21:00:13 2014 +0200

     Use packaged muparser instead of embedded version.
---
 debian/patches/30_use_system_muparser.patch | 44 +++++++++++++++++++++++++++++
 debian/patches/series                       |  1 +
 2 files changed, 45 insertions(+)

diff --git a/debian/patches/30_use_system_muparser.patch b/debian/patches/30_use_system_muparser.patch
new file mode 100644
index 0000000..ca3f762
--- /dev/null
+++ b/debian/patches/30_use_system_muparser.patch
@@ -0,0 +1,44 @@
+Description: Use system muparser instead of embedded
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2014-04-07
+
+--- a/src/plugins/particles/modifier/properties/CreateExpressionPropertyModifier.cpp
++++ b/src/plugins/particles/modifier/properties/CreateExpressionPropertyModifier.cpp
+@@ -23,7 +23,7 @@
+ #include <core/gui/widgets/general/AutocompleteLineEdit.h>
+ #include <core/animation/AnimationSettings.h>
+ #include <core/scene/pipeline/PipelineObject.h>
+-#include <3rdparty/muparser/muParser.h>
++#include <muParser.h>
+ #include "CreateExpressionPropertyModifier.h"
+ 
+ #include <QtConcurrent>
+--- a/src/plugins/particles/modifier/selection/SelectExpressionModifier.cpp
++++ b/src/plugins/particles/modifier/selection/SelectExpressionModifier.cpp
+@@ -25,7 +25,7 @@
+ #include <core/scene/ObjectNode.h>
+ #include <core/scene/pipeline/PipelineObject.h>
+ #include <core/gui/properties/StringParameterUI.h>
+-#include <3rdparty/muparser/muParser.h>
++#include <muParser.h>
+ #include "SelectExpressionModifier.h"
+ 
+ #include <QtConcurrent>
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -172,13 +172,13 @@
+ 
+ # Build library
+ ADD_LIBRARY(Core ${OVITO_CORE_SOURCE_FILES} ${OVITO_CORE_RESOURCE_FILES})
+-TARGET_LINK_LIBRARIES(Core Base QSsh)
++TARGET_LINK_LIBRARIES(Core Base QSsh -lmuparser)
+ IF(OVITO_VIDEO_OUTPUT_SUPPORT)
+ 	TARGET_LINK_LIBRARIES(Core Video)
+ ENDIF()
+ 
+ # Link to OpenGL library.
+-TARGET_LINK_LIBRARIES(Core ${OPENGL_gl_LIBRARY})
++TARGET_LINK_LIBRARIES(Core ${OPENGL_gl_LIBRARY} -lmuparser)
+ 
+ # Link Qt5.
+ QT5_USE_MODULES(Core ${OVITO_REQUIRED_QT_MODULES})
diff --git a/debian/patches/series b/debian/patches/series
index 3a464ab..4217686 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 10_add_c+11.patch
 20_disable_cpu_botan.patch
+30_use_system_muparser.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ovito.git