diff --git a/3rdparty/ext_expat/CMakeLists.txt b/3rdparty/ext_expat/CMakeLists.txt index 4f090a0054..2864d4d842 100644 --- a/3rdparty/ext_expat/CMakeLists.txt +++ b/3rdparty/ext_expat/CMakeLists.txt @@ -1,47 +1,47 @@ SET(PREFIX_ext_expat "${EXTPREFIX}" ) if (WIN32) ExternalProject_Add( ext_expat DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} - URL http://files.kde.org/krita/build/dependencies/expat-2.1.0.tar.gz - URL_MD5 dd7dab7a5fea97d2a6a43f511449b7cd + URL https://api.github.com/repos/libexpat/libexpat/tarball/R_2_2_9 + URL_MD5 045c3b3ea0fc55f3565cb117e1669493 - PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/expat-2.1.0-20130311.diff + PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/expat-2.2.9-b9bd355.diff INSTALL_DIR ${PREFIX_ext_expat} - CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_expat} -DBUILD_tests=OFF -DBUILD_examples=OFF -DBUILD_tools=OFF -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} + CONFIGURE_COMMAND ${CMAKE_COMMAND} CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_expat} -DBUILD_tests=OFF -DBUILD_examples=OFF -DBUILD_tools=OFF -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} /expat UPDATE_COMMAND "" DEPENDS ext_patch ) elseif (ANDROID) ExternalProject_Add( ext_expat DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} - URL http://files.kde.org/krita/build/dependencies/expat-2.1.0.tar.gz - URL_MD5 dd7dab7a5fea97d2a6a43f511449b7cd + URL https://api.github.com/repos/libexpat/libexpat/tarball/R_2_2_9 + URL_MD5 045c3b3ea0fc55f3565cb117e1669493 INSTALL_DIR ${PREFIX_ext_expat} - CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_expat} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} + CONFIGURE_COMMAND ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_expat} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} /expat BUILD_COMMAND make INSTALL_COMMAND make install UPDATE_COMMAND "" ) else() ExternalProject_Add( ext_expat DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} - URL http://files.kde.org/krita/build/dependencies/expat-2.1.0.tar.gz - URL_MD5 dd7dab7a5fea97d2a6a43f511449b7cd + URL https://api.github.com/repos/libexpat/libexpat/tarball/R_2_2_9 + URL_MD5 045c3b3ea0fc55f3565cb117e1669493 INSTALL_DIR ${PREFIX_ext_expat} - CONFIGURE_COMMAND /configure --prefix=${PREFIX_ext_expat} ${GLOBAL_AUTOMAKE_PROFILE} + CONFIGURE_COMMAND ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_expat} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} /expat BUILD_COMMAND make INSTALL_COMMAND make install UPDATE_COMMAND "" ) endif() diff --git a/3rdparty/ext_expat/expat-2.2.9-b9bd355.diff b/3rdparty/ext_expat/expat-2.2.9-b9bd355.diff new file mode 100644 index 0000000000..8df171b6e9 --- /dev/null +++ b/3rdparty/ext_expat/expat-2.2.9-b9bd355.diff @@ -0,0 +1,22 @@ +diff --git a/expat/lib/libexpat.def b/expat/lib/libexpat.def +index 16faf59..660448d 100644 +--- a/expat/lib/libexpat.def ++++ b/expat/lib/libexpat.def +@@ -1,6 +1,5 @@ + ; DEF file for MS VC++ + +-LIBRARY + EXPORTS + XML_DefaultCurrent @1 + XML_ErrorString @2 +diff --git a/expat/lib/libexpatw.def b/expat/lib/libexpatw.def +index 16faf59..660448d 100644 +--- a/expat/lib/libexpatw.def ++++ b/expat/lib/libexpatw.def +@@ -1,6 +1,5 @@ + ; DEF file for MS VC++ + +-LIBRARY + EXPORTS + XML_DefaultCurrent @1 + XML_ErrorString @2