From ed76223df712f6d2598debcaa8d60aca9233f7abea3f9ccc797d6b3ae8a97f49 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 19 Jul 2023 11:12:08 +0000 Subject: [PATCH 1/3] Accepting request 1099345 from home:mathletic:branches:devel:tools:building - Update to 3.27.0 OBS-URL: https://build.opensuse.org/request/show/1099345 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=539 --- cmake-3.26.4-SHA-256.txt | 17 ----------------- cmake-3.26.4-SHA-256.txt.asc | 16 ---------------- cmake-3.26.4.tar.gz | 3 --- cmake-3.27.0-SHA-256.txt | 17 +++++++++++++++++ cmake-3.27.0-SHA-256.txt.asc | 16 ++++++++++++++++ cmake-3.27.0.tar.gz | 3 +++ cmake-fix-png-include-dir.patch | 23 ----------------------- cmake.changes | 20 ++++++++++++++++++++ cmake.spec | 7 +++---- 9 files changed, 59 insertions(+), 63 deletions(-) delete mode 100644 cmake-3.26.4-SHA-256.txt delete mode 100644 cmake-3.26.4-SHA-256.txt.asc delete mode 100644 cmake-3.26.4.tar.gz create mode 100644 cmake-3.27.0-SHA-256.txt create mode 100644 cmake-3.27.0-SHA-256.txt.asc create mode 100644 cmake-3.27.0.tar.gz delete mode 100644 cmake-fix-png-include-dir.patch diff --git a/cmake-3.26.4-SHA-256.txt b/cmake-3.26.4-SHA-256.txt deleted file mode 100644 index d0b9cfb..0000000 --- a/cmake-3.26.4-SHA-256.txt +++ /dev/null @@ -1,17 +0,0 @@ -7a37de070aa382960037792e0fcc771828fda1fc95acc8940e77cfdeb607681a cmake-3.26.4-files-v1.json -173bf2b1fd96be330977800c738d06d14f37f2284498bfe73297204f70760800 cmake-3.26.4-linux-aarch64.sh -1c9843c92f40bee1a16baa12871693d3e190c9a222259a89e406d4d9aae6cf74 cmake-3.26.4-linux-aarch64.tar.gz -413e59e94b9a3eed2d73f8fc85520d505e514e95005471504d8bebe844970d67 cmake-3.26.4-linux-x86_64.sh -ba1e0dcc710e2f92be6263f9617510b3660fa9dc409ad2fb8190299563f952a0 cmake-3.26.4-linux-x86_64.tar.gz -83900cead2a78debab31ab3a5b665003e5e52cc687df8c9c4a96b5f7e1eb64b8 cmake-3.26.4-macos-universal.dmg -5417fb979c1f82aaffe4420112e2c84562c024b6683161afb520c9e378161340 cmake-3.26.4-macos-universal.tar.gz -eb4dc95b9b38b0d0fde6055a6cbf3ef41f88fc6605191498bbe064ea53f0cac9 cmake-3.26.4-macos10.10-universal.dmg -f30362daae58788ada07f9f0fe2b49a53dde4262e2d8fe73640045d9d6055183 cmake-3.26.4-macos10.10-universal.tar.gz -29113c28a20aafdec68bf68578952eaf50b811b6eca57b8ae324a31107113aa3 cmake-3.26.4-windows-arm64.msi -6a9b28f318e766e40ac032b7fd2064fa9e026ff329f0ea175cbc8b15af51c45c cmake-3.26.4-windows-arm64.zip -a7d76cbf44999ef73926984a275418bfdb98ebc4d99c2374e2148f2ec9106dc9 cmake-3.26.4-windows-i386.msi -342ca44f494985f8ef43676eb8a0404b2c68321036e28aa221ceab51d377b158 cmake-3.26.4-windows-i386.zip -566fed3fa51a274609677717d0a0f38ba69ab0b3d987df53c05392a13fc211c4 cmake-3.26.4-windows-x86_64.msi -62c35427104a4f8205226f72708d71334bd36a72cf72c60d0e3a766d71dcc78a cmake-3.26.4-windows-x86_64.zip -313b6880c291bd4fe31c0aa51d6e62659282a521e695f30d5cc0d25abbd5c208 cmake-3.26.4.tar.gz -833b70485508e775ae1c8b6efb60f4a0c68a349c8df79dd2f583c964534b509b cmake-3.26.4.zip diff --git a/cmake-3.26.4-SHA-256.txt.asc b/cmake-3.26.4-SHA-256.txt.asc deleted file mode 100644 index 5e35fa7..0000000 --- a/cmake-3.26.4-SHA-256.txt.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAmRmbSQACgkQLSzvEDSS -FoRJ4A/+KTAzf7MZ6ZGZNeouAMGG+aBhBy+AQVIVefFsn8He6bxYoQhiFPHTgh01 -VPkm4hBHxNAd8Jzux0jP9D8YTnYXOBIU+KdovdeixP4REa/8yLl4b1OsYwD6vwLF -g4tdd903IAqAoxjt1Nx9rzD7yHDEsGCl2B9JXwsffvDprj2YkqJ9CvU9OBrj47dY -QDombVposAAOryJem7WM6kiiYYp8B8STH1hswhHTThw4/C30uiNDT4off4j0fndh -CI9gJANk4NBTPLAeV+oGun+gyQKJfK+LwAHPvDWfoPaZ0xv6nkxxsAbINSaR21O2 -ua4MQ/OXoV1D/TnhuNv639tv0TWJ5ajRNpVcEVZ75bfuZbkblbFNQTLi+Og6zaq1 -ED9DgGIKX9xQKBMlQuTkz6t8FvpTfP/uAWf0ZxJ+T71P8cmtLC49VpyzxXrYOPxE -JNMj77YUbJkO0BcgIwrnfj22GxcyWXUhxDyBTHicNFKP8NEwxSI+FxpO7CmfUV9J -5FDi49hoxSz91HcQSWAVF5JsFj6XB3wJD3QkVfZKUt9tuhrx+mxtqWnFie8hXiRN -tkFPWfNQTkB9xAaBKAwSlvwNxMzDhmHoqmD6Kw+LfwC7na1iDJ7XJCS/rcTVI1Jz -e0L5z6RBz4zDGI29KhkXLZ6k2X3EhgmBAyfkN6jEz+pscE8R+14= -=SPt5 ------END PGP SIGNATURE----- diff --git a/cmake-3.26.4.tar.gz b/cmake-3.26.4.tar.gz deleted file mode 100644 index 0c586f0..0000000 --- a/cmake-3.26.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:313b6880c291bd4fe31c0aa51d6e62659282a521e695f30d5cc0d25abbd5c208 -size 10669686 diff --git a/cmake-3.27.0-SHA-256.txt b/cmake-3.27.0-SHA-256.txt new file mode 100644 index 0000000..8cdf94a --- /dev/null +++ b/cmake-3.27.0-SHA-256.txt @@ -0,0 +1,17 @@ +df7c8b201a4b0e0928422115d65f341f905e2dc4fc9c025176dd20a38e3349ff cmake-3.27.0-files-v1.json +9bb316123cfc6ac59ae6175d4004a3b1247a5456ac476328d4689e45d9df032a cmake-3.27.0-linux-aarch64.sh +97c2f8cf9e063a7acf9f15ed472d87c511bf5cb62d3e42b9c90524fb0c2e4748 cmake-3.27.0-linux-aarch64.tar.gz +b4cdcf94d06cd04e065cb0607535d76a4c12c167a6f99d3f4dae31f09bedb77c cmake-3.27.0-linux-x86_64.sh +89c7e74d29f442e4734954310e09dd12d13636991f2d90d0ed1bececb8bf9b9c cmake-3.27.0-linux-x86_64.tar.gz +a7c3d7da5b702db7783b72cc2295df4042b34edb8371290c1fc12c9b7e625880 cmake-3.27.0-macos-universal.dmg +35a5995e27975d0e57742a468c8bfde5152263f2a526313fa9046346957c34be cmake-3.27.0-macos-universal.tar.gz +1999a173d497444b09fa387c84072bc60593b670ba7cb7f8e42400ccb5f66ae6 cmake-3.27.0-macos10.10-universal.dmg +dd9a7a8d5bd7d20b694eda8ff9c31147a5e1faa3bca1099836cfa0f81f8d5809 cmake-3.27.0-macos10.10-universal.tar.gz +f2aaa37d309b5a19ecf395c5167f4bb4d8725532f5da7e343c7012bd80e7d9b1 cmake-3.27.0-windows-arm64.msi +9345cbbb25cb5e8f3c68db067151a013c628783edbfc6fcf622ae58900aa8ad3 cmake-3.27.0-windows-arm64.zip +2047479f87ba74891dfe4fd3addd3126754ceb9003ae27f26264f14fc60d66f8 cmake-3.27.0-windows-i386.msi +bb3c3ca83be02a410b10393d563ec1e83d2048fea5eb35e88efe5c75e239dac3 cmake-3.27.0-windows-i386.zip +5b18d0056a5e83de19e0793f6ad9934aa691630e02ddd16f71d2f11e3f3827bf cmake-3.27.0-windows-x86_64.msi +fc5f901ef4d438eafbe35b24c608d5de11e517f157b3b7ab8ebbaa7c3c0171d2 cmake-3.27.0-windows-x86_64.zip +aaeddb6b28b993d0a6e32c88123d728a17561336ab90e0bf45032383564d3cb8 cmake-3.27.0.tar.gz +0669bee468aa9b571584ef8e23fa20a3fbf714fa47889ccba34679316ee52217 cmake-3.27.0.zip diff --git a/cmake-3.27.0-SHA-256.txt.asc b/cmake-3.27.0-SHA-256.txt.asc new file mode 100644 index 0000000..7f53398 --- /dev/null +++ b/cmake-3.27.0-SHA-256.txt.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAmS22SMACgkQLSzvEDSS +FoT68w//b1E7o8yOFuJ+ZuAQ9GEWdsPB5ko+OSQ+ex5dA63orh3dQltYHqqjgQDt +9eg8L5K/OT82crSfpzZ1Zi0XVLXkkuUL9FRs7I83HPyMEZEJAZUJvuXAnluECLT6 +jLc5j1hVTegxgyQZHJ/KIG9JOqk3SYNpfxTYFTJnkYM8fvj1onKhTzcGuCLZ4VBf +i0UuT2uhB85kiPQMeUGPfi9M3J1TEqZJ/6ZurvuqPraxeiQLH9qr9q3M5J20RkJR +4EHB7FN1I0GW0ht7XM967z2V/26xZwdd4VOLaC7qBQ+/kvqu/e6G2Dkg6p5WbOrc +/aGcRBSzwhN+RvHzjCcNvAaHHHkgqWXl7YAfonokf3FTOFNz5rYXrosKwt9N+J8z +H+M03O72lEkZXOHam5+G3zMos0DfpndGCr/YCkKDWwiQzhEO3rpLuCeoWwr4IOu+ +hfySUEWk8PVxRkpQW2k07hMvLFaqYeL4AJXVSMt0DoT/9GQY+cCymOBVJLUA48mg +KfhIaWeQCy9cxFNGPoWO91ExvaiQaEj5OqGuSPUWwiKl/Se4FLWLLB+PyIcg+6pO +ki9y9fDR34TmNMIdQeGJVLpMSbnC0dKr86EXVJUxA2pihWrZwYI1Hnvia/TTC/Qp +w/aO3jqC3Bv81ducnyfxc3uYFGRMkgtLsyMUAUV24Q8NmIHJnNw= +=uin+ +-----END PGP SIGNATURE----- diff --git a/cmake-3.27.0.tar.gz b/cmake-3.27.0.tar.gz new file mode 100644 index 0000000..a4bd135 --- /dev/null +++ b/cmake-3.27.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aaeddb6b28b993d0a6e32c88123d728a17561336ab90e0bf45032383564d3cb8 +size 10977223 diff --git a/cmake-fix-png-include-dir.patch b/cmake-fix-png-include-dir.patch deleted file mode 100644 index 8abcbf3..0000000 --- a/cmake-fix-png-include-dir.patch +++ /dev/null @@ -1,23 +0,0 @@ -Index: cmake-3.26.2/Modules/FindPNG.cmake -=================================================================== ---- cmake-3.26.2.orig/Modules/FindPNG.cmake -+++ cmake-3.26.2/Modules/FindPNG.cmake -@@ -54,12 +54,16 @@ endif() - find_package(ZLIB ${_FIND_ZLIB_ARG}) - - if(ZLIB_FOUND) -- find_path(PNG_PNG_INCLUDE_DIR png.h PATH_SUFFIXES include/libpng) -+ set(_PNG_VERSION_SUFFIXES 17 16 15 14 12) -+ foreach(v IN LISTS _PNG_VERSION_SUFFIXES) -+ list(APPEND _PNG_INCLUDE_SUFFIXES libpng${v}) -+ endforeach() -+ find_path(PNG_PNG_INCLUDE_DIR png.h PATH_SUFFIXES include/libpng ${_PNG_INCLUDE_SUFFIXES}) -+ unset(_PNG_INCLUDE_SUFFIXES) - mark_as_advanced(PNG_PNG_INCLUDE_DIR) - - list(APPEND PNG_NAMES png libpng) - unset(PNG_NAMES_DEBUG) -- set(_PNG_VERSION_SUFFIXES 17 16 15 14 12) - if (PNG_FIND_VERSION MATCHES "^([0-9]+)\\.([0-9]+)(\\..*)?$") - set(_PNG_VERSION_SUFFIX_MIN "${CMAKE_MATCH_1}${CMAKE_MATCH_2}") - if (PNG_FIND_VERSION_EXACT) diff --git a/cmake.changes b/cmake.changes index 78f6888..ec1a96f 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Tue Jul 18 20:29:18 UTC 2023 - Christoph G + +- Update to 3.27.0 + * “cmake(1)” now supports interactive debugging of the CMake language. + See the “–debugger” option. + * The “SKIP_LINTING” source file property was added to suppress + target-wide code checks on specific sources. + * The “COMPILE_ONLY” generator expression was added to specify + compilation usage requirements without any linking requirements. + * The “FindCUDA” module, which has been deprecated since CMake 3.10, + has been removed by policy “CMP0146”. + * The “FindPythonInterp” and “FindPythonLibs” modules, which have been + deprecated since CMake 3.12, have been removed by policy “CMP0148”. + Port projects to “FindPython3”, “FindPython2”, or “FindPython”. + * “cmake –build $dir –verbose” will now print the working directory + and command line used to perform the build. +- Drop cmake-fix-png-include-dir.patch and glibc-236.patch as they + are included in this release + ------------------------------------------------------------------- Thu Jul 6 07:16:33 UTC 2023 - Dirk Müller diff --git a/cmake.spec b/cmake.spec index 413cad6..10bc54c 100644 --- a/cmake.spec +++ b/cmake.spec @@ -44,9 +44,9 @@ %else %bcond_with full %endif -%define shortversion 3.26 +%define shortversion 3.27 Name: cmake%{?psuffix} -Version: 3.26.4 +Version: 3.27.0 Release: 0 Summary: Cross-platform make system License: BSD-3-Clause @@ -63,8 +63,6 @@ Source99: README.SUSE 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 -Patch3: glibc-236.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -158,6 +156,7 @@ export CXXFLAGS="$CFLAGS" --docdir=/share/doc/packages/cmake \ --mandir=/share/man \ --system-libs \ + --no-system-cppdap \ %if %{with mini} --no-system-curl \ --no-system-nghttp2 \ From 58aec389610d383b761e2f49ba8de66da22f71ae760da1b97b0861bbb125c954 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 20 Jul 2023 12:09:27 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=540 --- glibc-236.patch | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 glibc-236.patch diff --git a/glibc-236.patch b/glibc-236.patch deleted file mode 100644 index 134bac3..0000000 --- a/glibc-236.patch +++ /dev/null @@ -1,18 +0,0 @@ -investigated under https://gitlab.kitware.com/cmake/cmake/-/issues/23881 - -Index: cmake-3.26.2/Modules/GetPrerequisites.cmake -=================================================================== ---- cmake-3.26.2.orig/Modules/GetPrerequisites.cmake -+++ cmake-3.26.2/Modules/GetPrerequisites.cmake -@@ -730,9 +730,9 @@ function(get_prerequisites target prereq - - if(gp_tool MATCHES "ldd$") - set(gp_cmd_args "") -- set(gp_regex "^[\t ]*[^\t ]+ =>[\t ]+([^\t\(]+)( \(.+\))?${eol_char}$") -+ set(gp_regex "^[\t ]*[^\t ]+ =>[\t ]+(/[^\t\(]+)( \(.+\))?${eol_char}$") - set(gp_regex_error "not found${eol_char}$") -- set(gp_regex_fallback "^[\t ]*([^\t ]+) => ([^\t ]+).*${eol_char}$") -+ set(gp_regex_fallback "^[\t ]*([^\t ]+) => (/[^\t ]+).*${eol_char}$") - set(gp_regex_cmp_count 1) - elseif(gp_tool MATCHES "otool$") - set(gp_cmd_args "-L") From 6b14f4500ca85e2270ab9b298d43794c31383caa280cc5887b162391af3b970f Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 21 Jul 2023 07:35:58 +0000 Subject: [PATCH 3/3] Accepting request 1099782 from home:mathletic:branches:devel:tools:building Add explanation in change log why we are using --no-system-cppdap OBS-URL: https://build.opensuse.org/request/show/1099782 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=541 --- cmake.changes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmake.changes b/cmake.changes index ec1a96f..ddae4d7 100644 --- a/cmake.changes +++ b/cmake.changes @@ -15,6 +15,8 @@ Tue Jul 18 20:29:18 UTC 2023 - Christoph G Port projects to “FindPython3”, “FindPython2”, or “FindPython”. * “cmake –build $dir –verbose” will now print the working directory and command line used to perform the build. +- Debug feature introduces new dependency to cppdap which is not + yet packaged. Thus we use cppdap code provided by CMake. - Drop cmake-fix-png-include-dir.patch and glibc-236.patch as they are included in this release