From 2da511b045b0980a3513e8ca5a890eb26346103a Mon Sep 17 00:00:00 2001
From: psykose <alice@ayaya.dev>
Date: Tue, 18 Jul 2023 19:38:28 +0000
Subject: [PATCH] main/cmake: upgrade to 3.27.0
---
main/cmake/APKBUILD | 29 ++++++++++++++-----------
main/cmake/proto-23-rename.patch | 37 --------------------------------
2 files changed, 17 insertions(+), 49 deletions(-)
delete mode 100644 main/cmake/proto-23-rename.patch
diff --git a/main/cmake/APKBUILD b/main/cmake/APKBUILD
index 208e412a9d4d..35c37aad8db3 100644
--- a/main/cmake/APKBUILD
+++ b/main/cmake/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cmake
-pkgver=3.26.4
-pkgrel=3
+pkgver=3.27.0
+pkgrel=0
pkgdesc="Cross-platform, open-source make system"
url="https://www.cmake.org/"
arch="all"
@@ -33,16 +33,13 @@ case $pkgver in
*.*.*.*) _v=v${pkgver%.*.*};;
*.*.*) _v=v${pkgver%.*};;
esac
-source="https://www.cmake.org/files/$_v/cmake-$pkgver.tar.gz
- proto-23-rename.patch
- "
+source="https://www.cmake.org/files/$_v/cmake-$pkgver.tar.gz"
options="!check"
build() {
- # jsoncpp needs cmake to build so to avoid recursive build
- # dependency, we use the bundled version of jsoncpp.
- # Do NOT remove --no-system-jsoncpp unless you consulted
- # maintainer
+ # jsoncpp/cppdap needs cmake to build so to avoid recursive build
+ # dependency, we use the bundled version.
+ # Do NOT remove --no-system-jsoncpp or --no-system-cppdap
./bootstrap \
--prefix=/usr \
@@ -50,8 +47,17 @@ build() {
--datadir=/share/$pkgname \
--docdir=/share/doc/$pkgname \
--sphinx-man \
- --system-libs \
+ --no-system-cppdap \
--no-system-jsoncpp \
+ --system-bzip2 \
+ --system-curl \
+ --system-expat \
+ --system-libarchive \
+ --system-liblzma \
+ --system-librhash \
+ --system-libuv \
+ --system-nghttp2 \
+ --system-zlib \
--generator=Ninja \
--parallel="${JOBS:-2}"
ninja
@@ -86,6 +92,5 @@ vim() {
}
sha512sums="
-fe817c8d5e247db3f0a9a58ee37c466a47220100d9e90711cd5d06c223cef87e41d1a756e75d1537e5f8cd010dcb8971cbeab4684b1ac12bcecf84bf7b720167 cmake-3.26.4.tar.gz
-9210cd7821d63871b970b046fb6b8b4771806517829fbb58b17ef3ed611b6d4a5a310f35eb486c1c5d19bcd19b2f3ad177f121a1a5448b44241ea5a50c96fc52 proto-23-rename.patch
+8b5836ac1c1f1e741ebbf6c9a1c9dca322dfd963598838a8789cd926fc071bde2fc53e42b6a2d5d8697f12d96dbf2cebdf03817d7d84b68256ef80b779a27fed cmake-3.27.0.tar.gz
"
diff --git a/main/cmake/proto-23-rename.patch b/main/cmake/proto-23-rename.patch
deleted file mode 100644
index 43265243d468..000000000000
--- a/main/cmake/proto-23-rename.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Patch-Source: https://gitlab.kitware.com/cmake/cmake/-/commit/fc7dcc6a24ffd33b780104ebd9dbb115d306827e
---
-From fc7dcc6a24ffd33b780104ebd9dbb115d306827e Mon Sep 17 00:00:00 2001
-From: Jannik Beyerstedt <beyerstedt@consider-it.de>
-Date: Mon, 19 Jun 2023 17:29:47 +0200
-Subject: [PATCH] FindProtobuf: Support new version number scheme
-
-Protobuf changed it's version number scheme with version 21. The first number
-(usually the major version) is not synchronized between compiler and library
-version, but the second and third number are. See
-https://protobuf.dev/news/2022-05-06/ for more details.
-
-Fixes: #24847
----
- Modules/FindProtobuf.cmake | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/Modules/FindProtobuf.cmake b/Modules/FindProtobuf.cmake
-index c73a2d81ab0..b046fcc7334 100644
---- a/Modules/FindProtobuf.cmake
-+++ b/Modules/FindProtobuf.cmake
-@@ -499,7 +499,11 @@ if(Protobuf_INCLUDE_DIR)
- math(EXPR _PROTOBUF_MAJOR_VERSION "${Protobuf_LIB_VERSION} / 1000000")
- math(EXPR _PROTOBUF_MINOR_VERSION "${Protobuf_LIB_VERSION} / 1000 % 1000")
- math(EXPR _PROTOBUF_SUBMINOR_VERSION "${Protobuf_LIB_VERSION} % 1000")
-- set(Protobuf_VERSION "${_PROTOBUF_MAJOR_VERSION}.${_PROTOBUF_MINOR_VERSION}.${_PROTOBUF_SUBMINOR_VERSION}")
-+ if (_PROTOBUF_MINOR_VERSION GREATER_EQUAL "21")
-+ set(Protobuf_VERSION "${_PROTOBUF_MINOR_VERSION}.${_PROTOBUF_SUBMINOR_VERSION}")
-+ else()
-+ set(Protobuf_VERSION "${_PROTOBUF_MAJOR_VERSION}.${_PROTOBUF_MINOR_VERSION}.${_PROTOBUF_SUBMINOR_VERSION}")
-+ endif()
-
- if(Protobuf_DEBUG)
- message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
---
-GitLab
-
--
GitLab