[-- Attachment #1: Type: text/plain, Size: 1194 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages cmake-update
https://github.com/void-linux/void-packages/pull/34990
cmake 3.22.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/34990.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cmake-update-34990.patch --]
[-- Type: text/x-diff, Size: 3426 bytes --]
From 4aa2c5512e7be76fb7bf69d80e63e81163b7e802 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 8 Jan 2022 10:58:20 +0700
Subject: [PATCH 1/2] cmake: update to 3.22.1.
---
srcpkgs/cmake/patches/ar-lwyu.patch | 20 --------------------
srcpkgs/cmake/template | 4 ++--
2 files changed, 2 insertions(+), 22 deletions(-)
delete mode 100644 srcpkgs/cmake/patches/ar-lwyu.patch
diff --git a/srcpkgs/cmake/patches/ar-lwyu.patch b/srcpkgs/cmake/patches/ar-lwyu.patch
deleted file mode 100644
index 3db40e27f7d3..000000000000
--- a/srcpkgs/cmake/patches/ar-lwyu.patch
+++ /dev/null
@@ -1,20 +0,0 @@
- Fix darktable build
-diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
-index 5a4c6521d8..55b804d643 100644
---- a/Source/cmNinjaNormalTargetGenerator.cxx
-+++ b/Source/cmNinjaNormalTargetGenerator.cxx
-@@ -1157,7 +1157,13 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement(
- this->AddModuleDefinitionFlag(linkLineComputer.get(), vars["LINK_FLAGS"],
- config);
- if (gt->GetPropertyAsBool("LINK_WHAT_YOU_USE")) {
-- vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
-+ switch (targetType) {
-+ case cmStateEnums::EXECUTABLE:
-+ case cmStateEnums::SHARED_LIBRARY:
-+ case cmStateEnums::MODULE_LIBRARY:
-+ vars["LINK_FLAGS"] += " -Wl,--no-as-needed";
-+ break;
-+ }
- }
- vars["LINK_FLAGS"] = globalGen->EncodeLiteral(vars["LINK_FLAGS"]);
-
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 396fb6419940..bbe602d66494 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,6 +1,6 @@
# Template file for 'cmake'
pkgname=cmake
-version=3.21.1
+version=3.22.1
revision=1
build_style=cmake
configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
@@ -16,7 +16,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="BSD-3-Clause, ICU"
homepage="https://www.cmake.org"
distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
-checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
+checksum=0e998229549d7b3f368703d20e248e7ee1f853910d42704aa87918c213ea82c0
replaces="cmake-bootstrap>=0"
if [ "$CROSS_BUILD" ]; then
From 7898ada7b3fcb4ab03458bd7c328cbc656a78354 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 11 Jan 2022 18:40:14 +0700
Subject: [PATCH 2/2] cmake-gui: update to 3.22.1.
---
srcpkgs/cmake-gui/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 336b67eeecf0..b31163b0aa46 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.21.1
+version=3.22.1
revision=1
wrksrc="cmake-${version}"
build_style=cmake
@@ -17,7 +17,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="BSD-3-Clause"
homepage="https://www.cmake.org"
distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
+checksum=0e998229549d7b3f368703d20e248e7ee1f853910d42704aa87918c213ea82c0
do_install() {
# We are only interested in cmake-gui.