diff --git a/mingw-w64-cmake-git/0002-Disable-response-files-for-MSYS-Generator.patch b/mingw-w64-cmake-git/0001-Disable-response-files-for-MSYS-Generator.patch similarity index 90% rename from mingw-w64-cmake-git/0002-Disable-response-files-for-MSYS-Generator.patch rename to mingw-w64-cmake-git/0001-Disable-response-files-for-MSYS-Generator.patch index 1306a4d756..75897284f7 100644 --- a/mingw-w64-cmake-git/0002-Disable-response-files-for-MSYS-Generator.patch +++ b/mingw-w64-cmake-git/0001-Disable-response-files-for-MSYS-Generator.patch @@ -1,7 +1,7 @@ -From dc7c78f027fb2441f8e068ad10d23655d9404a73 Mon Sep 17 00:00:00 2001 +From 05b0880a056f58069eb9bdc017d460556e4f68f9 Mon Sep 17 00:00:00 2001 From: Alexpux Date: Mon, 3 Aug 2015 22:00:16 +0100 -Subject: [PATCH 2/4] Disable response files for MSYS Generator +Subject: [PATCH 1/3] Disable response files for MSYS Generator --- Modules/Platform/Windows-GNU.cmake | 8 +++++--- diff --git a/mingw-w64-cmake-git/0001-configure-Add-no-install-deps-option.patch b/mingw-w64-cmake-git/0001-configure-Add-no-install-deps-option.patch deleted file mode 100644 index 422917b12a..0000000000 --- a/mingw-w64-cmake-git/0001-configure-Add-no-install-deps-option.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 2856d7d6972efeb8e5d41fda9bea6c180c1557d9 Mon Sep 17 00:00:00 2001 -From: Ray Donnelly -Date: Mon, 3 Aug 2015 22:00:15 +0100 -Subject: [PATCH 1/4] configure: Add --no-install-deps option - ---- - bootstrap | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/bootstrap b/bootstrap -index d778bbe..f102b09 100755 ---- a/bootstrap -+++ b/bootstrap -@@ -642,6 +642,7 @@ cmake_verbose= - cmake_parallel_make= - cmake_ccache_enabled= - cmake_prefix_dir="${cmake_default_prefix}" -+cmake_no_install_deps= - while test $# != 0; do - case "$1" in - --prefix=*) dir=`cmake_arg "$1"` -@@ -653,6 +654,7 @@ while test $# != 0; do - --init=*) cmake_init_file=`cmake_arg "$1"` ;; - --system-libs) cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARIES=1" ;; - --no-system-libs) cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARIES=0" ;; -+ --no-install-deps) cmake_no_install_deps="1" ;; - --system-bzip2|--system-curl|--system-expat|--system-jsoncpp|--system-libarchive|--system-zlib) - lib=`cmake_arg "$1" "--system-"` - cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARY_`cmake_toupper $lib`=1" ;; -@@ -1738,6 +1740,9 @@ cmake_options="-DCMAKE_BOOTSTRAP=1" - if [ -n "${cmake_verbose}" ]; then - cmake_options="${cmake_options} -DCMAKE_VERBOSE_MAKEFILE=1" - fi -+if [ -n "${cmake_no_install_deps}" ]; then -+ cmake_options="${cmake_options} -DCMake_INSTALL_DEPENDENCIES=OFF" -+fi - "${cmake_bootstrap_dir}/cmake" "${cmake_source_dir}" "-C${cmake_bootstrap_dir}/InitialCacheFlags.cmake" "-G${cmake_bootstrap_generator}" ${cmake_options} ${cmake_bootstrap_system_libs} "$@" - RES=$? - if [ "${RES}" -ne "0" ]; then --- -2.5.0 - diff --git a/mingw-w64-cmake-git/0003-Implement-Qt5-static-plugin-support.patch b/mingw-w64-cmake-git/0002-Implement-Qt5-static-plugin-support.patch similarity index 98% rename from mingw-w64-cmake-git/0003-Implement-Qt5-static-plugin-support.patch rename to mingw-w64-cmake-git/0002-Implement-Qt5-static-plugin-support.patch index b9a561d3c4..910cf13075 100644 --- a/mingw-w64-cmake-git/0003-Implement-Qt5-static-plugin-support.patch +++ b/mingw-w64-cmake-git/0002-Implement-Qt5-static-plugin-support.patch @@ -1,7 +1,7 @@ -From 533dad5ccce1773ef3a1b8eed17990cedbbc20c0 Mon Sep 17 00:00:00 2001 +From 5bf3465977c82514375d3be4ad33d68acfd18e2c Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Mon, 3 Aug 2015 22:00:16 +0100 -Subject: [PATCH 3/4] Implement Qt5 static plugin support +Subject: [PATCH 2/3] Implement Qt5 static plugin support Enabled via a new target property "AUTOSTATICPLUGINS". diff --git a/mingw-w64-cmake-git/0004-Output-line-numbers-in-callstacks.patch b/mingw-w64-cmake-git/0003-Output-line-numbers-in-callstacks.patch similarity index 86% rename from mingw-w64-cmake-git/0004-Output-line-numbers-in-callstacks.patch rename to mingw-w64-cmake-git/0003-Output-line-numbers-in-callstacks.patch index 9c8906710a..c099fe0cc6 100644 --- a/mingw-w64-cmake-git/0004-Output-line-numbers-in-callstacks.patch +++ b/mingw-w64-cmake-git/0003-Output-line-numbers-in-callstacks.patch @@ -1,7 +1,7 @@ -From 14346ccf0b7b554b16e5b07002772e85318e3a18 Mon Sep 17 00:00:00 2001 +From 33ca9451c44bfc7d0aa7214ed30365f502293c03 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Mon, 3 Aug 2015 22:00:17 +0100 -Subject: [PATCH 4/4] Output line numbers in callstacks +Subject: [PATCH 3/3] Output line numbers in callstacks --- Source/cmMakefile.cxx | 2 +- diff --git a/mingw-w64-cmake-git/PKGBUILD b/mingw-w64-cmake-git/PKGBUILD index 4f0e75f835..7a853a050a 100644 --- a/mingw-w64-cmake-git/PKGBUILD +++ b/mingw-w64-cmake-git/PKGBUILD @@ -3,7 +3,7 @@ _realname=cmake pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git" -pkgver=r29051.a15b69c +pkgver=r29057.863b0a8 pkgrel=1 pkgdesc="A cross-platform open-source make system (mingw-w64)" arch=('any') @@ -24,15 +24,13 @@ depends=("${MINGW_PACKAGE_PREFIX}-winpthreads" "${MINGW_PACKAGE_PREFIX}-zlib") options=('staticlibs' '!strip' 'debug') source=("${_realname}"::"git+http://cmake.org/cmake.git" - '0001-configure-Add-no-install-deps-option.patch' - '0002-Disable-response-files-for-MSYS-Generator.patch' - '0003-Implement-Qt5-static-plugin-support.patch' - '0004-Output-line-numbers-in-callstacks.patch') + '0001-Disable-response-files-for-MSYS-Generator.patch' + '0002-Implement-Qt5-static-plugin-support.patch' + '0003-Output-line-numbers-in-callstacks.patch') md5sums=('SKIP' - 'cd6ed1ed30bb21d3b7652ad2d259b055' - '3e63cdfa659d9f0219f11c92da71740a' - '18e7b3d3874acdf68e79b0f57335040c' - 'cf42a9283a74c6d1e38d87d157cb4eb9') + 'c880b071cda707214c100ecf5ad7f0bd' + 'b3501cf1e0d93a4185ca5962d5dcc102' + 'f8fb995735aab8307f8c1cffedcf9514') pkgver() { cd "$srcdir/$_realname" @@ -41,10 +39,9 @@ pkgver() { prepare() { cd ${_realname} - git am "${srcdir}"/0001-configure-Add-no-install-deps-option.patch - git am "${srcdir}"/0002-Disable-response-files-for-MSYS-Generator.patch - git am "${srcdir}"/0003-Implement-Qt5-static-plugin-support.patch - git am "${srcdir}"/0004-Output-line-numbers-in-callstacks.patch + git am "${srcdir}"/0001-Disable-response-files-for-MSYS-Generator.patch + git am "${srcdir}"/0002-Implement-Qt5-static-plugin-support.patch + git am "${srcdir}"/0003-Output-line-numbers-in-callstacks.patch } build() { @@ -58,8 +55,6 @@ build() { --prefix=${MINGW_PREFIX} \ --system-libs \ --no-system-expat \ - --no-install-deps \ - --qt-gui \ --qt-qmake=$(cygpath -m ${MINGW_PREFIX})/qt5-static/bin/qmake.exe \ --no-qt-gui \ --parallel=${NUMBER_OF_PROCESSORS} \