Author: malat Date: 2012-05-07 13:06:27 +0000 (Mon, 07 May 2012) New Revision: 10731
Added: trunk/packages/gdcm/trunk/debian/patches/sonameprops.patch Modified: trunk/packages/gdcm/trunk/debian/patches/series Log: Import from upstream Modified: trunk/packages/gdcm/trunk/debian/patches/series =================================================================== --- trunk/packages/gdcm/trunk/debian/patches/series 2012-05-07 13:04:04 UTC (rev 10730) +++ trunk/packages/gdcm/trunk/debian/patches/series 2012-05-07 13:06:27 UTC (rev 10731) @@ -10,3 +10,4 @@ fixhurd.patch fixundef.patch removesonamepython.patch +sonameprops.patch Added: trunk/packages/gdcm/trunk/debian/patches/sonameprops.patch =================================================================== --- trunk/packages/gdcm/trunk/debian/patches/sonameprops.patch (rev 0) +++ trunk/packages/gdcm/trunk/debian/patches/sonameprops.patch 2012-05-07 13:06:27 UTC (rev 10731) @@ -0,0 +1,55 @@ +Description: <short summary of the patch> + TODO: Put a short summary on the line above and replace this paragraph + with a longer explanation of this change. Complete the meta-information + with other relevant fields (see below for details). To make it easier, the + information below has been extracted from the changelog. Adjust it or drop + it. + . + gdcm (2.2.0-11) UNRELEASED; urgency=low + . + * Remove SONAME from python module, as per policy + * Build PHP5 bindings + * Fix issue with python 3.2 vs 2.7 +Author: Mathieu Malaterre <ma...@debian.org> + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: <vendor|upstream|other>, <url of original patch> +Bug: <url in upstream bugtracker> +Bug-Debian: http://bugs.debian.org/<bugnumber> +Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> +Forwarded: <no|not-needed|url proving that it has been forwarded> +Reviewed-By: <name and email of someone who approved the patch> +Last-Update: <YYYY-MM-DD> + +--- gdcm-2.2.0.orig/Wrapping/PHP/CMakeLists.txt ++++ gdcm-2.2.0/Wrapping/PHP/CMakeLists.txt +@@ -28,6 +28,7 @@ SET_SOURCE_FILES_PROPERTIES(gdcm.i PROPE + # swig expect a name like that: php_gdcm.so + SWIG_ADD_MODULE(php_gdcm php gdcm.i) + SWIG_LINK_LIBRARIES(php_gdcm gdcmMSFF) ++set_property(TARGET ${SWIG_MODULE_php_gdcm_REAL_NAME} PROPERTY NO_SONAME 1) + + SET_TARGET_PROPERTIES(${SWIG_MODULE_php_gdcm_REAL_NAME} PROPERTIES LINK_INTERFACE_LIBRARIES "") + # Remove 'lib' prefix :no-op on windows and valid for UNIX based syste +@@ -51,11 +52,13 @@ ENDIF(UNIX) + # See gdcm bug #3175803 + # This is fixed in SWIG 2.0.2: + # http://sourceforge.net/tracker/?func=detail&atid=101645&aid=3166423&group_id=1645 +-add_custom_command(TARGET ${SWIG_MODULE_php_gdcm_REAL_NAME} +- PRE_BUILD +- COMMAND sed -i -e 's/zend_error_noreturn/zend_error/g' "${swig_generated_file_fullname}" +- COMMENT "Patching zend_error_noreturn into zend_error" ++if(${SWIG_VERSION} LESS 2.0.2) ++ add_custom_command(TARGET ${SWIG_MODULE_php_gdcm_REAL_NAME} ++ PRE_BUILD ++ COMMAND sed -i -e 's/zend_error_noreturn/zend_error/g' "${swig_generated_file_fullname}" ++ COMMENT "Patching zend_error_noreturn into zend_error" + ) ++endif() + + # Let's copy gdcm.php into the bin dir: + ADD_CUSTOM_COMMAND( _______________________________________________ debian-med-commit mailing list debian-med-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit