From 359dba4f2796fbf5ca6c7ae8ceb725fd6e499f5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 17 Apr 2021 19:22:54 +0700 Subject: [PATCH 1/3] cmake-bootstrap: update to 3.20.1. --- srcpkgs/cmake-bootstrap/template | 8 ++---- srcpkgs/cmake/patches/test-none.patch | 41 +++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/cmake/patches/test-none.patch diff --git a/srcpkgs/cmake-bootstrap/template b/srcpkgs/cmake-bootstrap/template index 8b1c0b5aded8..2e01b8bd1e85 100644 --- a/srcpkgs/cmake-bootstrap/template +++ b/srcpkgs/cmake-bootstrap/template @@ -1,8 +1,7 @@ # Template file for 'cmake-bootstrap' pkgname=cmake-bootstrap -reverts="3.20.0_1" -version=3.19.7 -revision=2 +version=3.20.1 +revision=1 wrksrc=cmake-$version bootstrap=yes build_style=configure @@ -17,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=58a15f0d56a0afccc3cc5371234fce73fcc6c8f9dbd775d898e510b83175588e +checksum=3f1808b9b00281df06c91dd7a021d7f52f724101000da7985a401678dfe035b0 conflicts="cmake>=0" CFLAGS="-DCMAKE_USE_SYSTEM_ZLIB -DCMAKE_USE_SYSTEM_LIBARCHIVE" @@ -37,7 +36,6 @@ post_patch() { rm -rf Utilities/cmexpat rm -rf Utilities/cmlibarchive rm -rf Utilities/cmliblzma - rm -rf Utilities/cmlibrhash rm -rf Utilities/cmnghttp2 rm -rf Utilities/cmzlib rm -rf Utilities/cmzstd diff --git a/srcpkgs/cmake/patches/test-none.patch b/srcpkgs/cmake/patches/test-none.patch new file mode 100644 index 000000000000..3a5540551525 --- /dev/null +++ b/srcpkgs/cmake/patches/test-none.patch @@ -0,0 +1,41 @@ +From ce1cadd35a26bd44879675581d8e70b00ff8e0fc 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, 1 Apr 2021 20:14:06 +0700 +Subject: [PATCH] Tests/ConfigSources: fix for non main stream CMAKE_BUILD_TYPE +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- None is a valid CMAKE_BUILD_TYPE +- Most of distros uses None as CMAKE_BUILD_TYPE +- When CMAKE_BUILD_TYPE=None, main_other.cpp will be compiled and linked + into final executable, this program requires some symbols only exist + when CUSTOM_CFG_OTHER is defined. +- And CMake also allows other CMAKE_BUILD_TYPE, too, CMake documentation + specificaly mentions funny CMAKE_BUILD_TYPE like ReLeAsE [1] + +Let's define them when non main stream like None is specified as CMAKE_BUILD_TYPE. + +[1]: https://cmake.org/cmake/help/v3.20/variable/CMAKE_BUILD_TYPE.html +--- + Tests/ConfigSources/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git Tests/ConfigSources/CMakeLists.txt Tests/ConfigSources/CMakeLists.txt +index a3d98f685f..f83759ca10 100644 +--- Tests/ConfigSources/CMakeLists.txt ++++ Tests/ConfigSources/CMakeLists.txt +@@ -74,10 +74,10 @@ add_custom_command(APPEND + VERBATIM + ) + foreach(n RANGE 1 5) +- set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG) +- foreach(other Release RelWithDebInfo MinSizeRel) ++ foreach(other ${CMAKE_BUILD_TYPE} Release RelWithDebInfo MinSizeRel) + set_property(SOURCE custom${n}_${other}.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_OTHER) + endforeach() ++ set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG) + endforeach() + add_library(Custom STATIC + custom1_$.cpp From 26083a00fe363639517c1ad917aca8c23c3c48e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 17 Apr 2021 19:23:38 +0700 Subject: [PATCH 2/3] cmake: update to 3.20.1. --- srcpkgs/cmake/template | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template index b3d3d4c5159d..deea77e9d2b1 100644 --- a/srcpkgs/cmake/template +++ b/srcpkgs/cmake/template @@ -1,10 +1,9 @@ # Template file for 'cmake' pkgname=cmake -reverts="3.20.0_1" -version=3.19.7 -revision=2 +version=3.20.1 +revision=1 build_style=cmake -configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake -DCMAKE_BUILD_TYPE=None +configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake -DCMAKE_USE_SYSTEM_LIBRARIES=ON -DKWSYS_LFS_WORKS=1" make_check_target=test make_cmd=make @@ -17,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=58a15f0d56a0afccc3cc5371234fce73fcc6c8f9dbd775d898e510b83175588e +checksum=3f1808b9b00281df06c91dd7a021d7f52f724101000da7985a401678dfe035b0 export CMAKE_GENERATOR="Unix Makefiles" From ad9a8d0cd0f6837f1c5fe77dc0d3b98b3c7c75a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 17 Apr 2021 19:23:42 +0700 Subject: [PATCH 3/3] cmake-gui: update to 3.20.1. --- srcpkgs/cmake-gui/template | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template index 19b2def02d63..a836709984d0 100644 --- a/srcpkgs/cmake-gui/template +++ b/srcpkgs/cmake-gui/template @@ -1,11 +1,10 @@ # Template file for 'cmake-gui' pkgname=cmake-gui -reverts="3.20.0_1" -version=3.19.7 -revision=2 +version=3.20.1 +revision=1 wrksrc="cmake-${version}" build_style=cmake -configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake -DCMAKE_BUILD_TYPE=None +configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake -DBUILD_QtDialog=ON -DCMAKE_USE_SYSTEM_LIBRARIES=ON -DKWSYS_LFS_WORKS=1 -DCMake_GUI_DISTRIBUTE_WITH_Qt_LGPL=3" hostmakedepends="qt5-devel" @@ -18,7 +17,7 @@ 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=58a15f0d56a0afccc3cc5371234fce73fcc6c8f9dbd775d898e510b83175588e +checksum=3f1808b9b00281df06c91dd7a021d7f52f724101000da7985a401678dfe035b0 # XXX: cmake is broken if cmake was built with -GNinja # https://bugs.gentoo.org/596460