* [PR PATCH] cmake stack update
@ 2021-04-01 0:38 sgn
2021-04-01 14:36 ` [PR PATCH] [Updated] cmake stack update 3.20.0 sgn
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: sgn @ 2021-04-01 0:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 349 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages cmake-stack-update
https://github.com/void-linux/void-packages/pull/29915
cmake stack update
- Rebuild all cmake a last time for #29459
A patch file from https://github.com/void-linux/void-packages/pull/29915.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cmake-stack-update-29915.patch --]
[-- Type: text/x-diff, Size: 3644 bytes --]
From eb40db42ba9db3193f031fbb22ee13bf6b01d266 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: Thu, 1 Apr 2021 07:36:47 +0700
Subject: [PATCH 1/3] cmake-bootstrap: update to 3.20.0.
---
srcpkgs/cmake-bootstrap/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cmake-bootstrap/template b/srcpkgs/cmake-bootstrap/template
index c97760473629..f9c6548ef0ad 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.19.7
+version=3.20.0
revision=1
wrksrc=cmake-$version
bootstrap=yes
@@ -16,7 +16,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
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=58a15f0d56a0afccc3cc5371234fce73fcc6c8f9dbd775d898e510b83175588e
+checksum=9c06b2ddf7c337e31d8201f6ebcd3bba86a9a033976a9aee207fe0c6971f4755
conflicts="cmake>=0"
CFLAGS="-DCMAKE_USE_SYSTEM_ZLIB -DCMAKE_USE_SYSTEM_LIBARCHIVE"
@@ -36,7 +36,6 @@ post_patch() {
rm -rf Utilities/cmexpat
rm -rf Utilities/cmlibarchive
rm -rf Utilities/cmliblzma
- rm -rf Utilities/cmlibrhash
rm -rf Utilities/cmnghttp2
rm -rf Utilities/cmzlib
rm -rf Utilities/cmzstd
From a3f286ab4a602e6ab927ef007db8d634fe33cfc4 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: Thu, 1 Apr 2021 07:16:39 +0700
Subject: [PATCH 2/3] cmake: update to 3.20.0.
---
srcpkgs/cmake/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index aa32cea5f048..93dbc971646c 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,6 +1,6 @@
# Template file for 'cmake'
pkgname=cmake
-version=3.19.7
+version=3.20.0
revision=1
build_style=cmake
configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake -DCMAKE_BUILD_TYPE=None
@@ -16,7 +16,7 @@ maintainer="Nathan Owens <ndowens04@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=58a15f0d56a0afccc3cc5371234fce73fcc6c8f9dbd775d898e510b83175588e
+checksum=9c06b2ddf7c337e31d8201f6ebcd3bba86a9a033976a9aee207fe0c6971f4755
export CMAKE_GENERATOR="Unix Makefiles"
From 90972da7a51697c543e19b0c7a357ec2ade1d6f9 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: Thu, 1 Apr 2021 07:36:50 +0700
Subject: [PATCH 3/3] cmake-gui: update to 3.20.0.
---
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 2643997e4f1c..461463b3bc30 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.19.7
+version=3.20.0
revision=1
wrksrc="cmake-${version}"
build_style=cmake
@@ -17,7 +17,7 @@ maintainer="Nathan Owens <ndowens@artixlinux.org>"
license="BSD-3-Clause"
homepage="https://www.cmake.org"
distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=58a15f0d56a0afccc3cc5371234fce73fcc6c8f9dbd775d898e510b83175588e
+checksum=9c06b2ddf7c337e31d8201f6ebcd3bba86a9a033976a9aee207fe0c6971f4755
# XXX: cmake is broken if cmake was built with -GNinja
# https://bugs.gentoo.org/596460
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] cmake stack update 3.20.0
2021-04-01 0:38 [PR PATCH] cmake stack update sgn
@ 2021-04-01 14:36 ` sgn
2021-04-01 14:48 ` sgn
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: sgn @ 2021-04-01 14:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 361 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages cmake-stack-update
https://github.com/void-linux/void-packages/pull/29915
cmake stack update 3.20.0
- Rebuild all cmake a last time for #29459
A patch file from https://github.com/void-linux/void-packages/pull/29915.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cmake-stack-update-29915.patch --]
[-- Type: text/x-diff, Size: 6967 bytes --]
From 02c99ba5fd3437f32824eb3fd3c671c9b7575016 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: Thu, 1 Apr 2021 21:33:44 +0700
Subject: [PATCH 1/3] cmake-bootstrap: update to 3.20.0.
---
srcpkgs/cmake-bootstrap/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cmake-bootstrap/template b/srcpkgs/cmake-bootstrap/template
index c97760473629..82f41f9d93bf 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.19.7
+version=3.20.0
revision=1
wrksrc=cmake-$version
bootstrap=yes
@@ -16,7 +16,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
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=58a15f0d56a0afccc3cc5371234fce73fcc6c8f9dbd775d898e510b83175588e
+checksum=9c06b2ddf7c337e31d8201f6ebcd3bba86a9a033976a9aee207fe0c6971f4755
conflicts="cmake>=0"
CFLAGS="-DCMAKE_USE_SYSTEM_ZLIB -DCMAKE_USE_SYSTEM_LIBARCHIVE"
From 1fb37fe98a174802a02329f779f1843c4fc1c13b 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: Thu, 1 Apr 2021 20:47:38 +0700
Subject: [PATCH 2/3] cmake: update to 3.20.0.
---
...ources-fix-for-CMAKE_BUILD_TYPE-None.patch | 33 +++++++++++++++++++
srcpkgs/cmake/template | 4 +--
2 files changed, 35 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/cmake/patches/0001-Tests-ConfigSources-fix-for-CMAKE_BUILD_TYPE-None.patch
diff --git a/srcpkgs/cmake/patches/0001-Tests-ConfigSources-fix-for-CMAKE_BUILD_TYPE-None.patch b/srcpkgs/cmake/patches/0001-Tests-ConfigSources-fix-for-CMAKE_BUILD_TYPE-None.patch
new file mode 100644
index 000000000000..074f60bfe54d
--- /dev/null
+++ b/srcpkgs/cmake/patches/0001-Tests-ConfigSources-fix-for-CMAKE_BUILD_TYPE-None.patch
@@ -0,0 +1,33 @@
+From 34be7b9e5adf6823310508245d186142fcc6c0a5 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: Thu, 1 Apr 2021 20:14:06 +0700
+Subject: [PATCH] Tests/ConfigSources: fix for CMAKE_BUILD_TYPE=None
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+- None is a valid CMAKE_BUILD_TYPE
+- Most of distros uses None as CMAKE_BUILD_TYPE
+- When CMAKE_BUILD_TYPE=None, main_other.cpp will be compiled and linked
+ into final executable, this program requires some symbols only exist
+ when CUSTOM_CFG_OTHER is defined.
+
+Let's define them when None is specified as CMAKE_BUILD_TYPE.
+---
+ Tests/ConfigSources/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git Tests/ConfigSources/CMakeLists.txt Tests/ConfigSources/CMakeLists.txt
+index a3d98f685f..84ef26b0fd 100644
+--- Tests/ConfigSources/CMakeLists.txt
++++ Tests/ConfigSources/CMakeLists.txt
+@@ -75,7 +75,7 @@ add_custom_command(APPEND
+ )
+ foreach(n RANGE 1 5)
+ set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
+- foreach(other Release RelWithDebInfo MinSizeRel)
++ foreach(other None Release RelWithDebInfo MinSizeRel)
+ set_property(SOURCE custom${n}_${other}.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_OTHER)
+ endforeach()
+ endforeach()
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index aa32cea5f048..93dbc971646c 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,6 +1,6 @@
# Template file for 'cmake'
pkgname=cmake
-version=3.19.7
+version=3.20.0
revision=1
build_style=cmake
configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake -DCMAKE_BUILD_TYPE=None
@@ -16,7 +16,7 @@ maintainer="Nathan Owens <ndowens04@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=58a15f0d56a0afccc3cc5371234fce73fcc6c8f9dbd775d898e510b83175588e
+checksum=9c06b2ddf7c337e31d8201f6ebcd3bba86a9a033976a9aee207fe0c6971f4755
export CMAKE_GENERATOR="Unix Makefiles"
From 3bf2b16b99175a8fb7a1c06ff31614d55b0cf092 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: Thu, 1 Apr 2021 21:33:47 +0700
Subject: [PATCH 3/3] cmake-gui: update to 3.20.0.
---
srcpkgs/cmake-gui/patches | 1 +
srcpkgs/cmake-gui/patches/musl-test.patch | 15 ---------------
srcpkgs/cmake-gui/template | 4 ++--
3 files changed, 3 insertions(+), 17 deletions(-)
create mode 120000 srcpkgs/cmake-gui/patches
delete mode 100644 srcpkgs/cmake-gui/patches/musl-test.patch
diff --git a/srcpkgs/cmake-gui/patches b/srcpkgs/cmake-gui/patches
new file mode 120000
index 000000000000..6f3ac554b361
--- /dev/null
+++ b/srcpkgs/cmake-gui/patches
@@ -0,0 +1 @@
+../cmake/patches
\ No newline at end of file
diff --git a/srcpkgs/cmake-gui/patches/musl-test.patch b/srcpkgs/cmake-gui/patches/musl-test.patch
deleted file mode 100644
index 4da8c2f9cfc6..000000000000
--- a/srcpkgs/cmake-gui/patches/musl-test.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-all-check.cmake.orig 2020-12-05 13:27:21.098078774 +0700
-+++ Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-all-check.cmake 2020-12-05 13:29:19.931553018 +0700
-@@ -33,9 +33,9 @@
- [[librunpath_parent_unresolved\.so]]
- [[librunpath_unresolved\.so]]
- )
--check_contents(deps/udeps1.txt "^${_check}$")
--check_contents(deps/udeps2.txt "^${_check}$")
--check_contents(deps/udeps3.txt "^${_check}$")
-+check_contents(deps/udeps1.txt "^(libc.so;)?${_check}$")
-+check_contents(deps/udeps2.txt "^(libc.so;)?${_check}$")
-+check_contents(deps/udeps3.txt "^(libc.so;)?${_check}$")
- set(_check
- "^libconflict\\.so:[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/conflict/libconflict\\.so;[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/conflict2/libconflict\\.so\n$"
- )
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 2643997e4f1c..461463b3bc30 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.19.7
+version=3.20.0
revision=1
wrksrc="cmake-${version}"
build_style=cmake
@@ -17,7 +17,7 @@ maintainer="Nathan Owens <ndowens@artixlinux.org>"
license="BSD-3-Clause"
homepage="https://www.cmake.org"
distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=58a15f0d56a0afccc3cc5371234fce73fcc6c8f9dbd775d898e510b83175588e
+checksum=9c06b2ddf7c337e31d8201f6ebcd3bba86a9a033976a9aee207fe0c6971f4755
# XXX: cmake is broken if cmake was built with -GNinja
# https://bugs.gentoo.org/596460
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] cmake stack update 3.20.0
2021-04-01 0:38 [PR PATCH] cmake stack update sgn
2021-04-01 14:36 ` [PR PATCH] [Updated] cmake stack update 3.20.0 sgn
@ 2021-04-01 14:48 ` sgn
2021-04-03 2:57 ` sgn
2021-04-03 2:58 ` [PR PATCH] [Merged]: " sgn
3 siblings, 0 replies; 6+ messages in thread
From: sgn @ 2021-04-01 14:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 361 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages cmake-stack-update
https://github.com/void-linux/void-packages/pull/29915
cmake stack update 3.20.0
- Rebuild all cmake a last time for #29459
A patch file from https://github.com/void-linux/void-packages/pull/29915.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cmake-stack-update-29915.patch --]
[-- Type: text/x-diff, Size: 7200 bytes --]
From e682c6fbf241119534b3a33a80704d36bbe3bc83 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: Thu, 1 Apr 2021 21:33:44 +0700
Subject: [PATCH 1/3] cmake-bootstrap: update to 3.20.0.
---
srcpkgs/cmake-bootstrap/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cmake-bootstrap/template b/srcpkgs/cmake-bootstrap/template
index c97760473629..f9c6548ef0ad 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.19.7
+version=3.20.0
revision=1
wrksrc=cmake-$version
bootstrap=yes
@@ -16,7 +16,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
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=58a15f0d56a0afccc3cc5371234fce73fcc6c8f9dbd775d898e510b83175588e
+checksum=9c06b2ddf7c337e31d8201f6ebcd3bba86a9a033976a9aee207fe0c6971f4755
conflicts="cmake>=0"
CFLAGS="-DCMAKE_USE_SYSTEM_ZLIB -DCMAKE_USE_SYSTEM_LIBARCHIVE"
@@ -36,7 +36,6 @@ post_patch() {
rm -rf Utilities/cmexpat
rm -rf Utilities/cmlibarchive
rm -rf Utilities/cmliblzma
- rm -rf Utilities/cmlibrhash
rm -rf Utilities/cmnghttp2
rm -rf Utilities/cmzlib
rm -rf Utilities/cmzstd
From b69e7202f1d983728346a6cc5b11071fab67339f 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: Thu, 1 Apr 2021 20:47:38 +0700
Subject: [PATCH 2/3] cmake: update to 3.20.0.
---
...ources-fix-for-CMAKE_BUILD_TYPE-None.patch | 33 +++++++++++++++++++
srcpkgs/cmake/template | 4 +--
2 files changed, 35 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/cmake/patches/0001-Tests-ConfigSources-fix-for-CMAKE_BUILD_TYPE-None.patch
diff --git a/srcpkgs/cmake/patches/0001-Tests-ConfigSources-fix-for-CMAKE_BUILD_TYPE-None.patch b/srcpkgs/cmake/patches/0001-Tests-ConfigSources-fix-for-CMAKE_BUILD_TYPE-None.patch
new file mode 100644
index 000000000000..074f60bfe54d
--- /dev/null
+++ b/srcpkgs/cmake/patches/0001-Tests-ConfigSources-fix-for-CMAKE_BUILD_TYPE-None.patch
@@ -0,0 +1,33 @@
+From 34be7b9e5adf6823310508245d186142fcc6c0a5 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: Thu, 1 Apr 2021 20:14:06 +0700
+Subject: [PATCH] Tests/ConfigSources: fix for CMAKE_BUILD_TYPE=None
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+- None is a valid CMAKE_BUILD_TYPE
+- Most of distros uses None as CMAKE_BUILD_TYPE
+- When CMAKE_BUILD_TYPE=None, main_other.cpp will be compiled and linked
+ into final executable, this program requires some symbols only exist
+ when CUSTOM_CFG_OTHER is defined.
+
+Let's define them when None is specified as CMAKE_BUILD_TYPE.
+---
+ Tests/ConfigSources/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git Tests/ConfigSources/CMakeLists.txt Tests/ConfigSources/CMakeLists.txt
+index a3d98f685f..84ef26b0fd 100644
+--- Tests/ConfigSources/CMakeLists.txt
++++ Tests/ConfigSources/CMakeLists.txt
+@@ -75,7 +75,7 @@ add_custom_command(APPEND
+ )
+ foreach(n RANGE 1 5)
+ set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
+- foreach(other Release RelWithDebInfo MinSizeRel)
++ foreach(other None Release RelWithDebInfo MinSizeRel)
+ set_property(SOURCE custom${n}_${other}.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_OTHER)
+ endforeach()
+ endforeach()
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index aa32cea5f048..93dbc971646c 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,6 +1,6 @@
# Template file for 'cmake'
pkgname=cmake
-version=3.19.7
+version=3.20.0
revision=1
build_style=cmake
configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake -DCMAKE_BUILD_TYPE=None
@@ -16,7 +16,7 @@ maintainer="Nathan Owens <ndowens04@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=58a15f0d56a0afccc3cc5371234fce73fcc6c8f9dbd775d898e510b83175588e
+checksum=9c06b2ddf7c337e31d8201f6ebcd3bba86a9a033976a9aee207fe0c6971f4755
export CMAKE_GENERATOR="Unix Makefiles"
From 3b9ae4ddf5ebcc3d714fee06e00c3af4a920ca57 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: Thu, 1 Apr 2021 21:33:47 +0700
Subject: [PATCH 3/3] cmake-gui: update to 3.20.0.
---
srcpkgs/cmake-gui/patches | 1 +
srcpkgs/cmake-gui/patches/musl-test.patch | 15 ---------------
srcpkgs/cmake-gui/template | 4 ++--
3 files changed, 3 insertions(+), 17 deletions(-)
create mode 120000 srcpkgs/cmake-gui/patches
delete mode 100644 srcpkgs/cmake-gui/patches/musl-test.patch
diff --git a/srcpkgs/cmake-gui/patches b/srcpkgs/cmake-gui/patches
new file mode 120000
index 000000000000..6f3ac554b361
--- /dev/null
+++ b/srcpkgs/cmake-gui/patches
@@ -0,0 +1 @@
+../cmake/patches
\ No newline at end of file
diff --git a/srcpkgs/cmake-gui/patches/musl-test.patch b/srcpkgs/cmake-gui/patches/musl-test.patch
deleted file mode 100644
index 4da8c2f9cfc6..000000000000
--- a/srcpkgs/cmake-gui/patches/musl-test.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-all-check.cmake.orig 2020-12-05 13:27:21.098078774 +0700
-+++ Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-all-check.cmake 2020-12-05 13:29:19.931553018 +0700
-@@ -33,9 +33,9 @@
- [[librunpath_parent_unresolved\.so]]
- [[librunpath_unresolved\.so]]
- )
--check_contents(deps/udeps1.txt "^${_check}$")
--check_contents(deps/udeps2.txt "^${_check}$")
--check_contents(deps/udeps3.txt "^${_check}$")
-+check_contents(deps/udeps1.txt "^(libc.so;)?${_check}$")
-+check_contents(deps/udeps2.txt "^(libc.so;)?${_check}$")
-+check_contents(deps/udeps3.txt "^(libc.so;)?${_check}$")
- set(_check
- "^libconflict\\.so:[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/conflict/libconflict\\.so;[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/conflict2/libconflict\\.so\n$"
- )
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 2643997e4f1c..461463b3bc30 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.19.7
+version=3.20.0
revision=1
wrksrc="cmake-${version}"
build_style=cmake
@@ -17,7 +17,7 @@ maintainer="Nathan Owens <ndowens@artixlinux.org>"
license="BSD-3-Clause"
homepage="https://www.cmake.org"
distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=58a15f0d56a0afccc3cc5371234fce73fcc6c8f9dbd775d898e510b83175588e
+checksum=9c06b2ddf7c337e31d8201f6ebcd3bba86a9a033976a9aee207fe0c6971f4755
# XXX: cmake is broken if cmake was built with -GNinja
# https://bugs.gentoo.org/596460
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] cmake stack update 3.20.0
2021-04-01 0:38 [PR PATCH] cmake stack update sgn
2021-04-01 14:36 ` [PR PATCH] [Updated] cmake stack update 3.20.0 sgn
2021-04-01 14:48 ` sgn
@ 2021-04-03 2:57 ` sgn
2021-04-03 2:58 ` [PR PATCH] [Merged]: " sgn
3 siblings, 0 replies; 6+ messages in thread
From: sgn @ 2021-04-03 2:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 361 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages cmake-stack-update
https://github.com/void-linux/void-packages/pull/29915
cmake stack update 3.20.0
- Rebuild all cmake a last time for #29459
A patch file from https://github.com/void-linux/void-packages/pull/29915.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cmake-stack-update-29915.patch --]
[-- Type: text/x-diff, Size: 4985 bytes --]
From 392c1eec4d0163186cfaa8b17b338fa417df894a 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: Thu, 1 Apr 2021 20:47:38 +0700
Subject: [PATCH 1/2] cmake: update to 3.20.0.
---
...onfigSources-fix-for-CMAKE_BUILD_TYPE-None.patch | 13 +++++++++++++
srcpkgs/cmake/template | 4 ++--
2 files changed, 15 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/cmake/patches/0001-Tests-ConfigSources-fix-for-CMAKE_BUILD_TYPE-None.patch
diff --git a/srcpkgs/cmake/patches/0001-Tests-ConfigSources-fix-for-CMAKE_BUILD_TYPE-None.patch b/srcpkgs/cmake/patches/0001-Tests-ConfigSources-fix-for-CMAKE_BUILD_TYPE-None.patch
new file mode 100644
index 000000000000..d0a2860cc86e
--- /dev/null
+++ b/srcpkgs/cmake/patches/0001-Tests-ConfigSources-fix-for-CMAKE_BUILD_TYPE-None.patch
@@ -0,0 +1,13 @@
+diff --git Tests/ConfigSources/CMakeLists.txt Tests/ConfigSources/CMakeLists.txt
+index a3d98f685f..84ef26b0fd 100644
+--- Tests/ConfigSources/CMakeLists.txt
++++ Tests/ConfigSources/CMakeLists.txt
+@@ -75,7 +75,7 @@ add_custom_command(APPEND
+ )
+ foreach(n RANGE 1 5)
+ set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
+- foreach(other Release RelWithDebInfo MinSizeRel)
++ foreach(other None Release RelWithDebInfo MinSizeRel)
+ set_property(SOURCE custom${n}_${other}.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_OTHER)
+ endforeach()
+ endforeach()
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index aa32cea5f048..93dbc971646c 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,6 +1,6 @@
# Template file for 'cmake'
pkgname=cmake
-version=3.19.7
+version=3.20.0
revision=1
build_style=cmake
configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake -DCMAKE_BUILD_TYPE=None
@@ -16,7 +16,7 @@ maintainer="Nathan Owens <ndowens04@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=58a15f0d56a0afccc3cc5371234fce73fcc6c8f9dbd775d898e510b83175588e
+checksum=9c06b2ddf7c337e31d8201f6ebcd3bba86a9a033976a9aee207fe0c6971f4755
export CMAKE_GENERATOR="Unix Makefiles"
From f8ba38f3b912d1f71a6a4b50eec8f6c995946d51 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: Thu, 1 Apr 2021 21:33:47 +0700
Subject: [PATCH 2/2] cmake-gui: update to 3.20.0.
---
srcpkgs/cmake-gui/patches | 1 +
srcpkgs/cmake-gui/patches/musl-test.patch | 15 ---------------
srcpkgs/cmake-gui/template | 4 ++--
3 files changed, 3 insertions(+), 17 deletions(-)
create mode 120000 srcpkgs/cmake-gui/patches
delete mode 100644 srcpkgs/cmake-gui/patches/musl-test.patch
diff --git a/srcpkgs/cmake-gui/patches b/srcpkgs/cmake-gui/patches
new file mode 120000
index 000000000000..6f3ac554b361
--- /dev/null
+++ b/srcpkgs/cmake-gui/patches
@@ -0,0 +1 @@
+../cmake/patches
\ No newline at end of file
diff --git a/srcpkgs/cmake-gui/patches/musl-test.patch b/srcpkgs/cmake-gui/patches/musl-test.patch
deleted file mode 100644
index 4da8c2f9cfc6..000000000000
--- a/srcpkgs/cmake-gui/patches/musl-test.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-all-check.cmake.orig 2020-12-05 13:27:21.098078774 +0700
-+++ Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-all-check.cmake 2020-12-05 13:29:19.931553018 +0700
-@@ -33,9 +33,9 @@
- [[librunpath_parent_unresolved\.so]]
- [[librunpath_unresolved\.so]]
- )
--check_contents(deps/udeps1.txt "^${_check}$")
--check_contents(deps/udeps2.txt "^${_check}$")
--check_contents(deps/udeps3.txt "^${_check}$")
-+check_contents(deps/udeps1.txt "^(libc.so;)?${_check}$")
-+check_contents(deps/udeps2.txt "^(libc.so;)?${_check}$")
-+check_contents(deps/udeps3.txt "^(libc.so;)?${_check}$")
- set(_check
- "^libconflict\\.so:[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/conflict/libconflict\\.so;[^;]*/Tests/RunCMake/file-GET_RUNTIME_DEPENDENCIES/linux-build/root-all/lib/conflict2/libconflict\\.so\n$"
- )
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 2643997e4f1c..461463b3bc30 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.19.7
+version=3.20.0
revision=1
wrksrc="cmake-${version}"
build_style=cmake
@@ -17,7 +17,7 @@ maintainer="Nathan Owens <ndowens@artixlinux.org>"
license="BSD-3-Clause"
homepage="https://www.cmake.org"
distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=58a15f0d56a0afccc3cc5371234fce73fcc6c8f9dbd775d898e510b83175588e
+checksum=9c06b2ddf7c337e31d8201f6ebcd3bba86a9a033976a9aee207fe0c6971f4755
# XXX: cmake is broken if cmake was built with -GNinja
# https://bugs.gentoo.org/596460
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Merged]: cmake stack update 3.20.0
2021-04-01 0:38 [PR PATCH] cmake stack update sgn
` (2 preceding siblings ...)
2021-04-03 2:57 ` sgn
@ 2021-04-03 2:58 ` sgn
3 siblings, 0 replies; 6+ messages in thread
From: sgn @ 2021-04-03 2:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 202 bytes --]
There's a merged pull request on the void-packages repository
cmake stack update 3.20.0
https://github.com/void-linux/void-packages/pull/29915
Description:
- Rebuild all cmake a last time for #29459
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PR PATCH] cmake stack update
@ 2021-02-24 14:55 sgn
0 siblings, 0 replies; 6+ messages in thread
From: sgn @ 2021-02-24 14:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1583 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages cmake-stack-update
https://github.com/void-linux/void-packages/pull/29030
cmake stack update
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/29030.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cmake-stack-update-29030.patch --]
[-- Type: text/x-diff, Size: 3375 bytes --]
From cba00babba2730b0d2c4952b99796ef174a31353 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: Wed, 24 Feb 2021 20:08:42 +0700
Subject: [PATCH 1/3] cmake-bootstrap: update to 3.19.5.
---
srcpkgs/cmake-bootstrap/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cmake-bootstrap/template b/srcpkgs/cmake-bootstrap/template
index 539033d6ffa..f9925ca6317 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.19.4
+version=3.19.5
revision=1
wrksrc=cmake-$version
bootstrap=yes
@@ -16,7 +16,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
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=7d0232b9f1c57e8de81f38071ef8203e6820fe7eec8ae46a1df125d88dbcc2e1
+checksum=c432296eb5dec6d71eae15d140f6297d63df44e9ffe3e453628d1dc8fc4201ce
conflicts="cmake>=0"
CFLAGS="-DCMAKE_USE_SYSTEM_ZLIB -DCMAKE_USE_SYSTEM_LIBARCHIVE"
From 7076918d65937e14b4cfd5fa09ac9a535ee3a65e 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, 16 Feb 2021 23:27:44 +0700
Subject: [PATCH 2/3] cmake: update to 3.19.5.
---
srcpkgs/cmake/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index e95cc40abc7..cf64920de5b 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,6 +1,6 @@
# Template file for 'cmake'
pkgname=cmake
-version=3.19.4
+version=3.19.5
revision=1
build_style=cmake
configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake -DCMAKE_BUILD_TYPE=None
@@ -16,7 +16,7 @@ maintainer="Nathan Owens <ndowens04@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=7d0232b9f1c57e8de81f38071ef8203e6820fe7eec8ae46a1df125d88dbcc2e1
+checksum=c432296eb5dec6d71eae15d140f6297d63df44e9ffe3e453628d1dc8fc4201ce
export CMAKE_GENERATOR="Unix Makefiles"
From f2917d3133e11b9070499603ad9dcfe38e1b429c 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: Wed, 24 Feb 2021 20:08:39 +0700
Subject: [PATCH 3/3] cmake-gui: update to 3.19.5.
---
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 369450ed3cd..afddeda3f0d 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.19.4
+version=3.19.5
revision=1
wrksrc="cmake-${version}"
build_style=cmake
@@ -16,7 +16,7 @@ maintainer="Nathan Owens <ndowens@artixlinux.org>"
license="BSD-3-Clause"
homepage="https://www.cmake.org"
distfiles="https://www.cmake.org/files/v${version%.*}/cmake-${version}.tar.gz"
-checksum=7d0232b9f1c57e8de81f38071ef8203e6820fe7eec8ae46a1df125d88dbcc2e1
+checksum=c432296eb5dec6d71eae15d140f6297d63df44e9ffe3e453628d1dc8fc4201ce
do_install() {
# We are only interested in cmake-gui.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-04-03 2:58 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-01 0:38 [PR PATCH] cmake stack update sgn
2021-04-01 14:36 ` [PR PATCH] [Updated] cmake stack update 3.20.0 sgn
2021-04-01 14:48 ` sgn
2021-04-03 2:57 ` sgn
2021-04-03 2:58 ` [PR PATCH] [Merged]: " sgn
-- strict thread matches above, loose matches on Subject: below --
2021-02-24 14:55 [PR PATCH] cmake stack update sgn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).