Author: gert-guest Date: 2016-07-06 11:57:08 +0000 (Wed, 06 Jul 2016) New Revision: 22403
Added: trunk/packages/elastix/trunk/debian/patches/fix-compilation-with-std-c++11.patch Modified: trunk/packages/elastix/trunk/debian/changelog trunk/packages/elastix/trunk/debian/control trunk/packages/elastix/trunk/debian/patches/series trunk/packages/elastix/trunk/debian/rules Log: Enable hardening and correct VXS browse url Modified: trunk/packages/elastix/trunk/debian/changelog =================================================================== --- trunk/packages/elastix/trunk/debian/changelog 2016-07-06 10:36:13 UTC (rev 22402) +++ trunk/packages/elastix/trunk/debian/changelog 2016-07-06 11:57:08 UTC (rev 22403) @@ -1,3 +1,12 @@ +elastix (4.8-9) UNRELEASED; urgency=medium + + * d/p/fix-compi..: fic compilation with -std=c++11, + * d/rules: removed forced std=c++03, Closes: #822779 + * d/rules: hardening += all + * d/control: use secure VCS browse url + + -- Gert Wollny <[email protected]> Wed, 06 Jul 2016 10:56:32 +0000 + elastix (4.8-8) unstable; urgency=medium * d/rules: force -std=c++03 to alleviate build failure with g++-6.0 Modified: trunk/packages/elastix/trunk/debian/control =================================================================== --- trunk/packages/elastix/trunk/debian/control 2016-07-06 10:36:13 UTC (rev 22402) +++ trunk/packages/elastix/trunk/debian/control 2016-07-06 11:57:08 UTC (rev 22403) @@ -23,7 +23,7 @@ ghostscript, latex-xcolor Standards-Version: 3.9.8 -Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/elastix/trunk/ +Vcs-Browser: https://anonscm.debian.org/viewvc/debian-med/trunk/packages/elastix/trunk/ Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/elastix/trunk/ Homepage: http://elastix.isi.uu.nl/ Added: trunk/packages/elastix/trunk/debian/patches/fix-compilation-with-std-c++11.patch =================================================================== --- trunk/packages/elastix/trunk/debian/patches/fix-compilation-with-std-c++11.patch (rev 0) +++ trunk/packages/elastix/trunk/debian/patches/fix-compilation-with-std-c++11.patch 2016-07-06 11:57:08 UTC (rev 22403) @@ -0,0 +1,64 @@ +From d289960c99bbee861449c6cffc710b6065fb78a5 Mon Sep 17 00:00:00 2001 +From: mstaring <mstaring@4d348492-3962-11de-aa85-65a2020054a3> +Date: Wed, 6 Jul 2016 10:13:39 +0000 +Subject: [PATCH] COMP: override was used, but base class did not define it. + +When using itkTypeMacro in all elx classes. + +git-svn-id: https://svn.bigr.nl/elastix/trunkpublic@5392 4d348492-3962-11de-aa85-65a2020054a3 +--- + .../itkParzenWindowMutualInformationImageToImageMetric.hxx | 6 +++--- + src/Core/Install/elxBaseComponent.h | 6 +++++- + 2 files changed, 8 insertions(+), 4 deletions(-) + +--- a/src/Components/Metrics/AdvancedMattesMutualInformation/itkParzenWindowMutualInformationImageToImageMetric.hxx ++++ b/src/Components/Metrics/AdvancedMattesMutualInformation/itkParzenWindowMutualInformationImageToImageMetric.hxx +@@ -99,7 +99,7 @@ + typedef typename MarginalPDFType::const_iterator MarginalPDFIteratorType; + + JointPDFIteratorType jointPDFit( +- this->m_JointPDF, this->m_JointPDF->GetLargestPossibleRegion() ); ++ this->m_JointPDF, this->m_JointPDF->GetLargestPossibleRegion() ); + jointPDFit.SetDirection( 0 ); + jointPDFit.GoToBegin(); + MarginalPDFIteratorType fixedPDFit = this->m_FixedImageMarginalPDF.begin(); +@@ -131,7 +131,7 @@ + ++fixedPDFit; + jointPDFit.NextLine(); + +- } // end while-loop over fixed index ++ } // end while-loop over fixed index + + return static_cast< MeasureType >( -1.0 * MI ); + +@@ -692,7 +692,7 @@ + typedef typename MarginalPDFType::const_iterator MarginalPDFIteratorType; + + JointPDFIteratorType jointPDFit( +- this->m_JointPDF, this->m_JointPDF->GetLargestPossibleRegion() ); ++ this->m_JointPDF, this->m_JointPDF->GetLargestPossibleRegion() ); + MarginalPDFIteratorType fixedPDFit = this->m_FixedImageMarginalPDF.begin(); + const MarginalPDFIteratorType fixedPDFend = this->m_FixedImageMarginalPDF.end(); + MarginalPDFIteratorType movingPDFit; +--- a/src/Core/Install/elxBaseComponent.h ++++ b/src/Core/Install/elxBaseComponent.h +@@ -38,7 +38,9 @@ + + #include <iostream> + #include <sstream> +-#include <iomanip> // std::setprecision ++#include <iomanip> // std::setprecision ++ ++#include "itkMacro.h" // itkTypeMacroNoParent + + /** The current elastix version. */ + #define __ELASTIX_VERSION 4.800 +@@ -106,6 +108,8 @@ + */ + virtual const char * elxGetClassName( void ) const; + ++ itkTypeMacroNoParent( BaseComponent ); ++ + /** Set the component label, which consists of a label + * ( "Metric", "Transform") and an index number. In case + * more metrics are used simultaneously each metric will have Modified: trunk/packages/elastix/trunk/debian/patches/series =================================================================== --- trunk/packages/elastix/trunk/debian/patches/series 2016-07-06 10:36:13 UTC (rev 22402) +++ trunk/packages/elastix/trunk/debian/patches/series 2016-07-06 11:57:08 UTC (rev 22403) @@ -2,3 +2,4 @@ doxygen_cleanup.patch doxygen_use_epoch_for_data_if_given.patch fix-cast-error.patch +fix-compilation-with-std-c++11.patch Modified: trunk/packages/elastix/trunk/debian/rules =================================================================== --- trunk/packages/elastix/trunk/debian/rules 2016-07-06 10:36:13 UTC (rev 22402) +++ trunk/packages/elastix/trunk/debian/rules 2016-07-06 11:57:08 UTC (rev 22403) @@ -1,7 +1,8 @@ #!/usr/bin/make -f +export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -export DEB_CXXFLAGS_MAINT_APPEND = -fvisibility=hidden -std=c++03 +export DEB_CXXFLAGS_MAINT_APPEND = -fvisibility=hidden EPOCH_DATE:=$(shell date -u -d ${SOURCE_DATE_EPOCH} +%d.%m.%Y) _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
