commit: 81a494f099f8cbc900bc38808c6115bfd5345127 Author: Horea Christian <chr <AT> chymera <DOT> eu> AuthorDate: Sun Aug 9 04:49:47 2020 +0000 Commit: Horea Christian <horea.christ <AT> gmail <DOT> com> CommitDate: Sun Aug 9 04:49:47 2020 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=81a494f0
sci-biology/fsl: fixed compilation bug as per: https://github.com/gentoo/sci/issues/963 Package-Manager: Portage-3.0.0, Repoman-2.3.23 Signed-off-by: Horea Christian <chr <AT> chymera.eu> sci-biology/fsl/files/fsl-6.0.2-template.patch | 55 ++++++++++++++++++++++++++ sci-biology/fsl/fsl-6.0.2.ebuild | 1 + 2 files changed, 56 insertions(+) diff --git a/sci-biology/fsl/files/fsl-6.0.2-template.patch b/sci-biology/fsl/files/fsl-6.0.2-template.patch new file mode 100644 index 000000000..597241a3b --- /dev/null +++ b/sci-biology/fsl/files/fsl-6.0.2-template.patch @@ -0,0 +1,55 @@ +Subject: as discussed in https://github.com/gentoo/sci/issues/963 + +--- a/src/newimage/generalio.cc 2019-09-11 09:24:32.000000000 -0400 ++++ b/src/newimage/generalio.cc ยง2020-08-07 20:30:20.037494201 -0400 +@@ -308,6 +308,41 @@ + return 0; + } + ++template ++int readGeneralVolume<double>(volume<double>& target, const string& filename, ++ short& dtype, const bool swap2radiological, ++ int64_t x0, int64_t y0, int64_t z0, int64_t t0, int64_t d50, int64_t d60, int64_t d70, ++ int64_t x1, int64_t y1, int64_t z1, int64_t t1, int64_t d51, int64_t d61, int64_t d71, ++ const bool readAs4D); ++ ++template ++int readGeneralVolume<float>(volume<float>& target, const string& filename, ++ short& dtype, const bool swap2radiological, ++ int64_t x0, int64_t y0, int64_t z0, int64_t t0, int64_t d50, int64_t d60, int64_t d70, ++ int64_t x1, int64_t y1, int64_t z1, int64_t t1, int64_t d51, int64_t d61, int64_t d71, ++ const bool readAs4D); ++ ++template ++int readGeneralVolume<short>(volume<short>& target, const string& filename, ++ short& dtype, const bool swap2radiological, ++ int64_t x0, int64_t y0, int64_t z0, int64_t t0, int64_t d50, int64_t d60, int64_t d70, ++ int64_t x1, int64_t y1, int64_t z1, int64_t t1, int64_t d51, int64_t d61, int64_t d71, ++ const bool readAs4D); ++ ++template ++int readGeneralVolume<char>(volume<char>& target, const string& filename, ++ short& dtype, const bool swap2radiological, ++ int64_t x0, int64_t y0, int64_t z0, int64_t t0, int64_t d50, int64_t d60, int64_t d70, ++ int64_t x1, int64_t y1, int64_t z1, int64_t t1, int64_t d51, int64_t d61, int64_t d71, ++ const bool readAs4D); ++ ++template ++int readGeneralVolume<int>(volume<int>& target, const string& filename, ++ short& dtype, const bool swap2radiological, ++ int64_t x0, int64_t y0, int64_t z0, int64_t t0, int64_t d50, int64_t d60, int64_t d70, ++ int64_t x1, int64_t y1, int64_t z1, int64_t t1, int64_t d51, int64_t d61, int64_t d71, ++ const bool readAs4D); ++ + template int read_volumeROI(volume<char>& target, const string& filename, + short& dtype, + int64_t x0, int64_t y0, int64_t z0, int64_t t0, + +--- a/src/fslsurface/fslsurfaceio.cc 2019-09-11 09:23:11.000000000 -0400 ++++ b/src/fslsurface/fslsurfaceio.cc 2020-08-08 04:17:55.917387550 -0400 +@@ -1055,6 +1055,7 @@ + return 0; + } + ++ template int readGIFTI<float, unsigned int>( fslSurface<float, unsigned int> & surf, const string & filename); + template int writeGIFTI<float, unsigned int>( const fslSurface<float, unsigned int> & surf, const std::string & filename, int enc); diff --git a/sci-biology/fsl/fsl-6.0.2.ebuild b/sci-biology/fsl/fsl-6.0.2.ebuild index 07bc454ce..94603ced6 100644 --- a/sci-biology/fsl/fsl-6.0.2.ebuild +++ b/sci-biology/fsl/fsl-6.0.2.ebuild @@ -37,6 +37,7 @@ UPSTREAM_FSLDIR="/usr/share/fsl" PATCHES=( "${FILESDIR}/${PN}"-6.0.2-gcc10_include.patch "${FILESDIR}/${PN}"-6.0.2-setup.patch + "${FILESDIR}/${PN}"-6.0.2-template.patch "${FILESDIR}/${PN}"-6.0.2-no_xmlpp.patch "${FILESDIR}/${PN}"-5.0.11-niftiio_var_fix.patch "${FILESDIR}/${PN}"-5.0.11-ifstream_use.patch
