[openfoam] 01/03: Update to a newer version.
Anton Gladky
gladk at moszumanska.debian.org
Sun Sep 18 17:49:10 UTC 2016
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository openfoam.
commit 4292c419dd95c33aad33d0a7e4db5f9be7be2669
Author: Anton Gladky <gladk at debian.org>
Date: Sun Sep 18 19:47:26 2016 +0200
Update to a newer version.
---
debian/changelog | 2 +-
debian/patches/10_fix_etc_path.patch | 18 +++++++------
debian/patches/20_yyflex-fix.patch | 49 ++++++++++++++++++------------------
3 files changed, 35 insertions(+), 34 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7dcae9b..be3aec2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-openfoam (3.0.0-1) unstable; urgency=low
+openfoam (4.0-1) unstable; urgency=low
* Initial Release. Closes: #528662
diff --git a/debian/patches/10_fix_etc_path.patch b/debian/patches/10_fix_etc_path.patch
index 13eafe0..7125024 100644
--- a/debian/patches/10_fix_etc_path.patch
+++ b/debian/patches/10_fix_etc_path.patch
@@ -24,14 +24,16 @@ Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
---- openfoam-3.0.0.orig/src/OSspecific/POSIX/POSIX.C
-+++ openfoam-3.0.0/src/OSspecific/POSIX/POSIX.C
-@@ -369,7 +369,7 @@ Foam::fileNameList Foam::findEtcFiles
- // Search for other (shipped) files in
- // * $WM_PROJECT_DIR/etc
+Index: OpenFOAM-dev-version-4.0/src/OpenFOAM/global/etcFiles/etcFiles.C
+===================================================================
+--- OpenFOAM-dev-version-4.0.orig/src/OpenFOAM/global/etcFiles/etcFiles.C
++++ OpenFOAM-dev-version-4.0/src/OpenFOAM/global/etcFiles/etcFiles.C
+@@ -57,7 +57,7 @@ Foam::fileNameList Foam::findEtcDirs(con
+ // * $WM_PROJECT_SITE/VERSION
+ // * $WM_PROJECT_SITE
//
-- searchDir = getEnv("WM_PROJECT_DIR");
+- searchDir = getEnv("WM_PROJECT_SITE");
+ searchDir = "/usr/share/openfoam/";
- if (isDir(searchDir))
+ if (searchDir.size())
{
- fileName fullName = searchDir/"etc"/name;
+ if (isDir(searchDir))
diff --git a/debian/patches/20_yyflex-fix.patch b/debian/patches/20_yyflex-fix.patch
index 1e22eda..1233100 100644
--- a/debian/patches/20_yyflex-fix.patch
+++ b/debian/patches/20_yyflex-fix.patch
@@ -1,14 +1,14 @@
Description: Fix linkage with yyflex
Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2016-05-03
+Last-Update: 2016-09-17
---- openfoam-3.0.1.orig/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
-+++ openfoam-3.0.1/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
+--- openfoam-4.0.orig/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
++++ openfoam-4.0/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
@@ -77,11 +77,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()
@@ -16,13 +16,13 @@ Last-Update: 2016-05-03
{
return 1;
}
---- openfoam-3.0.1.orig/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
-+++ openfoam-3.0.1/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
+--- openfoam-4.0.orig/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
++++ openfoam-4.0/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
@@ -123,11 +123,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()
@@ -30,14 +30,13 @@ Last-Update: 2016-05-03
{
return 1;
}
---- openfoam-3.0.1.orig/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
-+++ openfoam-3.0.1/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
-@@ -99,12 +99,7 @@ wordList patchNameIDs(maxZoneID);
-
+--- openfoam-4.0.orig/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
++++ openfoam-4.0/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
+@@ -100,11 +100,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
+ // See <<EOF>>
+-#if YY_FLEX_MINOR_VERSION < 6 && YY_FLEX_SUBMINOR_VERSION < 34
-extern "C" int yywrap()
-#else
int yyFlexLexer::yywrap()
@@ -45,13 +44,13 @@ Last-Update: 2016-05-03
{
return 1;
}
---- openfoam-3.0.1.orig/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
-+++ openfoam-3.0.1/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
+--- openfoam-4.0.orig/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
++++ openfoam-4.0/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
@@ -80,11 +80,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()
@@ -59,13 +58,13 @@ Last-Update: 2016-05-03
{
return 1;
}
---- openfoam-3.0.1.orig/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatASCII.L
-+++ openfoam-3.0.1/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatASCII.L
+--- openfoam-4.0.orig/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatASCII.L
++++ openfoam-4.0/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatASCII.L
@@ -50,11 +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()
@@ -73,13 +72,13 @@ Last-Update: 2016-05-03
{
return 1;
}
---- openfoam-3.0.1.orig/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
-+++ openfoam-3.0.1/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
+--- openfoam-4.0.orig/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
++++ openfoam-4.0/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
@@ -54,11 +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()
@@ -87,13 +86,13 @@ Last-Update: 2016-05-03
{
return 1;
}
---- openfoam-3.0.1.orig/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L
-+++ openfoam-3.0.1/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L
+--- openfoam-4.0.orig/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L
++++ openfoam-4.0/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L
@@ -55,11 +55,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()
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/openfoam.git
More information about the debian-science-commits
mailing list