From 6eaae89e99dda29b143a812fad06e27fb2f2bdd7 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Thu, 19 Nov 2020 19:18:01 -0600 Subject: [PATCH 1/3] cmake-gui: update to 3.19.0 --- srcpkgs/cmake-gui/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template index 0dff4e8c853..6d4ad27031b 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,11 @@ 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 do_install() { # We are only interested in cmake-gui. From 9480962ba6d0bd5835167acdf81d51d6e613ae37 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Thu, 19 Nov 2020 19:02:23 -0600 Subject: [PATCH 2/3] cmake: update to 3.19.0 --- srcpkgs/cmake/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template index 0955f2595fa..24dc0785af9 100644 --- a/srcpkgs/cmake/template +++ b/srcpkgs/cmake/template @@ -1,6 +1,6 @@ # Template file for 'cmake' pkgname=cmake -version=3.18.4 +version=3.19.0 revision=1 build_style=cmake configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake @@ -20,7 +20,7 @@ maintainer="Nathan Owens " license="LGPL-2.1-or-later, BSD-3-Clause" homepage="https://www.cmake.org" distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz" -checksum=597c61358e6a92ecbfad42a9b5321ddd801fc7e7eca08441307c9138382d4f77 +checksum=fdda688155aa7e72b7c63ef6f559fca4b6c07382ea6dca0beb5f45aececaf493 pre_check() { # use ctest of this build instead of requirig cmake to test cmake... From 8c3abefe3b44b3ebda8bf3175b6f7d5cf733edf0 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Fri, 20 Nov 2020 18:24:28 -0600 Subject: [PATCH 3/3] cmake-bootstrap: update to 3.19.0 --- ...001-We-only-want-a-half-baked-cmake.patch} | 48 +++++++++++++------ .../0002-Fix-undefined-cmake_doc_dir.patch | 18 +++++++ srcpkgs/cmake-bootstrap/template | 6 +-- 3 files changed, 54 insertions(+), 18 deletions(-) rename srcpkgs/cmake-bootstrap/patches/{only-want-half-baked-cmake.patch => 0001-We-only-want-a-half-baked-cmake.patch} (73%) create mode 100644 srcpkgs/cmake-bootstrap/patches/0002-Fix-undefined-cmake_doc_dir.patch diff --git a/srcpkgs/cmake-bootstrap/patches/only-want-half-baked-cmake.patch b/srcpkgs/cmake-bootstrap/patches/0001-We-only-want-a-half-baked-cmake.patch similarity index 73% rename from srcpkgs/cmake-bootstrap/patches/only-want-half-baked-cmake.patch rename to srcpkgs/cmake-bootstrap/patches/0001-We-only-want-a-half-baked-cmake.patch index 07279cf6887..5a7264cef82 100644 --- a/srcpkgs/cmake-bootstrap/patches/only-want-half-baked-cmake.patch +++ b/srcpkgs/cmake-bootstrap/patches/0001-We-only-want-a-half-baked-cmake.patch @@ -1,17 +1,27 @@ +From 87468f753d9732eac35a80217638a51cd106e0eb Mon Sep 17 00:00:00 2001 +From: Nathan Owens +Date: Fri, 20 Nov 2020 18:55:09 -0600 +Subject: We only want a half-baked-cmake + +--- + Source/cmSystemTools.cxx | 7 +---- + bootstrap | 67 ++-------------------------------------- + 2 files changed, 3 insertions(+), 71 deletions(-) + diff --git Source/cmSystemTools.cxx Source/cmSystemTools.cxx -index 1e78d36..a678122 100644 +index 97440d2..747cedc 100644 --- Source/cmSystemTools.cxx +++ Source/cmSystemTools.cxx -@@ -1988,7 +1988,7 @@ void cmSystemTools::FindCMakeResources(const char* argv0) +@@ -2141,7 +2141,7 @@ void cmSystemTools::FindCMakeResources(const char* argv0) #ifdef CMAKE_BOOTSTRAP // The bootstrap cmake does not provide the other tools, // so use the directory where they are about to be built. - exe_dir = CMAKE_BOOTSTRAP_BINARY_DIR "/bin"; -+ // this cmake will be installed to system directory ++ // this cmake will be installed to system directory #endif cmSystemToolsCTestCommand = cmStrCat(exe_dir, "/ctest", cmSystemTools::GetExecutableExtension()); -@@ -2010,7 +2010,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0) +@@ -2163,7 +2163,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0) cmSystemToolsCMClDepsCommand.clear(); } @@ -19,8 +29,8 @@ index 1e78d36..a678122 100644 // Install tree has // - "/cmake" // - "" -@@ -2041,10 +2040,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0) - } +@@ -2204,10 +2203,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0) + cmSystemToolsHTMLDoc = cmStrCat(dir, "/Utilities/Sphinx/html"); } } -#else @@ -31,10 +41,10 @@ index 1e78d36..a678122 100644 std::string const& cmSystemTools::GetCMakeCommand() diff --git bootstrap bootstrap -index 04067dc..832a7ab 100755 +index 7ec3687..4500b6e 100755 --- bootstrap +++ bootstrap -@@ -812,14 +812,6 @@ cmake_try_run () +@@ -833,14 +833,6 @@ cmake_try_run () echo "Test failed to produce executable" return 2 fi @@ -49,7 +59,7 @@ index 04067dc..832a7ab 100755 return 0 } -@@ -839,13 +831,6 @@ cmake_try_make () +@@ -860,14 +852,6 @@ cmake_try_make () echo "${COMPILER} does not produce output" return 2 fi @@ -60,10 +70,11 @@ index 04067dc..832a7ab 100755 - echo "${MAKE_PROC} produces strange executable" - return 3 - fi - echo "${MAKE_PROC} works" +- echo "${MAKE_PROC} works" return 0 } -@@ -1444,8 +1429,8 @@ cmake_report cmVersionConfig.h${_tmp} "#define CMake_VERSION \"${cmake_version}\ + +@@ -1554,8 +1538,8 @@ cmake_report cmVersionConfig.h${_tmp} "#define CMake_VERSION \"${cmake_version}\ cmake_report cmConfigure.h${_tmp} "#define CMAKE_BOOTSTRAP_SOURCE_DIR \"${CMAKE_BOOTSTRAP_SOURCE_DIR}\"" cmake_report cmConfigure.h${_tmp} "#define CMAKE_BOOTSTRAP_BINARY_DIR \"${CMAKE_BOOTSTRAP_BINARY_DIR}\"" cmake_report cmConfigure.h${_tmp} "#define CMake_DEFAULT_RECURSION_LIMIT 400" @@ -73,8 +84,8 @@ index 04067dc..832a7ab 100755 +cmake_report cmConfigure.h${_tmp} "#define CMAKE_DATA_DIR \"$cmake_data_dir\"" cmake_report cmConfigure.h${_tmp} "#define CM_FALLTHROUGH" - if ${cmake_system_mingw}; then -@@ -1691,45 +1676,3 @@ if test -f "${cmake_init_file}"; then + if test "${cmake_bootstrap_generator}" = "Ninja"; then +@@ -1932,50 +1916,3 @@ if test -f "${cmake_init_file}"; then cat "${cmake_init_file}" >> "${cmake_bootstrap_dir}/InitialCacheFlags.cmake" fi ) @@ -82,10 +93,15 @@ index 04067dc..832a7ab 100755 -echo "---------------------------------------------" - -# Run make to build bootstrap cmake +-if test "${cmake_bootstrap_generator}" = "Ninja"; then +- ninja_v=-v +-else +- ninja_v= +-fi -if test "x${cmake_parallel_make}" != "x"; then -- ${cmake_make_processor} ${cmake_make_flags} +- ${cmake_make_processor} ${cmake_make_flags} ${ninja_v} -else -- ${cmake_make_processor} +- ${cmake_make_processor} ${ninja_v} -fi -RES=$? -if test "${RES}" -ne "0"; then @@ -120,3 +136,5 @@ index 04067dc..832a7ab 100755 - -# And we are done. Now just run make -echo "CMake has bootstrapped. Now run ${cmake_make_processor}." +-- +2.29.2 diff --git a/srcpkgs/cmake-bootstrap/patches/0002-Fix-undefined-cmake_doc_dir.patch b/srcpkgs/cmake-bootstrap/patches/0002-Fix-undefined-cmake_doc_dir.patch new file mode 100644 index 00000000000..efbbfc41867 --- /dev/null +++ b/srcpkgs/cmake-bootstrap/patches/0002-Fix-undefined-cmake_doc_dir.patch @@ -0,0 +1,18 @@ +Gives CMAKE_DOC_DIR undefined, this is half-baked cmake +so don't truly need +--- +diff --git Source/cmSystemTools.cxx Source/cmSystemTools.cxx +index 747cedc..7c516d8 100644 +--- Source/cmSystemTools.cxx ++++ Source/cmSystemTools.cxx +@@ -2171,10 +2171,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0) + std::string const prefix = + exe_dir.substr(0, exe_dir.size() - cmStrLen(CMAKE_BIN_DIR)); + cmSystemToolsCMakeRoot = cmStrCat(prefix, CMAKE_DATA_DIR); +- if (cmSystemTools::FileExists( +- cmStrCat(prefix, CMAKE_DOC_DIR "/html/index.html"))) { +- cmSystemToolsHTMLDoc = cmStrCat(prefix, CMAKE_DOC_DIR "/html"); +- } + } + if (cmSystemToolsCMakeRoot.empty() || + !cmSystemTools::FileExists( diff --git a/srcpkgs/cmake-bootstrap/template b/srcpkgs/cmake-bootstrap/template index 8ae4e76dce5..5f68785ad72 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.18.2 +version=3.19.0 revision=1 wrksrc=cmake-$version bootstrap=yes @@ -9,14 +9,14 @@ configure_args="--prefix=/usr --datadir=share/$pkgname --bindir=bin --system-libs --no-system-curl --no-system-jsoncpp --no-system-nghttp2 --no-system-librhash --no-system-libuv --no-system-expat --no-qt-gui ${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}" -make_build_args="-C Bootstrap.cmk" +make_build_args="-C Bootstrap.cmk DOCDIR=/usr/share/doc" makedepends="libarchive-devel" short_desc="CMake (for bootstrapping only, not for normal usage)" 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=5d4e40fc775d3d828c72e5c45906b4d9b59003c9433ff1b36a1cb552bbd51d7e +checksum=fdda688155aa7e72b7c63ef6f559fca4b6c07382ea6dca0beb5f45aececaf493 conflicts="cmake>=0" CFLAGS="-DCMAKE_USE_SYSTEM_ZLIB -DCMAKE_USE_SYSTEM_LIBARCHIVE"