From e682c6fbf241119534b3a33a80704d36bbe3bc83 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 21:33:44 +0700 Subject: [PATCH 1/3] cmake-bootstrap: update to 3.20.0. --- srcpkgs/cmake-bootstrap/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cmake-bootstrap/template b/srcpkgs/cmake-bootstrap/template index c97760473629..f9c6548ef0ad 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.7 +version=3.20.0 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=58a15f0d56a0afccc3cc5371234fce73fcc6c8f9dbd775d898e510b83175588e +checksum=9c06b2ddf7c337e31d8201f6ebcd3bba86a9a033976a9aee207fe0c6971f4755 conflicts="cmake>=0" CFLAGS="-DCMAKE_USE_SYSTEM_ZLIB -DCMAKE_USE_SYSTEM_LIBARCHIVE" @@ -36,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 From b69e7202f1d983728346a6cc5b11071fab67339f 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:47:38 +0700 Subject: [PATCH 2/3] cmake: update to 3.20.0. --- ...ources-fix-for-CMAKE_BUILD_TYPE-None.patch | 33 +++++++++++++++++++ srcpkgs/cmake/template | 4 +-- 2 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/cmake/patches/0001-Tests-ConfigSources-fix-for-CMAKE_BUILD_TYPE-None.patch diff --git a/srcpkgs/cmake/patches/0001-Tests-ConfigSources-fix-for-CMAKE_BUILD_TYPE-None.patch b/srcpkgs/cmake/patches/0001-Tests-ConfigSources-fix-for-CMAKE_BUILD_TYPE-None.patch new file mode 100644 index 000000000000..074f60bfe54d --- /dev/null +++ b/srcpkgs/cmake/patches/0001-Tests-ConfigSources-fix-for-CMAKE_BUILD_TYPE-None.patch @@ -0,0 +1,33 @@ +From 34be7b9e5adf6823310508245d186142fcc6c0a5 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 CMAKE_BUILD_TYPE=None +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. + +Let's define them when None is specified as CMAKE_BUILD_TYPE. +--- + Tests/ConfigSources/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git Tests/ConfigSources/CMakeLists.txt Tests/ConfigSources/CMakeLists.txt +index a3d98f685f..84ef26b0fd 100644 +--- Tests/ConfigSources/CMakeLists.txt ++++ Tests/ConfigSources/CMakeLists.txt +@@ -75,7 +75,7 @@ add_custom_command(APPEND + ) + 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 None Release RelWithDebInfo MinSizeRel) + set_property(SOURCE custom${n}_${other}.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_OTHER) + endforeach() + endforeach() diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template index aa32cea5f048..93dbc971646c 100644 --- a/srcpkgs/cmake/template +++ b/srcpkgs/cmake/template @@ -1,6 +1,6 @@ # Template file for 'cmake' pkgname=cmake -version=3.19.7 +version=3.20.0 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=58a15f0d56a0afccc3cc5371234fce73fcc6c8f9dbd775d898e510b83175588e +checksum=9c06b2ddf7c337e31d8201f6ebcd3bba86a9a033976a9aee207fe0c6971f4755 export CMAKE_GENERATOR="Unix Makefiles" From 3b9ae4ddf5ebcc3d714fee06e00c3af4a920ca57 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 21:33:47 +0700 Subject: [PATCH 3/3] cmake-gui: update to 3.20.0. --- srcpkgs/cmake-gui/patches | 1 + srcpkgs/cmake-gui/patches/musl-test.patch | 15 --------------- srcpkgs/cmake-gui/template | 4 ++-- 3 files changed, 3 insertions(+), 17 deletions(-) create mode 120000 srcpkgs/cmake-gui/patches delete mode 100644 srcpkgs/cmake-gui/patches/musl-test.patch diff --git a/srcpkgs/cmake-gui/patches b/srcpkgs/cmake-gui/patches new file mode 120000 index 000000000000..6f3ac554b361 --- /dev/null +++ b/srcpkgs/cmake-gui/patches @@ -0,0 +1 @@ +../cmake/patches \ No newline at end of file diff --git a/srcpkgs/cmake-gui/patches/musl-test.patch b/srcpkgs/cmake-gui/patches/musl-test.patch deleted file mode 100644 index 4da8c2f9cfc6..000000000000 --- a/srcpkgs/cmake-gui/patches/musl-test.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-all-check.cmake.orig 2020-12-05 13:27:21.098078774 +0700 -+++ Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-all-check.cmake 2020-12-05 13:29:19.931553018 +0700 -@@ -33,9 +33,9 @@ - [[librunpath_parent_unresolved\.so]] - [[librunpath_unresolved\.so]] - ) --check_contents(deps/udeps1.txt "^${_check}$") --check_contents(deps/udeps2.txt "^${_check}$") --check_contents(deps/udeps3.txt "^${_check}$") -+check_contents(deps/udeps1.txt "^(libc.so;)?${_check}$") -+check_contents(deps/udeps2.txt "^(libc.so;)?${_check}$") -+check_contents(deps/udeps3.txt "^(libc.so;)?${_check}$") - set(_check - "^libconflict\\.so:[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/conflict/libconflict\\.so;[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/conflict2/libconflict\\.so\n$" - ) diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template index 2643997e4f1c..461463b3bc30 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.19.7 +version=3.20.0 revision=1 wrksrc="cmake-${version}" build_style=cmake @@ -17,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=9c06b2ddf7c337e31d8201f6ebcd3bba86a9a033976a9aee207fe0c6971f4755 # XXX: cmake is broken if cmake was built with -GNinja # https://bugs.gentoo.org/596460