From 774997a88c743f5bebe4843a35b3ca322c07da99 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Fri, 10 Aug 2018 13:01:05 +0200
Subject: [PATCH] cmake: Update from 3.11.4 to 3.12.1

---
 build-package.sh                              |  6 ++---
 .../Source-Modules-FindLibUV.cmake.patch      | 23 -------------------
 packages/cmake/build.sh                       |  5 ++--
 3 files changed, 5 insertions(+), 29 deletions(-)
 delete mode 100644 packages/cmake/Source-Modules-FindLibUV.cmake.patch

diff --git a/build-package.sh b/build-package.sh
index 93b9eff59..a4e85b5ef 100755
--- a/build-package.sh
+++ b/build-package.sh
@@ -164,8 +164,8 @@ termux_setup_meson() {
 
 # Utility function to setup a current cmake build system
 termux_setup_cmake() {
-	local TERMUX_CMAKE_MAJORVESION=3.11
-	local TERMUX_CMAKE_MINORVERSION=4
+	local TERMUX_CMAKE_MAJORVESION=3.12
+	local TERMUX_CMAKE_MINORVERSION=1
 	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
@@ -173,7 +173,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" \
-				6dab016a6b82082b8bcd0f4d1e53418d6372015dd983d29367b9153f1a376435
+				f4c5caeed9841029895cfb5b1d71e77ea71949ac85737cbbc3a70c12df28854c
 		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" \
diff --git a/packages/cmake/Source-Modules-FindLibUV.cmake.patch b/packages/cmake/Source-Modules-FindLibUV.cmake.patch
deleted file mode 100644
index 587200440..000000000
--- a/packages/cmake/Source-Modules-FindLibUV.cmake.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 6ad09a5d14ef497cca653d303c3849f83aa0aca3
-Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
-Date:   Sat Jun 23 20:30:07 2018 +0200
-	
-FindLibUV: Also check uv/version.h for version detection
-
-Starting with libuv 1.21.0, libuv's headers were moved into a uv/ directory.
-Make FindLibUV aware of the file's new location for configuration to work.
-
-Upstream change: https://github.com/libuv/libuv/pull/1429
-
-diff -u -r ../cmake-3.11.4/Source/Modules/FindLibUV.cmake ./Source/Modules/FindLibUV.cmake
---- ../cmake-3.11.4/Source/Modules/FindLibUV.cmake	2018-06-14 12:57:31.000000000 +0000
-+++ ./Source/Modules/FindLibUV.cmake	2018-06-26 09:33:28.391957459 +0000
-@@ -63,6 +63,8 @@
- set(_LibUV_H_REGEX "#[ \t]*define[ \t]+UV_VERSION_(MAJOR|MINOR|PATCH)[ \t]+[0-9]+")
- if(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv-version.h")
-   file(STRINGS "${LibUV_INCLUDE_DIR}/uv-version.h" _LibUV_H REGEX "${_LibUV_H_REGEX}")
-+elseif(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv/version.h")
-+  file(STRINGS "${LibUV_INCLUDE_DIR}/uv/version.h" _LibUV_H REGEX "${_LibUV_H_REGEX}")
- elseif(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv.h")
-   file(STRINGS "${LibUV_INCLUDE_DIR}/uv.h" _LibUV_H REGEX "${_LibUV_H_REGEX}")
- else()
diff --git a/packages/cmake/build.sh b/packages/cmake/build.sh
index ac0b8c598..15c2385ca 100644
--- a/packages/cmake/build.sh
+++ b/packages/cmake/build.sh
@@ -1,8 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://cmake.org/
 TERMUX_PKG_DESCRIPTION="Family of tools designed to build, test and package software"
-TERMUX_PKG_VERSION=3.11.4
-TERMUX_PKG_REVISION=2
-TERMUX_PKG_SHA256=8f864e9f78917de3e1483e256270daabc4a321741592c5b36af028e72bff87f5
+TERMUX_PKG_VERSION=3.12.1
+TERMUX_PKG_SHA256=c53d5c2ce81d7a957ee83e3e635c8cda5dfe20c9d501a4828ee28e1615e57ab2
 TERMUX_PKG_SRCURL=https://www.cmake.org/files/v${TERMUX_PKG_VERSION:0:4}/cmake-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_DEPENDS="libarchive, libcurl, libexpat, jsoncpp, libuv, rhash, make, clang"
 TERMUX_PKG_FORCE_CMAKE=yes