From 74a5fbc577d48e9e8667937c75d25b9adac9d032 Mon Sep 17 00:00:00 2001
From: Yaksh Bariya <yakshbari4@gmail.com>
Date: Sun, 28 Nov 2021 16:04:41 +0530
Subject: [PATCH] cmake: bump to 3.22.0

---
 packages/cmake/Source-cmake.cxx.patch     | 22 ----------------------
 packages/cmake/build.sh                   |  5 ++---
 scripts/build/setup/termux_setup_cmake.sh |  6 +++---
 3 files changed, 5 insertions(+), 28 deletions(-)
 delete mode 100644 packages/cmake/Source-cmake.cxx.patch

diff --git a/packages/cmake/Source-cmake.cxx.patch b/packages/cmake/Source-cmake.cxx.patch
deleted file mode 100644
index 06c6bdacf..000000000
--- a/packages/cmake/Source-cmake.cxx.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/Source/cmake.cxx b/Source/cmake.cxx
-index a99d9a633..55ae9d254 100644
---- a/Source/cmake.cxx
-+++ b/Source/cmake.cxx
-@@ -109,7 +109,7 @@
- #  include "cmExtraEclipseCDT4Generator.h"
- #endif
- 
--#if defined(__linux__) || defined(_WIN32)
-+#if (defined(__linux__) && !defined(__ANDROID__)) || defined(_WIN32)
- #  include "cmGlobalGhsMultiGenerator.h"
- #endif
- 
-@@ -1982,7 +1982,7 @@ void cmake::AddDefaultGenerators()
- #endif
-   this->Generators.push_back(cmGlobalUnixMakefileGenerator3::NewFactory());
- #if !defined(CMAKE_BOOTSTRAP)
--#  if defined(__linux__) || defined(_WIN32)
-+#  if (defined(__linux__) && !defined(__ANDROID__)) || defined(_WIN32)
-   this->Generators.push_back(cmGlobalGhsMultiGenerator::NewFactory());
- #  endif
-   this->Generators.push_back(cmGlobalNinjaGenerator::NewFactory());
diff --git a/packages/cmake/build.sh b/packages/cmake/build.sh
index a177fab5c..1cba9218a 100644
--- a/packages/cmake/build.sh
+++ b/packages/cmake/build.sh
@@ -3,10 +3,9 @@ TERMUX_PKG_DESCRIPTION="Family of tools designed to build, test and package soft
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_MAINTAINER="@termux"
 # When updating version here, please update termux_setup_cmake.sh as well.
-TERMUX_PKG_VERSION=3.21.3
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_VERSION=3.22.0
 TERMUX_PKG_SRCURL=https://www.cmake.org/files/v${TERMUX_PKG_VERSION:0:4}/cmake-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=d14d06df4265134ee42c4d50f5a60cb8b471b7b6a47da8e5d914d49dd783794f
+TERMUX_PKG_SHA256=998c7ba34778d2dfdb3df8a695469e24b11e2bfa21fbe41b361a3f45e1c9345e
 TERMUX_PKG_DEPENDS="libarchive, libc++, libcurl, libexpat, jsoncpp, libuv, rhash, make, clang, zlib"
 TERMUX_PKG_FORCE_CMAKE=true
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DKWSYS_LFS_WORKS=ON -DBUILD_CursesDialog=ON"
diff --git a/scripts/build/setup/termux_setup_cmake.sh b/scripts/build/setup/termux_setup_cmake.sh
index b7a27dc5a..cff2e2b13 100644
--- a/scripts/build/setup/termux_setup_cmake.sh
+++ b/scripts/build/setup/termux_setup_cmake.sh
@@ -1,6 +1,6 @@
 termux_setup_cmake() {
-	local TERMUX_CMAKE_MAJORVESION=3.21
-	local TERMUX_CMAKE_MINORVERSION=2
+	local TERMUX_CMAKE_MAJORVESION=3.22
+	local TERMUX_CMAKE_MINORVERSION=0
 	local TERMUX_CMAKE_VERSION=$TERMUX_CMAKE_MAJORVESION.$TERMUX_CMAKE_MINORVERSION
 	local TERMUX_CMAKE_TARNAME=cmake-${TERMUX_CMAKE_VERSION}-linux-x86_64.tar.gz
 	local TERMUX_CMAKE_TARFILE=$TERMUX_PKG_TMPDIR/$TERMUX_CMAKE_TARNAME
@@ -16,7 +16,7 @@ termux_setup_cmake() {
 		if [ ! -d "$TERMUX_CMAKE_FOLDER" ]; then
 			termux_download https://cmake.org/files/v$TERMUX_CMAKE_MAJORVESION/$TERMUX_CMAKE_TARNAME \
 				"$TERMUX_CMAKE_TARFILE" \
-				d5517d949eaa8f10a149ca250e811e1473ee3f6f10935f1f69596a1e184eafc1
+				dc73115520d13bb64202383d3df52bc3d6bbb8422ecc5b2c05f803491cb215b0
 			rm -Rf "$TERMUX_PKG_TMPDIR/cmake-${TERMUX_CMAKE_VERSION}-linux-x86_64"
 			tar xf "$TERMUX_CMAKE_TARFILE" -C "$TERMUX_PKG_TMPDIR"
 			mv "$TERMUX_PKG_TMPDIR/cmake-${TERMUX_CMAKE_VERSION}-linux-x86_64" \