From e3eb6e4bf8bed312aa14a0789140548b83f54c52 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Thu, 19 Nov 2020 19:18:01 -0600 Subject: [PATCH 1/2] cmake-gui: update to 3.19.0 --- srcpkgs/cmake-gui/template | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template index 0dff4e8c853c40..3f468f63e1dc07 100644 --- a/srcpkgs/cmake-gui/template +++ b/srcpkgs/cmake-gui/template @@ -1,6 +1,6 @@ # Template file for 'cmake-gui' pkgname=cmake-gui -version=3.18.4 +version=3.19.0 revision=1 wrksrc="cmake-${version}" build_style=cmake @@ -17,11 +17,19 @@ makedepends="jsoncpp-devel libarchive-devel libcurl-devel libuv-devel depends="desktop-file-utils shared-mime-info" checkdepends="pax pkg-config" short_desc="Cross-platform, open-source build system - Qt GUI" -maintainer="Nathan Owens " +maintainer="Nathan Owens " license="LGPL-2.1-or-later, GPL-3.0-or-later, BSD-3-Clause" homepage="https://www.cmake.org" distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz" -checksum=597c61358e6a92ecbfad42a9b5321ddd801fc7e7eca08441307c9138382d4f77 +checksum=fdda688155aa7e72b7c63ef6f559fca4b6c07382ea6dca0beb5f45aececaf493 + +pre_configure() { + # TRY_RUN fails if being cross-built + if [ "$CROSS_BUILD" ]; then + vsed -i 's,TRY_RUN,CMake_RUN_CXX_FILESYSTEM__TRYRUN_OUTPUT,g' \ + CMakeLists.txt + fi +} do_install() { # We are only interested in cmake-gui. From 197406fdce750da4031e814558a19a88709d140b Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Thu, 19 Nov 2020 19:02:23 -0600 Subject: [PATCH 2/2] cmake: update to 3.19.0 --- srcpkgs/cmake/template | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template index 0955f2595fa255..38dbcad45ad6a2 100644 --- a/srcpkgs/cmake/template +++ b/srcpkgs/cmake/template @@ -22,6 +22,13 @@ homepage="https://www.cmake.org" distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz" checksum=597c61358e6a92ecbfad42a9b5321ddd801fc7e7eca08441307c9138382d4f77 +pre_configure() { + if [ "$CROSS_BUILD" ]; then + vsed -i 's,TRY_RUN,CMake_RUN_CXX_FILESYSTEM__TRYRUN_OUTPUT,g' \ + CMakeLists.txt + fi +} + pre_check() { # use ctest of this build instead of requirig cmake to test cmake... vsed -i "${wrksrc}/build/Makefile" \