From: <ai...@us...> - 2013-12-01 08:27:00
|
Revision: 12791 http://sourceforge.net/p/plplot/code/12791 Author: airwin Date: 2013-12-01 08:26:52 +0000 (Sun, 01 Dec 2013) Log Message: ----------- Update the reversed patch that includes all hand-edited fixes to automatically configured builds after cmake -DFILENAME:FILEPATH=pango_packages.data -P configure_bp.cmake was run. Tested by: Alan W. Irwin <ai...@us...> on Linux using the build_plplot target for the epa_build project. This test was a comprehensive check of all recent epa_build changes. Modified Paths: -------------- trunk/cmake/epa_build/configured_pango.patch Modified: trunk/cmake/epa_build/configured_pango.patch =================================================================== --- trunk/cmake/epa_build/configured_pango.patch 2013-12-01 08:18:33 UTC (rev 12790) +++ trunk/cmake/epa_build/configured_pango.patch 2013-12-01 08:26:52 UTC (rev 12791) @@ -1,6 +1,6 @@ Index: itstool/bp.cmake =================================================================== ---- itstool/bp.cmake (revision 12780) +--- itstool/bp.cmake (revision 12790) +++ itstool/bp.cmake (working copy) @@ -64,7 +64,6 @@ set(${BP_PACKAGE}_URL http://files.itstool.org/itstool/itstool-1.2.0.tar.bz2) @@ -10,11 +10,11 @@ # Data that is related to the PATH that must be used. if(MSYS_PLATFORM) -@@ -85,7 +84,6 @@ +@@ -93,7 +92,6 @@ DEPENDS ${${BP_PACKAGE}_dependencies_targets} URL ${${BP_PACKAGE}_URL} URL_HASH ${${BP_PACKAGE}_DOWNLOAD_HASH_TYPE}=${${BP_PACKAGE}_DOWNLOAD_HASH} - PATCH_COMMAND ${PATCH_EXECUTABLE} -p1 < ${CMAKE_SOURCE_DIR}/itstool/${${BP_PACKAGE}_PATCH} - CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${${BP_PACKAGE}_SET_CFLAGS} ${source_PATH}/${BP_CONFIGURE_COMMAND} + CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${${BP_PACKAGE}_SET_CFLAGS} ${${BP_PACKAGE}_SET_CXXFLAGS} ${source_PATH}/${BP_CONFIGURE_COMMAND} BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND} BUILD_IN_SOURCE OFF This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |