From 392c1eec4d0163186cfaa8b17b338fa417df894a 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 1/2] cmake: update to 3.20.0. --- ...onfigSources-fix-for-CMAKE_BUILD_TYPE-None.patch | 13 +++++++++++++ srcpkgs/cmake/template | 4 ++-- 2 files changed, 15 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 00000000000000..d0a2860cc86e39 --- /dev/null +++ b/srcpkgs/cmake/patches/0001-Tests-ConfigSources-fix-for-CMAKE_BUILD_TYPE-None.patch @@ -0,0 +1,13 @@ +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 aa32cea5f048d9..93dbc971646c41 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 f8ba38f3b912d1f71a6a4b50eec8f6c995946d51 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 2/2] 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 00000000000000..6f3ac554b36146 --- /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 4da8c2f9cfc671..00000000000000 --- 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 2643997e4f1c11..461463b3bc302d 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