diff options
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 2 | ||||
| -rw-r--r-- | STLsurfaceFormatASCII_L.patch | 11 | ||||
| -rw-r--r-- | ansysToFoam_L.patch | 11 | ||||
| -rw-r--r-- | decomposePar_options.patch | 9 | ||||
| -rw-r--r-- | fluent3DMeshToFoam_L.patch | 11 | ||||
| -rw-r--r-- | fluentMeshToFoam_L.patch | 11 | ||||
| -rw-r--r-- | gambitToFoam_L.patch | 11 | ||||
| -rw-r--r-- | paraFoam.patch | 49 | ||||
| -rw-r--r-- | readSTLASCII_L.patch | 11 | ||||
| -rw-r--r-- | renumberMesh_options.patch | 10 |
11 files changed, 2 insertions, 136 deletions
@@ -1,7 +1,7 @@ pkgbase = openfoam pkgdesc = The open source CFD toolbox pkgver = 3.0.x - pkgrel = 5 + pkgrel = 6 url = http://www.openfoam.org install = openfoam.install arch = any @@ -8,7 +8,7 @@ pkgname=openfoam _distpkgname=OpenFOAM pkgver=3.0.x -pkgrel=5 +pkgrel=6 pkgdesc="The open source CFD toolbox" arch=("any") url="http://www.openfoam.org" diff --git a/STLsurfaceFormatASCII_L.patch b/STLsurfaceFormatASCII_L.patch deleted file mode 100644 index 33596119afb7..000000000000 --- a/STLsurfaceFormatASCII_L.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/OpenFOAM-3.0.1/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatASCII.L -+++ src/OpenFOAM-3.0.1/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatASCII.L -@@ -50,7 +50,7 @@ - // 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_SUBMINOR_VERSION < 34 && YY_FLEX_MINOR_VERSION < 6 - extern "C" int yywrap() - #else - int yyFlexLexer::yywrap() diff --git a/ansysToFoam_L.patch b/ansysToFoam_L.patch deleted file mode 100644 index d2eb994528ce..000000000000 --- a/ansysToFoam_L.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/OpenFOAM-3.0.1/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L -+++ src/OpenFOAM-3.0.1/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L -@@ -77,7 +77,7 @@ - // 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_SUBMINOR_VERSION < 34 && YY_FLEX_MINOR_VERSION < 6 - extern "C" int yywrap() - #else - int yyFlexLexer::yywrap() diff --git a/decomposePar_options.patch b/decomposePar_options.patch deleted file mode 100644 index 088cfc8e1339..000000000000 --- a/decomposePar_options.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- src/OpenFOAM-3.0.1/applications/utilities/parallelProcessing/decomposePar/Make/options -+++ src/OpenFOAM-3.0.1/applications/utilities/parallelProcessing/decomposePar/Make/options -@@ -13,4 +13,5 @@ EXE_LIBS = \ - -ldecompositionMethods -L$(FOAM_LIBBIN)/dummy -lmetisDecomp -lscotchDecomp \ - -llagrangian \ - -lmeshTools \ -- -lregionModels -+ -lregionModels \ -+ -lbz2 diff --git a/fluent3DMeshToFoam_L.patch b/fluent3DMeshToFoam_L.patch deleted file mode 100644 index d7b7edc5871e..000000000000 --- a/fluent3DMeshToFoam_L.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/OpenFOAM-3.0.1/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L -+++ src/OpenFOAM-3.0.1/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L -@@ -123,7 +123,7 @@ - // 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_SUBMINOR_VERSION < 34 && YY_FLEX_MINOR_VERSION < 6 - extern "C" int yywrap() - #else - int yyFlexLexer::yywrap() diff --git a/fluentMeshToFoam_L.patch b/fluentMeshToFoam_L.patch deleted file mode 100644 index 4b27ce044e1e..000000000000 --- a/fluentMeshToFoam_L.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/OpenFOAM-3.0.1/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L -+++ src/OpenFOAM-3.0.1/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L -@@ -100,7 +100,7 @@ - // 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_SUBMINOR_VERSION < 34 && YY_FLEX_MINOR_VERSION < 6 - extern "C" int yywrap() - #else - int yyFlexLexer::yywrap() diff --git a/gambitToFoam_L.patch b/gambitToFoam_L.patch deleted file mode 100644 index 47a82cf19dd7..000000000000 --- a/gambitToFoam_L.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/OpenFOAM-3.0.1/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L -+++ src/OpenFOAM-3.0.1/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L -@@ -80,7 +80,7 @@ - // 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_SUBMINOR_VERSION < 34 && YY_FLEX_MINOR_VERSION < 6 - extern "C" int yywrap() - #else - int yyFlexLexer::yywrap() diff --git a/paraFoam.patch b/paraFoam.patch deleted file mode 100644 index 9a420e30db8e..000000000000 --- a/paraFoam.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- src/OpenFOAM-3.0.1/bin/paraFoam -+++ src/OpenFOAM-3.0.1/bin/paraFoam -@@ -68,7 +68,7 @@ - export LC_ALL=C - - # Reader extension --extension=OpenFOAM -+extension=foam - - requirePV=1 - -@@ -124,21 +124,22 @@ - # Get the ParaView major version to select the appropriate readers - version=`echo $ParaView_VERSION | sed -e 's/^\([0-9][0-9]*\).*$/\1/'` - --# Check that reader module has been built --if [ $requirePV -eq 1 -a ! -f $PV_PLUGIN_PATH/libPV${version}FoamReader_SM.so ] --then -- cat<< BUILDREADER -- --FATAL ERROR: ParaView reader module libraries do not exist -- --Please build the reader module before continuing: --cd \$FOAM_UTILITIES/postProcessing/graphics/PV${version}Readers --./Allwclean --./Allwmake -- --BUILDREADER -- exit 1 --fi -+# NOTE: For OpenFOAM built from AUR, paraview will already be installed -+# with the required readers. No need to perform this check. -+#if [ $requirePV -eq 1 -a ! -f $PV_PLUGIN_PATH/libPV${version}FoamReader_SM.so ] -+#then -+# cat<< BUILDREADER -+# -+#FATAL ERROR: ParaView reader module libraries do not exist -+# -+#Please build the reader module before continuing: -+#cd \$FOAM_UTILITIES/postProcessing/graphics/PV${version}Readers -+#./Allwclean -+#./Allwmake -+# -+#BUILDREADER -+# exit 1 -+#fi - - # Check for --data=... argument - hasDataArg() diff --git a/readSTLASCII_L.patch b/readSTLASCII_L.patch deleted file mode 100644 index 9092aa004298..000000000000 --- a/readSTLASCII_L.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/OpenFOAM-3.0.1/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L -+++ src/OpenFOAM-3.0.1/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L -@@ -55,7 +55,7 @@ - // 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_SUBMINOR_VERSION < 34 && YY_FLEX_MINOR_VERSION < 6 - extern "C" int yywrap() - #else - int yyFlexLexer::yywrap() diff --git a/renumberMesh_options.patch b/renumberMesh_options.patch deleted file mode 100644 index a3b50b5f63c4..000000000000 --- a/renumberMesh_options.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/OpenFOAM-3.0.1/applications/utilities/mesh/manipulation/renumberMesh/Make/options -+++ src/OpenFOAM-3.0.1/applications/utilities/mesh/manipulation/renumberMesh/Make/options -@@ -15,4 +15,5 @@ EXE_LIBS = \ - -lgenericPatchFields \ - -lrenumberMethods \ - $(LINK_FLAGS) \ -- -ldecompositionMethods -L$(FOAM_LIBBIN)/dummy -lmetisDecomp -lscotchDecomp -+ -ldecompositionMethods -L$(FOAM_LIBBIN)/dummy -lmetisDecomp -lscotchDecomp \ -+ -lbz2 - |