Control: tags 897826 + patch
Control: tags 897826 + pending
Control: tags 897826 + ftbfs
Dear maintainer,
I've prepared an NMU for openfoam (versioned as 4.1+dfsg1-2.1) and
uploaded it to DELAYED/14. Please feel free to tell me if I should
cancel it.
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
diff -Nru openfoam-4.1+dfsg1/debian/changelog openfoam-4.1+dfsg1/debian/changelog
--- openfoam-4.1+dfsg1/debian/changelog 2018-04-12 22:04:55.000000000 +0300
+++ openfoam-4.1+dfsg1/debian/changelog 2018-08-03 23:38:10.000000000 +0300
@@ -1,3 +1,11 @@
+openfoam (4.1+dfsg1-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Add upstream fix for FTBFS with gcc 8,
+ thanks to Juhani Numminen. (Closes: #897826)
+
+ -- Adrian Bunk <[email protected]> Fri, 03 Aug 2018 23:38:10 +0300
+
openfoam (4.1+dfsg1-2) unstable; urgency=medium
[ Anton Gladky ]
diff -Nru openfoam-4.1+dfsg1/debian/patches/80_gcc8.patch openfoam-4.1+dfsg1/debian/patches/80_gcc8.patch
--- openfoam-4.1+dfsg1/debian/patches/80_gcc8.patch 1970-01-01 02:00:00.000000000 +0200
+++ openfoam-4.1+dfsg1/debian/patches/80_gcc8.patch 2018-08-03 22:10:01.000000000 +0300
@@ -0,0 +1,188 @@
+From 3682e7ad9de75bca8d8d38f5fd80f406a23d3004 Mon Sep 17 00:00:00 2001
+From: Henry Weller <http://openfoam.org>
+Date: Tue, 8 May 2018 19:57:47 +0100
+Subject: Added support for gcc-8.1
+
+diff --git a/etc/config.csh/settings b/etc/config.csh/settings
+index d550d969b..c618f9f21 100644
+--- a/etc/config.csh/settings
++++ b/etc/config.csh/settings
+@@ -240,6 +240,9 @@ case ThirdParty:
+ case Gcc61:
+ set gcc_version=gcc-6.1.0
+ breaksw
++ case Gcc81:
++ set gcc_version=gcc-8.1.0
++ breaksw
+ case Clang:
+ # Using clang - not gcc
+ setenv WM_CC 'clang'
+diff --git a/etc/config.sh/compiler b/etc/config.sh/compiler
+index 9042a5f17..dac2c1e33 100644
+--- a/etc/config.sh/compiler
++++ b/etc/config.sh/compiler
+@@ -2,7 +2,7 @@
+ # ========= |
+ # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ # \\ / O peration |
+-# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
++# \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
+ # \\/ M anipulation |
+ #------------------------------------------------------------------------------
+ # License
+@@ -57,6 +57,9 @@ OpenFOAM | ThirdParty)
+ Gcc61)
+ gcc_version=gcc-6.1.0
+ ;;
++ Gcc81)
++ gcc_version=gcc-8.1.0
++ ;;
+ Clang)
+ # Using clang - not gcc
+ export WM_CC='clang'
+diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H b/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
+index e859d043d..4df923d61 100644
+--- a/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
++++ b/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
+@@ -546,8 +546,6 @@ inline void Foam::PackedList<nBits>::const_iterator::operator=
+ {
+ this->index_ = this->list_->size_;
+ }
+-
+- return *this;
+ }
+
+
+diff --git a/src/OpenFOAM/db/typeInfo/typeInfo.H b/src/OpenFOAM/db/typeInfo/typeInfo.H
+index 71155aeb8..542a27bea 100644
+--- a/src/OpenFOAM/db/typeInfo/typeInfo.H
++++ b/src/OpenFOAM/db/typeInfo/typeInfo.H
+@@ -2,7 +2,7 @@
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+- \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
++ \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
+ \\/ M anipulation |
+ -------------------------------------------------------------------------------
+ License
+@@ -88,7 +88,7 @@ inline To& dynamicCast(From& r)
+ {
+ return dynamic_cast<To&>(r);
+ }
+- catch (std::bad_cast)
++ catch (const std::bad_cast&)
+ {
+ FatalErrorInFunction
+ << "Attempt to cast type " << typeid(r).name()
+@@ -109,7 +109,7 @@ inline To& refCast(From& r)
+ {
+ return dynamic_cast<To&>(r);
+ }
+- catch (std::bad_cast)
++ catch (const std::bad_cast&)
+ {
+ FatalErrorInFunction
+ << "Attempt to cast type " << r.type()
+diff --git a/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H b/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H
+index 940294b8e..be204399f 100644
+--- a/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H
++++ b/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H
+@@ -2,7 +2,7 @@
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+- \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
++ \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
+ \\/ M anipulation |
+ -------------------------------------------------------------------------------
+ License
+@@ -159,9 +159,6 @@ public:
+ //- Construct from Istream
+ VectorSpace(Istream&);
+
+- //- Construct as copy
+- inline VectorSpace(const VectorSpace<Form, Cmpt, Ncmpts>&);
+-
+ //- Construct as copy of a VectorSpace with the same size
+ template<class Form2, class Cmpt2>
+ inline explicit VectorSpace(const VectorSpace<Form2, Cmpt2, Ncmpts>&);
+@@ -190,7 +187,6 @@ public:
+ inline const Cmpt& operator[](const direction) const;
+ inline Cmpt& operator[](const direction);
+
+- inline void operator=(const VectorSpace<Form, Cmpt, Ncmpts>&);
+ inline void operator+=(const VectorSpace<Form, Cmpt, Ncmpts>&);
+ inline void operator-=(const VectorSpace<Form, Cmpt, Ncmpts>&);
+
+diff --git a/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H b/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H
+index dce64d425..afd654cd3 100644
+--- a/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H
++++ b/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H
+@@ -49,16 +49,6 @@ inline VectorSpace<Form, Cmpt, Ncmpts>::VectorSpace(const Foam::zero)
+
+
+ template<class Form, class Cmpt, direction Ncmpts>
+-inline VectorSpace<Form, Cmpt, Ncmpts>::VectorSpace
+-(
+- const VectorSpace<Form, Cmpt, Ncmpts>& vs
+-)
+-{
+- VectorSpaceOps<Ncmpts,0>::eqOp(*this, vs, eqOp<Cmpt>());
+-}
+-
+-
+-template<class Form, class Cmpt, direction Ncmpts>
+ template<class Form2, class Cmpt2>
+ inline VectorSpace<Form, Cmpt, Ncmpts>::VectorSpace
+ (
+@@ -286,16 +276,6 @@ ConstBlock<SubVector, BStart>::operator()
+
+
+ template<class Form, class Cmpt, direction Ncmpts>
+-inline void VectorSpace<Form, Cmpt, Ncmpts>::operator=
+-(
+- const VectorSpace<Form, Cmpt, Ncmpts>& vs
+-)
+-{
+- VectorSpaceOps<Ncmpts,0>::eqOp(*this, vs, eqOp<Cmpt>());
+-}
+-
+-
+-template<class Form, class Cmpt, direction Ncmpts>
+ inline void VectorSpace<Form, Cmpt, Ncmpts>::operator+=
+ (
+ const VectorSpace<Form, Cmpt, Ncmpts>& vs
+diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H
+index d96134aac..13f6d9a53 100644
+--- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H
++++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H
+@@ -242,7 +242,6 @@ public:
+
+ // Access
+
+- inline word& name();
+ inline const word& name() const;
+
+ // - Access to basic components of the reaction
+diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/ReactionI.H b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/ReactionI.H
+index 55287cbfd..eba046f64 100644
+--- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/ReactionI.H
++++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/ReactionI.H
+@@ -33,13 +33,6 @@ namespace Foam
+ // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+ template<class ReactionThermo>
+-inline word& Reaction<ReactionThermo>::name()
+-{
+- return name_;
+-}
+-
+-
+-template<class ReactionThermo>
+ inline const word& Reaction<ReactionThermo>::name() const
+ {
+ return name_;
+--
+2.11.0
+
diff -Nru openfoam-4.1+dfsg1/debian/patches/series openfoam-4.1+dfsg1/debian/patches/series
--- openfoam-4.1+dfsg1/debian/patches/series 2018-04-11 22:21:39.000000000 +0300
+++ openfoam-4.1+dfsg1/debian/patches/series 2018-08-03 23:38:10.000000000 +0300
@@ -5,3 +5,4 @@
50_fix_folder_name_FTBFS.patch
60_disable_dummy_packages.patch
70_remove_IRIX_includes.patch
+80_gcc8.patch
