[openfoam] 03/03: Refresh patches.
Anton Gladky
gladk at moszumanska.debian.org
Mon Dec 26 17:35:56 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 736abf74d9e1938cfd73d34289ee833caa2866b0
Author: Anton Gladky <gladk at debian.org>
Date: Mon Dec 26 17:57:36 2016 +0100
Refresh patches.
---
debian/patches/10_fix_etc_path.patch | 6 ++--
debian/patches/20_yyflex-fix.patch | 42 +++++++++++++++++---------
debian/patches/30_hardening.patch | 12 ++++----
debian/patches/40_build-parallel.patch | 16 +++++-----
debian/patches/50_fix_folder_name_FTBFS.patch | 14 ++++-----
debian/patches/60_disable_dummy_packages.patch | 14 ++++-----
6 files changed, 59 insertions(+), 45 deletions(-)
diff --git a/debian/patches/10_fix_etc_path.patch b/debian/patches/10_fix_etc_path.patch
index 9dd7ebc..0d82c53 100644
--- a/debian/patches/10_fix_etc_path.patch
+++ b/debian/patches/10_fix_etc_path.patch
@@ -24,10 +24,10 @@ 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>
-Index: openfoam-4.0+dfsg1/src/OpenFOAM/global/etcFiles/etcFiles.C
+Index: OpenFOAM-4.x-version-4.1/src/OpenFOAM/global/etcFiles/etcFiles.C
===================================================================
---- openfoam-4.0+dfsg1.orig/src/OpenFOAM/global/etcFiles/etcFiles.C
-+++ openfoam-4.0+dfsg1/src/OpenFOAM/global/etcFiles/etcFiles.C
+--- OpenFOAM-4.x-version-4.1.orig/src/OpenFOAM/global/etcFiles/etcFiles.C
++++ OpenFOAM-4.x-version-4.1/src/OpenFOAM/global/etcFiles/etcFiles.C
@@ -57,7 +57,7 @@ Foam::fileNameList Foam::findEtcDirs(con
// * $WM_PROJECT_SITE/VERSION
// * $WM_PROJECT_SITE
diff --git a/debian/patches/20_yyflex-fix.patch b/debian/patches/20_yyflex-fix.patch
index 1233100..e115992 100644
--- a/debian/patches/20_yyflex-fix.patch
+++ b/debian/patches/20_yyflex-fix.patch
@@ -2,8 +2,10 @@ Description: Fix linkage with yyflex
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2016-09-17
---- openfoam-4.0.orig/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
-+++ openfoam-4.0/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
+Index: OpenFOAM-4.x-version-4.1/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
+===================================================================
+--- OpenFOAM-4.x-version-4.1.orig/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
++++ OpenFOAM-4.x-version-4.1/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.
@@ -16,8 +18,10 @@ Last-Update: 2016-09-17
{
return 1;
}
---- openfoam-4.0.orig/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
-+++ openfoam-4.0/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
+Index: OpenFOAM-4.x-version-4.1/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
+===================================================================
+--- OpenFOAM-4.x-version-4.1.orig/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
++++ OpenFOAM-4.x-version-4.1/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.
@@ -30,8 +34,10 @@ Last-Update: 2016-09-17
{
return 1;
}
---- openfoam-4.0.orig/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
-+++ openfoam-4.0/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
+Index: OpenFOAM-4.x-version-4.1/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
+===================================================================
+--- OpenFOAM-4.x-version-4.1.orig/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
++++ OpenFOAM-4.x-version-4.1/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.
@@ -44,8 +50,10 @@ Last-Update: 2016-09-17
{
return 1;
}
---- openfoam-4.0.orig/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
-+++ openfoam-4.0/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
+Index: OpenFOAM-4.x-version-4.1/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
+===================================================================
+--- OpenFOAM-4.x-version-4.1.orig/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
++++ OpenFOAM-4.x-version-4.1/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.
@@ -58,8 +66,10 @@ Last-Update: 2016-09-17
{
return 1;
}
---- openfoam-4.0.orig/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatASCII.L
-+++ openfoam-4.0/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatASCII.L
+Index: OpenFOAM-4.x-version-4.1/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatASCII.L
+===================================================================
+--- OpenFOAM-4.x-version-4.1.orig/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatASCII.L
++++ OpenFOAM-4.x-version-4.1/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>>
@@ -72,8 +82,10 @@ Last-Update: 2016-09-17
{
return 1;
}
---- openfoam-4.0.orig/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
-+++ openfoam-4.0/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
+Index: OpenFOAM-4.x-version-4.1/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
+===================================================================
+--- OpenFOAM-4.x-version-4.1.orig/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
++++ OpenFOAM-4.x-version-4.1/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>>
@@ -86,8 +98,10 @@ Last-Update: 2016-09-17
{
return 1;
}
---- openfoam-4.0.orig/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L
-+++ openfoam-4.0/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L
+Index: OpenFOAM-4.x-version-4.1/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L
+===================================================================
+--- OpenFOAM-4.x-version-4.1.orig/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L
++++ OpenFOAM-4.x-version-4.1/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>>
diff --git a/debian/patches/30_hardening.patch b/debian/patches/30_hardening.patch
index 12dbb65..a016dff 100644
--- a/debian/patches/30_hardening.patch
+++ b/debian/patches/30_hardening.patch
@@ -2,10 +2,10 @@ Description: Use hardening flags
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2016-09-28
-Index: openfoam/wmake/rules/linux64Gcc/c
+Index: OpenFOAM-4.x-version-4.1/wmake/rules/linux64Gcc/c
===================================================================
---- openfoam.orig/wmake/rules/linux64Gcc/c
-+++ openfoam/wmake/rules/linux64Gcc/c
+--- OpenFOAM-4.x-version-4.1.orig/wmake/rules/linux64Gcc/c
++++ OpenFOAM-4.x-version-4.1/wmake/rules/linux64Gcc/c
@@ -1,8 +1,8 @@
SUFFIXES += .c
@@ -17,10 +17,10 @@ Index: openfoam/wmake/rules/linux64Gcc/c
include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
-Index: openfoam/wmake/rules/linux64Gcc/c++
+Index: OpenFOAM-4.x-version-4.1/wmake/rules/linux64Gcc/c++
===================================================================
---- openfoam.orig/wmake/rules/linux64Gcc/c++
-+++ openfoam/wmake/rules/linux64Gcc/c++
+--- OpenFOAM-4.x-version-4.1.orig/wmake/rules/linux64Gcc/c++
++++ OpenFOAM-4.x-version-4.1/wmake/rules/linux64Gcc/c++
@@ -1,11 +1,11 @@
SUFFIXES += .C
diff --git a/debian/patches/40_build-parallel.patch b/debian/patches/40_build-parallel.patch
index 969f508..37702fb 100644
--- a/debian/patches/40_build-parallel.patch
+++ b/debian/patches/40_build-parallel.patch
@@ -2,11 +2,11 @@ Description: Build parallelly
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2016-09-28
-Index: openfoam/wmake/scripts/AllwmakeParseArguments
+Index: OpenFOAM-4.x-version-4.1/wmake/scripts/AllwmakeParseArguments
===================================================================
---- openfoam.orig/wmake/scripts/AllwmakeParseArguments
-+++ openfoam/wmake/scripts/AllwmakeParseArguments
-@@ -80,13 +80,6 @@ USAGE_LIB
+--- OpenFOAM-4.x-version-4.1.orig/wmake/scripts/AllwmakeParseArguments
++++ OpenFOAM-4.x-version-4.1/wmake/scripts/AllwmakeParseArguments
+@@ -82,13 +82,6 @@ USAGE_LIB
setWM_NCOMPPROCS()
{
@@ -20,11 +20,11 @@ Index: openfoam/wmake/scripts/AllwmakeParseArguments
export WM_NCOMPPROCS
}
-Index: openfoam/wmake/wmake
+Index: OpenFOAM-4.x-version-4.1/wmake/wmake
===================================================================
---- openfoam.orig/wmake/wmake
-+++ openfoam/wmake/wmake
-@@ -162,19 +162,7 @@ fi
+--- OpenFOAM-4.x-version-4.1.orig/wmake/wmake
++++ OpenFOAM-4.x-version-4.1/wmake/wmake
+@@ -161,19 +161,7 @@ fi
if [ "$WM_NCOMPPROCS" ]
then
diff --git a/debian/patches/50_fix_folder_name_FTBFS.patch b/debian/patches/50_fix_folder_name_FTBFS.patch
index 7b3888e..6052342 100644
--- a/debian/patches/50_fix_folder_name_FTBFS.patch
+++ b/debian/patches/50_fix_folder_name_FTBFS.patch
@@ -10,10 +10,10 @@ Description: fixes FTBFS due to case-sensitive folder name.
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2016-10-09
-Index: openfoam/bin/foamEtcFile
+Index: OpenFOAM-4.x-version-4.1/bin/foamEtcFile
===================================================================
---- openfoam.orig/bin/foamEtcFile
-+++ openfoam/bin/foamEtcFile
+--- OpenFOAM-4.x-version-4.1.orig/bin/foamEtcFile
++++ OpenFOAM-4.x-version-4.1/bin/foamEtcFile
@@ -99,8 +99,8 @@ unset versionNum
# handle standard and debian naming convention
#
@@ -25,11 +25,11 @@ Index: openfoam/bin/foamEtcFile
;;
openfoam[0-9]* | openfoamdev) # debian naming convention 'openfoam<VERSION>'
-Index: openfoam/src/parallel/decompose/Allwmake
+Index: OpenFOAM-4.x-version-4.1/src/parallel/decompose/Allwmake
===================================================================
---- openfoam.orig/src/parallel/decompose/Allwmake
-+++ openfoam/src/parallel/decompose/Allwmake
-@@ -5,15 +5,8 @@ cd ${0%/*} || exit 1 # Run from this
+--- OpenFOAM-4.x-version-4.1.orig/src/parallel/decompose/Allwmake
++++ OpenFOAM-4.x-version-4.1/src/parallel/decompose/Allwmake
+@@ -6,15 +6,8 @@ targetType=libso
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
# get SCOTCH_VERSION, SCOTCH_ARCH_PATH
diff --git a/debian/patches/60_disable_dummy_packages.patch b/debian/patches/60_disable_dummy_packages.patch
index 19a1d24..fc0ad5f 100644
--- a/debian/patches/60_disable_dummy_packages.patch
+++ b/debian/patches/60_disable_dummy_packages.patch
@@ -2,10 +2,10 @@ Description: Disable dummy scotch package
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2016-11-17
-Index: openfoam-4.0+dfsg1/src/parallel/decompose/scotchDecomp/Make/options
+Index: OpenFOAM-4.x-version-4.1/src/parallel/decompose/scotchDecomp/Make/options
===================================================================
---- openfoam-4.0+dfsg1.orig/src/parallel/decompose/scotchDecomp/Make/options
-+++ openfoam-4.0+dfsg1/src/parallel/decompose/scotchDecomp/Make/options
+--- OpenFOAM-4.x-version-4.1.orig/src/parallel/decompose/scotchDecomp/Make/options
++++ OpenFOAM-4.x-version-4.1/src/parallel/decompose/scotchDecomp/Make/options
@@ -7,10 +7,8 @@ sinclude $(RULES)/mplib$(WM_MPLIB)
EXE_INC = \
@@ -18,11 +18,11 @@ Index: openfoam-4.0+dfsg1/src/parallel/decompose/scotchDecomp/Make/options
LIB_LIBS = \
- -L$(SCOTCH_ROOT)/lib -L$(FOAM_EXT_LIBBIN) -lscotch -lscotcherrexit -lrt
+ -L$(FOAM_EXT_LIBBIN) -lscotch -lscotcherrexit -lrt
-Index: openfoam-4.0+dfsg1/src/dummyThirdParty/Allwmake
+Index: OpenFOAM-4.x-version-4.1/src/dummyThirdParty/Allwmake
===================================================================
---- openfoam-4.0+dfsg1.orig/src/dummyThirdParty/Allwmake
-+++ openfoam-4.0+dfsg1/src/dummyThirdParty/Allwmake
-@@ -5,7 +5,6 @@ cd ${0%/*} || exit 1 # Run from this
+--- OpenFOAM-4.x-version-4.1.orig/src/dummyThirdParty/Allwmake
++++ OpenFOAM-4.x-version-4.1/src/dummyThirdParty/Allwmake
+@@ -6,7 +6,6 @@ targetType=libso
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
set -x
--
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