Author: smr Date: 2010-08-01 04:26:51 +0000 (Sun, 01 Aug 2010) New Revision: 5084
Removed: trunk/packages/insighttoolkit/trunk/debian/patches/gccxml-workaround.patch Modified: trunk/packages/insighttoolkit/trunk/debian/changelog trunk/packages/insighttoolkit/trunk/debian/patches/series Log: Remove unneeded gccxml workaround. Modified: trunk/packages/insighttoolkit/trunk/debian/changelog =================================================================== --- trunk/packages/insighttoolkit/trunk/debian/changelog 2010-08-01 04:22:32 UTC (rev 5083) +++ trunk/packages/insighttoolkit/trunk/debian/changelog 2010-08-01 04:26:51 UTC (rev 5084) @@ -9,8 +9,11 @@ * rules: Set version variables to 3.20. * control: Re-generate for libinsighttoolkit3.20. + + * patches/gccxml-workaround.patch: Remove. Workaround no longer + required as gccxml was fixed as of 2008-06-02. - -- Steve M. Robbins <[email protected]> Sat, 31 Jul 2010 15:48:17 -0500 + -- Steve M. Robbins <[email protected]> Sat, 31 Jul 2010 23:25:00 -0500 insighttoolkit (3.18.0-4) unstable; urgency=low Deleted: trunk/packages/insighttoolkit/trunk/debian/patches/gccxml-workaround.patch =================================================================== --- trunk/packages/insighttoolkit/trunk/debian/patches/gccxml-workaround.patch 2010-08-01 04:22:32 UTC (rev 5083) +++ trunk/packages/insighttoolkit/trunk/debian/patches/gccxml-workaround.patch 2010-08-01 04:26:51 UTC (rev 5084) @@ -1,18 +0,0 @@ -Do not add -I/usr/include to gccxml options. Doing so breaks #include_next, -which is heavily used in GCC 4.3. - -This is GCCXML bug 7134; see http://www.gccxml.org/Bug/view.php?id=7134. - ---- insighttoolkit-3.6.0.orig/Wrapping/CSwig/CMakeLists.txt -+++ insighttoolkit-3.6.0/Wrapping/CSwig/CMakeLists.txt -@@ -749,7 +749,9 @@ - SET(SWIG_INC_FILE ${WrapITK_BINARY_DIR}/${DIRECTORY}/SwigInc.txt) - SET(SWIG_INC_CONTENTS) - FOREACH(dir ${SWIG_INC}) -- SET(SWIG_INC_CONTENTS "${SWIG_INC_CONTENTS}-I${dir}\n") -+ IF(NOT ${dir} STREQUAL "/usr/include") -+ SET(SWIG_INC_CONTENTS "${SWIG_INC_CONTENTS}-I${dir}\n") -+ ENDIF(NOT ${dir} STREQUAL "/usr/include") - ENDFOREACH(dir) - CONFIGURE_FILE(${WrapITK_SOURCE_DIR}/SwigInc.txt.in ${SWIG_INC_FILE} - @ONLY IMMEDIATE) Modified: trunk/packages/insighttoolkit/trunk/debian/patches/series =================================================================== --- trunk/packages/insighttoolkit/trunk/debian/patches/series 2010-08-01 04:22:32 UTC (rev 5083) +++ trunk/packages/insighttoolkit/trunk/debian/patches/series 2010-08-01 04:26:51 UTC (rev 5084) @@ -1,5 +1,4 @@ hppa-complex-long-double.patch -gccxml-workaround.patch 03_examples.patch tcl-install.patch jni-dir.patch _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
