From 79f78f185c9c14fb4d19560c003298e2cc92220d45acaba5c09d27ae603782ba Mon Sep 17 00:00:00 2001 From: Simon Lees Date: Sat, 1 Aug 2020 05:37:54 +0000 Subject: [PATCH] Accepting request 823779 from home:AndreasStieger:branches:devel:tools:building cmake 3.18.1 OBS-URL: https://build.opensuse.org/request/show/823779 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=423 --- cmake-3.18.0-SHA-256.txt | 10 --------- cmake-3.18.0-SHA-256.txt.asc | 16 -------------- cmake-3.18.0.tar.gz | 3 --- cmake-3.18.1-SHA-256.txt | 10 +++++++++ cmake-3.18.1-SHA-256.txt.asc | 16 ++++++++++++++ cmake-3.18.1.tar.gz | 3 +++ cmake.changes | 9 ++++++++ cmake.spec | 4 +--- no-system-nghttp2.patch | 43 ------------------------------------ 9 files changed, 39 insertions(+), 75 deletions(-) delete mode 100644 cmake-3.18.0-SHA-256.txt delete mode 100644 cmake-3.18.0-SHA-256.txt.asc delete mode 100644 cmake-3.18.0.tar.gz create mode 100644 cmake-3.18.1-SHA-256.txt create mode 100644 cmake-3.18.1-SHA-256.txt.asc create mode 100644 cmake-3.18.1.tar.gz delete mode 100644 no-system-nghttp2.patch diff --git a/cmake-3.18.0-SHA-256.txt b/cmake-3.18.0-SHA-256.txt deleted file mode 100644 index 5541829..0000000 --- a/cmake-3.18.0-SHA-256.txt +++ /dev/null @@ -1,10 +0,0 @@ -3cd3893675d345f0d5a5e8895f0f346ad2ad1688b78f9d5f6ea0a85555786204 cmake-3.18.0-Darwin-x86_64.dmg -eb68a0d8c28faae347135c34594ff0591c7adaf5a23bafb5a640273af741955c cmake-3.18.0-Darwin-x86_64.tar.gz -a417f70d146bb4811dfe11c2ad15487f3c84e64f435c82aea7913496a1464788 cmake-3.18.0-Linux-x86_64.sh -4d9a9d3351161073a67e49366d701b6fa4b0343781982dc5eef08a02a750d403 cmake-3.18.0-Linux-x86_64.tar.gz -a59b9f77809dd40dce0df44fe7437deecd289264f3738d9294183ce56766f00e cmake-3.18.0-win32-x86.msi -8cc217b2cb01a69ce0c735d77a2d4e96199d6694452bbb43ea43696bf80e7daa cmake-3.18.0-win32-x86.zip -1597eef91b39fe4b34bab506158e34aa3a89490c519c97ac75a7c5d45885e345 cmake-3.18.0-win64-x64.msi -a00307a70d5dd133d6788915f2c6ea4b1946bf3a1eb06a686b088a65cfe7c0d6 cmake-3.18.0-win64-x64.zip -83b4ffcb9482a73961521d2bafe4a16df0168f03f56e6624c419c461e5317e29 cmake-3.18.0.tar.gz -07f936f086de545b058069d46d2b3e41a2ef4d5071f3d1e4f02ea772f843867a cmake-3.18.0.zip diff --git a/cmake-3.18.0-SHA-256.txt.asc b/cmake-3.18.0-SHA-256.txt.asc deleted file mode 100644 index 242ed85..0000000 --- a/cmake-3.18.0-SHA-256.txt.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAl8O9QwACgkQLSzvEDSS -FoTMmQ//UM12NhGCOl716++TZiRpN0ffNY9E7DNBeCROr+eoGk+Wlqnl7bf8B3UA -QL6FtE/82mGEw8qPJiARJuAjpNLwobUyZx2hTkw9O002NK8hPk4mIuLm8DBu51eA -W2TN9A5njcgiaYt1GAyoWyIDs+uqkwexNh3r3Incykb7eaZjmNzls6+AI+hOdzjc -NWF8Fdslsau9Vbfkyjru9UcDaPPA/380jit1xOuKnZx+hJEguEkjLrq+xIXm0/Hl -N5n2I3kcmFNFsRD1+ryMU8Mr3RBVH1cdGbXb5z7Len1qM8OJcT9XxbllYZoau6Cu -BKjlZrnLIANf1ZYgVxDhd04PHefjLmAb1ulO8XVXd0Pn+2Yv/8NYIl/rYK7eJD+Y -eXEknVf9PnJR0GEO/yCDpseon59u+ifU+Ig47GiDOPhTDeGCDjZX6EUFrV/xtghK -8E4WU6XwyavLlCSoE35pzOW8ZQPmBycPLLbo/d6Sy1kpnEnaiRFtC40LN0aFuflM -lu2vY1XePpUjAjdOBOQTif+/lwW+HeONWeuHrMcphpAQ5b+YOT9sJc/PHZcjBYMh -ZM9j6kxHayDCTE5m4Bn4VcSosuQPd5D/wxMogDTbrPl4CFIHDgLXYVvhcqEWynQJ -In8L9Cotd8Pxn7mhRQ7YGcPL9j/6a9mbhBDnpjQfSC8Kzh9bGtk= -=KZ17 ------END PGP SIGNATURE----- diff --git a/cmake-3.18.0.tar.gz b/cmake-3.18.0.tar.gz deleted file mode 100644 index 74d3b46..0000000 --- a/cmake-3.18.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:83b4ffcb9482a73961521d2bafe4a16df0168f03f56e6624c419c461e5317e29 -size 8970116 diff --git a/cmake-3.18.1-SHA-256.txt b/cmake-3.18.1-SHA-256.txt new file mode 100644 index 0000000..3c8668c --- /dev/null +++ b/cmake-3.18.1-SHA-256.txt @@ -0,0 +1,10 @@ +9b475fe1e493cebaf3f822322a99d7e10729cadb78efabcf88b32c010b1a9f5d cmake-3.18.1-Darwin-x86_64.dmg +f5c5a1f82f94b8eedcab3a95510ba59f9b1f598cb82aaf6bf8c0d72d2b245f46 cmake-3.18.1-Darwin-x86_64.tar.gz +4d8a09493d5aaed17261a604df85bf5e7d6a28077b2ddc22ad4080148093ccbd cmake-3.18.1-Linux-x86_64.sh +537de8ad3a7fb4ec9b8517870db255802ad211aec00002c651e178848f7a769e cmake-3.18.1-Linux-x86_64.tar.gz +4fd7c04b9b2b51c12787f3f7d4ce12ffbc9b9ec516c19637d3fe518ade204f04 cmake-3.18.1-win32-x86.msi +1a20c049e094d9ad49caca4b4d713c75c924a3885ecec4ed3986344aab05b6eb cmake-3.18.1-win32-x86.zip +c2a20b146dc955870a1b51c4bae7b857e4eb811474c557e33eb97b1d4e41a415 cmake-3.18.1-win64-x64.msi +2c6c06da43c1088fc3a673e4440c8ebb1531bb6511134892c0589aa0b94f11ad cmake-3.18.1-win64-x64.zip +c0e3338bd37e67155b9d1e9526fec326b5c541f74857771b7ffed0c46ad62508 cmake-3.18.1.tar.gz +85240b37e59acfc797f7dad90c7aed64013c2c678e335f9cd021a7e016ad638c cmake-3.18.1.zip diff --git a/cmake-3.18.1-SHA-256.txt.asc b/cmake-3.18.1-SHA-256.txt.asc new file mode 100644 index 0000000..61618c4 --- /dev/null +++ b/cmake-3.18.1-SHA-256.txt.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIyBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAl8jBBUACgkQLSzvEDSS +FoTjEg/47v4beFZOpoZmcu/xP8hzZh+bfiy9AwoLk30ykFP4H6r8paXCfWaqigVl +prUOjgRZeULzXETNO4GwiW9HF6ic2NUIETI2VM3r9AwaZ3/AJ8kjDxMsHMhYf3Ht +DfQmuyG0p9gj2YKNurz5L7H3x5oqDi852zAoj9aI41wm2ZPPvsBxjmy2spgRPjwP +sUIJuz82NY6X7BJrr6nniyxeih9uLTpRtTzszR6PP00s0528c8loJ6HsdzBxs8fh +hxB23b3KDYQGvbw96VjfF6qgC9m3MQvG6Kiuaee+KQPnCSA4RI1+1yRv2SzAj39a +zJ9faaUBx8t32CpPJy1TMP1Hmkby4dcX/w1XUXa5MfEidRJIOj42C3cfaWcPYwxR +wcn29TS26UNyPNwQt7M+DEqgJHcx5uxKKzxK2Yb3jr5eHDGJ8vT7xhFZ9JH8XcNS +0dKlXqYmOi50bd6trCfaDpKwxECw6BFO6e1SvTCD/MukZS1lHGqMGVGV1QriyfYk +L8I9l6wLsSeInvAaldgfsi9ov7gnU2Pf0oj3wn34F5JttN/q0jpU7cSwY7Yehp9F +vNp0vDvHXhKcFed2+sxsOODRZBOsd0BZr+1B51O3uf9f2jIh7uSP635RQe0Vn9qE +6xkRT1R/z4PyFrhfH+EcHrEhZR84Ue6T5b+zDuyc35XRlLYu3Q== +=kEXM +-----END PGP SIGNATURE----- diff --git a/cmake-3.18.1.tar.gz b/cmake-3.18.1.tar.gz new file mode 100644 index 0000000..8312521 --- /dev/null +++ b/cmake-3.18.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c0e3338bd37e67155b9d1e9526fec326b5c541f74857771b7ffed0c46ad62508 +size 8969366 diff --git a/cmake.changes b/cmake.changes index 8738248..faacaff 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Jul 31 16:44:08 UTC 2020 - Andreas Stieger + +- cmake 3.18.1: + * Revert undocumented fix in 3.18.0 in the add_test() command + for special characters to avoid breaking existing projects that + worked around the issue. Will be reintroduced later +- drop no-system-nghttp2.patch, upstream + ------------------------------------------------------------------- Thu Jul 23 10:38:42 UTC 2020 - Dominique Leuenberger diff --git a/cmake.spec b/cmake.spec index 10e1807..c094243 100644 --- a/cmake.spec +++ b/cmake.spec @@ -37,7 +37,7 @@ %endif %define shortversion 3.18 Name: cmake%{?psuffix} -Version: 3.18.0 +Version: 3.18.1 Release: 0 Summary: Cross-platform make system License: BSD-3-Clause @@ -55,8 +55,6 @@ Patch0: cmake-fix-ruby-test.patch # Search for python interpreters from newest to oldest rather then picking up /usr/bin/python as first choice Patch1: feature-suse-python-interp-search-order.patch Patch2: cmake-fix-png-include-dir.patch -# Adding flag --no-system-nghttp2, will become part of 3.18.1 -Patch3: no-system-nghttp2.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: pkgconfig diff --git a/no-system-nghttp2.patch b/no-system-nghttp2.patch deleted file mode 100644 index d92a5ef..0000000 --- a/no-system-nghttp2.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 64bc82bb4dd80843f828602f33fd5255fb8d4d94 Mon Sep 17 00:00:00 2001 -From: Brad King -Date: Mon, 20 Jul 2020 10:12:46 -0400 -Subject: [PATCH] bootstrap: Add options to control use of system nghttp2 - -Add `bootstrap` options needed since commit 0b872fd4be (nghttp2: Build -the library within CMake for use by our curl, 2020-04-01, -v3.18.0-rc1~408^2~2). - -Fixes: #20987 ---- - bootstrap | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/bootstrap b/bootstrap -index fe7b2ad51b..18ab0737dc 100755 ---- a/bootstrap -+++ b/bootstrap -@@ -622,6 +622,8 @@ Configuration: - --no-system-bzip2 use cmake-provided bzip2 library (default) - --system-liblzma use system-installed liblzma library - --no-system-liblzma use cmake-provided liblzma library (default) -+ --system-nghttp2 use system-installed nghttp2 library -+ --no-system-nghttp2 use cmake-provided nghttp2 library (default) - --system-zstd use system-installed zstd library - --no-system-zstd use cmake-provided zstd library (default) - --system-libarchive use system-installed libarchive library -@@ -866,10 +868,10 @@ while test $# != 0; do - --init=*) cmake_init_file=`cmake_arg "$1"` ;; - --system-libs) cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARIES=1" ;; - --no-system-libs) cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARIES=0" ;; -- --system-bzip2|--system-curl|--system-expat|--system-jsoncpp|--system-libarchive|--system-librhash|--system-zlib|--system-liblzma|--system-zstd|--system-libuv) -+ --system-bzip2|--system-curl|--system-expat|--system-jsoncpp|--system-libarchive|--system-librhash|--system-zlib|--system-liblzma|--system-nghttp2|--system-zstd|--system-libuv) - lib=`cmake_arg "$1" "--system-"` - cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARY_`cmake_toupper $lib`=1" ;; -- --no-system-bzip2|--no-system-curl|--no-system-expat|--no-system-jsoncpp|--no-system-libarchive|--no-system-librhash|--no-system-zlib|--no-system-liblzma|--no-system-zstd|--no-system-libuv) -+ --no-system-bzip2|--no-system-curl|--no-system-expat|--no-system-jsoncpp|--no-system-libarchive|--no-system-librhash|--no-system-zlib|--no-system-liblzma|--no-system-nghttp2|--no-system-zstd|--no-system-libuv) - lib=`cmake_arg "$1" "--no-system-"` - cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARY_`cmake_toupper $lib`=0" ;; - --qt-gui) cmake_bootstrap_qt_gui="1" ;; --- -GitLab -