From 4ee76ae63f9e2493bf03957a2278f11d7b42e5c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 25 Feb 2021 19:55:17 +0700 Subject: [PATCH 1/3] cmake-bootstrap: update to 3.19.6. --- srcpkgs/cmake-bootstrap/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cmake-bootstrap/template b/srcpkgs/cmake-bootstrap/template index 539033d6ffa560..4fa366f36c7dcd 100644 --- a/srcpkgs/cmake-bootstrap/template +++ b/srcpkgs/cmake-bootstrap/template @@ -1,6 +1,6 @@ # Template file for 'cmake-bootstrap' pkgname=cmake-bootstrap -version=3.19.4 +version=3.19.6 revision=1 wrksrc=cmake-$version bootstrap=yes @@ -16,7 +16,7 @@ maintainer="Đoàn Trần Công Danh " license="LGPL-2.1-or-later, BSD-3-Clause" homepage="https://www.cmake.org" distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz" -checksum=7d0232b9f1c57e8de81f38071ef8203e6820fe7eec8ae46a1df125d88dbcc2e1 +checksum=ec87ab67c45f47c4285f204280c5cde48e1c920cfcfed1555b27fb3b1a1d20ba conflicts="cmake>=0" CFLAGS="-DCMAKE_USE_SYSTEM_ZLIB -DCMAKE_USE_SYSTEM_LIBARCHIVE" From 43073be4866009e0e0954dfb567abad4a7890f57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 25 Feb 2021 19:42:53 +0700 Subject: [PATCH 2/3] cmake: update to 3.19.6. --- srcpkgs/cmake/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template index e95cc40abc7941..f8aa101d4af3de 100644 --- a/srcpkgs/cmake/template +++ b/srcpkgs/cmake/template @@ -1,6 +1,6 @@ # Template file for 'cmake' pkgname=cmake -version=3.19.4 +version=3.19.6 revision=1 build_style=cmake configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake -DCMAKE_BUILD_TYPE=None @@ -16,7 +16,7 @@ maintainer="Nathan Owens " license="BSD-3-Clause, ICU" homepage="https://www.cmake.org" distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz" -checksum=7d0232b9f1c57e8de81f38071ef8203e6820fe7eec8ae46a1df125d88dbcc2e1 +checksum=ec87ab67c45f47c4285f204280c5cde48e1c920cfcfed1555b27fb3b1a1d20ba export CMAKE_GENERATOR="Unix Makefiles" From 5068b441a613702eef599ed9ba23cbdf1baddcdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 25 Feb 2021 19:55:28 +0700 Subject: [PATCH 3/3] cmake-gui: update to 3.19.6. --- srcpkgs/cmake-gui/template | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template index 369450ed3cdecc..56b1e84036ea7e 100644 --- a/srcpkgs/cmake-gui/template +++ b/srcpkgs/cmake-gui/template @@ -1,22 +1,28 @@ # Template file for 'cmake-gui' pkgname=cmake-gui -version=3.19.4 +version=3.19.6 revision=1 wrksrc="cmake-${version}" build_style=cmake configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake -DCMAKE_BUILD_TYPE=None - -DBUILD_QtDialog=ON -DCMAKE_USE_SYSTEM_LIBRARIES=ON -DKWSYS_LFS_WORKS=1" + -DBUILD_QtDialog=ON -DCMAKE_USE_SYSTEM_LIBRARIES=ON -DKWSYS_LFS_WORKS=1 + -DCMake_GUI_DISTRIBUTE_WITH_Qt_LGPL=3" hostmakedepends="qt5-devel" makedepends="jsoncpp-devel libarchive-devel libcurl-devel libuv-devel ncurses-devel qt5-devel rhash-devel" -depends="desktop-file-utils shared-mime-info" +depends="desktop-file-utils shared-mime-info cmake>=${version}" checkdepends="pax pkg-config" short_desc="Cross-platform, open-source build system - Qt GUI" maintainer="Nathan Owens " license="BSD-3-Clause" homepage="https://www.cmake.org" distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz" -checksum=7d0232b9f1c57e8de81f38071ef8203e6820fe7eec8ae46a1df125d88dbcc2e1 +checksum=ec87ab67c45f47c4285f204280c5cde48e1c920cfcfed1555b27fb3b1a1d20ba + +# XXX: cmake is broken if cmake was built with -GNinja +# https://bugs.gentoo.org/596460 +export CMAKE_GENERATOR="Unix Makefiles" +make_cmd=make do_install() { # We are only interested in cmake-gui.