[freefoam] 01/06: Fix compilation due to flex version. (Closes: #831247)

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository freefoam.

commit 711560c74638afbb577a9c6e7fbdd4baa5b89ccb
Author: Santiago Vila <sanvila at unex.es>
Date:   Tue Aug 30 15:20:16 2016 +0200

    Fix compilation due to flex version. (Closes: #831247)
---
 debian/patches/fix_flex.patch | 96 +++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series         |  2 +-
 2 files changed, 97 insertions(+), 1 deletion(-)

diff --git a/debian/patches/fix_flex.patch b/debian/patches/fix_flex.patch
new file mode 100644
index 0000000..5bd142b
--- /dev/null
+++ b/debian/patches/fix_flex.patch
@@ -0,0 +1,96 @@
+Description: Fix compilation due to flex version
+Author: Santiago Vila <sanvila at unex.es>
+Reviewed-By: Anton Gladky <gladk at debian.org>
+Last-Update: 2016-08-30
+
+Index: freefoam/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
+===================================================================
+--- freefoam.orig/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
++++ freefoam/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
+@@ -95,7 +95,7 @@ label currentTypei = -1;
+ // Dummy yywrap to keep yylex happy at compile time.
+ // It is called by yylex but is not used as the mechanism to change file.
+ // See <<EOF>>
+-#if YY_FLEX_SUBMINOR_VERSION < 34
++#if YY_FLEX_MINOR_VERSION < 6 && YY_FLEX_SUBMINOR_VERSION < 34
+ extern "C" int yywrap()
+ #else
+ int yyFlexLexer::yywrap()
+Index: freefoam/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
+===================================================================
+--- freefoam.orig/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
++++ freefoam/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
+@@ -147,7 +147,7 @@ void uniquify(word& name, HashSet<word>&
+ // Dummy yywrap to keep yylex happy at compile time.
+ // It is called by yylex but is not used as the mechanism to change file.
+ // See <<EOF>>
+-#if YY_FLEX_SUBMINOR_VERSION < 34
++#if YY_FLEX_MINOR_VERSION < 6 && YY_FLEX_SUBMINOR_VERSION < 34
+ extern "C" int yywrap()
+ #else
+ int yyFlexLexer::yywrap()
+Index: freefoam/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
+===================================================================
+--- freefoam.orig/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
++++ freefoam/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
+@@ -126,7 +126,7 @@ wordList patchNameIDs(maxZoneID);
+ // Dummy yywrap to keep yylex happy at compile time.
+ // It is called by yylex but is not used as the mechanism to change file.
+ // See <<EOF>>
+-#if YY_FLEX_SUBMINOR_VERSION < 34
++#if YY_FLEX_MINOR_VERSION < 6 && YY_FLEX_SUBMINOR_VERSION < 34
+ extern "C" int yywrap()
+ #else
+ int yyFlexLexer::yywrap()
+Index: freefoam/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
+===================================================================
+--- freefoam.orig/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
++++ freefoam/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
+@@ -99,7 +99,7 @@ label nValuesForPatchFaces = 0;
+ // Dummy yywrap to keep yylex happy at compile time.
+ // It is called by yylex but is not used as the mechanism to change file.
+ // See <<EOF>>
+-#if YY_FLEX_SUBMINOR_VERSION < 34
++#if YY_FLEX_MINOR_VERSION < 6 && YY_FLEX_SUBMINOR_VERSION < 34
+ extern "C" int yywrap()
+ #else
+ int yyFlexLexer::yywrap()
+Index: freefoam/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatASCII.L
+===================================================================
+--- freefoam.orig/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatASCII.L
++++ freefoam/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatASCII.L
+@@ -50,7 +50,7 @@ int yyFlexLexer::yylex()
+ // It is called by yylex but is not used as the mechanism to change file.
+ // See <<EOF>>
+ //! @cond dummy
+-#if YY_FLEX_SUBMINOR_VERSION < 34
++#if YY_FLEX_MINOR_VERSION < 6 && YY_FLEX_SUBMINOR_VERSION < 34
+ extern "C" int yywrap()
+ #else
+ int yyFlexLexer::yywrap()
+Index: freefoam/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
+===================================================================
+--- freefoam.orig/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
++++ freefoam/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
+@@ -54,7 +54,7 @@ int yyFlexLexer::yylex()
+ // It is called by yylex but is not used as the mechanism to change file.
+ // See <<EOF>>
+ //! @cond dummy
+-#if YY_FLEX_SUBMINOR_VERSION < 34
++#if YY_FLEX_MINOR_VERSION < 6 && YY_FLEX_SUBMINOR_VERSION < 34
+ extern "C" int yywrap()
+ #else
+ int yyFlexLexer::yywrap()
+Index: freefoam/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L
+===================================================================
+--- freefoam.orig/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L
++++ freefoam/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L
+@@ -53,7 +53,7 @@ int yyFlexLexer::yylex()
+ // It is called by yylex but is not used as the mechanism to change file.
+ // See <<EOF>>
+ //! @cond dummy
+-#if YY_FLEX_SUBMINOR_VERSION < 34
++#if YY_FLEX_MINOR_VERSION < 6 && YY_FLEX_SUBMINOR_VERSION < 34
+ extern "C" int yywrap()
+ #else
+ int yyFlexLexer::yywrap()
diff --git a/debian/patches/series b/debian/patches/series
index 2b841c7..6118d77 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,4 +12,4 @@ update-doxygen-foamheader.diff
 mips.diff
 fix_python_header.patch
 fix_cmake_failure.patch
-ppc64el.patch
+fix_flex.patch

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