From ddd485088b24e0bb368270c6c8355ffbf2b2c724 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 5 Aug 2015 08:18:42 +0100 Subject: [PATCH] cmake-git: Remove some debugging stuff --- .../0001-configure-Add-no-install-deps-option.patch | 6 +++--- ...002-Disable-response-files-for-MSYS-Generator.patch | 2 +- .../0003-Implement-Qt5-static-plugin-support.patch | 2 +- .../0004-Output-line-numbers-in-callstacks.patch | 2 +- mingw-w64-cmake-git/PKGBUILD | 10 +++++----- 5 files changed, 11 insertions(+), 11 deletions(-) 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 index 4e1bf1f6ef..422917b12a 100644 --- 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 @@ -1,4 +1,4 @@ -From 582ca5c5f4c0983103c131fe485312b8dd10da08 Mon Sep 17 00:00:00 2001 +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 @@ -8,7 +8,7 @@ Subject: [PATCH 1/4] configure: Add --no-install-deps option 1 file changed, 5 insertions(+) diff --git a/bootstrap b/bootstrap -index d778bbe..549f26c 100755 +index d778bbe..f102b09 100755 --- a/bootstrap +++ b/bootstrap @@ -642,6 +642,7 @@ cmake_verbose= @@ -32,7 +32,7 @@ index d778bbe..549f26c 100755 cmake_options="${cmake_options} -DCMAKE_VERBOSE_MAKEFILE=1" fi +if [ -n "${cmake_no_install_deps}" ]; then -+ cmake_options="${cmake_options} -DCMake_INSTALL_DEPENDENCIES=OFF -Wdev --debug-output --trace" ++ 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=$? diff --git a/mingw-w64-cmake-git/0002-Disable-response-files-for-MSYS-Generator.patch b/mingw-w64-cmake-git/0002-Disable-response-files-for-MSYS-Generator.patch index f5d110d156..1306a4d756 100644 --- a/mingw-w64-cmake-git/0002-Disable-response-files-for-MSYS-Generator.patch +++ b/mingw-w64-cmake-git/0002-Disable-response-files-for-MSYS-Generator.patch @@ -1,4 +1,4 @@ -From ca96e7af8a53d7bce9f254591076d3911d140dad Mon Sep 17 00:00:00 2001 +From dc7c78f027fb2441f8e068ad10d23655d9404a73 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 diff --git a/mingw-w64-cmake-git/0003-Implement-Qt5-static-plugin-support.patch b/mingw-w64-cmake-git/0003-Implement-Qt5-static-plugin-support.patch index 1d78043dfb..b9a561d3c4 100644 --- a/mingw-w64-cmake-git/0003-Implement-Qt5-static-plugin-support.patch +++ b/mingw-w64-cmake-git/0003-Implement-Qt5-static-plugin-support.patch @@ -1,4 +1,4 @@ -From f17a08807b8a359db84b4a42e281b409b823c1cf Mon Sep 17 00:00:00 2001 +From 533dad5ccce1773ef3a1b8eed17990cedbbc20c0 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 diff --git a/mingw-w64-cmake-git/0004-Output-line-numbers-in-callstacks.patch b/mingw-w64-cmake-git/0004-Output-line-numbers-in-callstacks.patch index cba8549d73..9c8906710a 100644 --- a/mingw-w64-cmake-git/0004-Output-line-numbers-in-callstacks.patch +++ b/mingw-w64-cmake-git/0004-Output-line-numbers-in-callstacks.patch @@ -1,4 +1,4 @@ -From ff1770d5bbe9e25aa174b99e8a3b95d8a5893977 Mon Sep 17 00:00:00 2001 +From 14346ccf0b7b554b16e5b07002772e85318e3a18 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 diff --git a/mingw-w64-cmake-git/PKGBUILD b/mingw-w64-cmake-git/PKGBUILD index 304857be93..4f0e75f835 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=r29042.7ac2b12 +pkgver=r29051.a15b69c pkgrel=1 pkgdesc="A cross-platform open-source make system (mingw-w64)" arch=('any') @@ -29,10 +29,10 @@ source=("${_realname}"::"git+http://cmake.org/cmake.git" '0003-Implement-Qt5-static-plugin-support.patch' '0004-Output-line-numbers-in-callstacks.patch') md5sums=('SKIP' - '6e291ea96695f41dd7c31cfabd07c7fd' - 'f7cc0ec22619e9137c18e1d3c6ed684b' - '9b285fcf243bc6c50b341c5f09f1adc9' - '8c3b4e9986c3b4bc0a1a2251b13b1114') + 'cd6ed1ed30bb21d3b7652ad2d259b055' + '3e63cdfa659d9f0219f11c92da71740a' + '18e7b3d3874acdf68e79b0f57335040c' + 'cf42a9283a74c6d1e38d87d157cb4eb9') pkgver() { cd "$srcdir/$_realname"