diff --git a/53d523f2e11839bcbbdc9288b4f71c764d0efd5c.diff b/53d523f2e11839bcbbdc9288b4f71c764d0efd5c.diff new file mode 100644 index 0000000..c3b679f --- /dev/null +++ b/53d523f2e11839bcbbdc9288b4f71c764d0efd5c.diff @@ -0,0 +1,47 @@ +diff --git a/Source/cmQtAutoMocUic.cxx b/Source/cmQtAutoMocUic.cxx +index 535f786f41487e57fd3e9d547d22344b18b924a1..f5831628d3fe3c05b0bf4447036e5ac6bcdbdafc 100644 +--- a/Source/cmQtAutoMocUic.cxx ++++ b/Source/cmQtAutoMocUic.cxx +@@ -564,8 +564,7 @@ private: + // -- Generation + bool CreateDirectories(); + // -- Support for depfiles +- static std::vector dependenciesFromDepFile( +- const char* filePath); ++ std::vector dependenciesFromDepFile(const char* filePath); + + // -- Settings + BaseSettingsT BaseConst_; +@@ -2066,7 +2065,8 @@ void cmQtAutoMocUicT::JobCompileMocT::Process() + " does not exist."); + return; + } +- this->CacheEntry->Moc.Depends = dependenciesFromDepFile(depfile.c_str()); ++ this->CacheEntry->Moc.Depends = ++ this->Gen()->dependenciesFromDepFile(depfile.c_str()); + } + } + +@@ -2223,12 +2223,12 @@ void cmQtAutoMocUicT::JobDepFilesMergeT::Process() + this->MessagePath(this->BaseConst().DepFile.c_str()))); + } + auto processDepFile = +- [](const std::string& mocOutputFile) -> std::vector { ++ [this](const std::string& mocOutputFile) -> std::vector { + std::string f = mocOutputFile + ".d"; + if (!cmSystemTools::FileExists(f)) { + return {}; + } +- return dependenciesFromDepFile(f.c_str()); ++ return this->Gen()->dependenciesFromDepFile(f.c_str()); + }; + + std::vector dependencies = this->initialDependencies(); +@@ -2961,6 +2961,7 @@ bool cmQtAutoMocUicT::CreateDirectories() + std::vector cmQtAutoMocUicT::dependenciesFromDepFile( + const char* filePath) + { ++ std::lock_guard guard(this->CMakeLibMutex_); + auto const content = cmReadGccDepfile(filePath); + if (!content || content->empty()) { + return {}; diff --git a/cmake-3.19.7-SHA-256.txt b/cmake-3.19.7-SHA-256.txt deleted file mode 100644 index 5b83cea..0000000 --- a/cmake-3.19.7-SHA-256.txt +++ /dev/null @@ -1,14 +0,0 @@ -14e678126a266812151d739c71de61f8e9ac430d00c854c73e438ffa3e666d56 cmake-3.19.7-Linux-aarch64.sh -eb1cf718eca1d5bc212a0ef76d19a977b6b6481a795985b8741c31f866c88e09 cmake-3.19.7-Linux-aarch64.tar.gz -a591870c86a5e4eb750abc4f81602be0dafec92861c0d98c831a76ae42da14eb cmake-3.19.7-Linux-x86_64.sh -ba4a5f46aab500e0d8d952ee735dcfb0c870d326e851addc037c99eb1ea4b66c cmake-3.19.7-Linux-x86_64.tar.gz -6e42af03188b8cbbac787f94ed7c3e2c782b8085ad2a2cf936b3d2607be68cd2 cmake-3.19.7-macos-universal.dmg -52036f8450fabb69bedc3c3eccc58202ae9eefe8358fa383978c7b142f931fa5 cmake-3.19.7-macos-universal.tar.gz -68df7ce92833df9cf7ed7206246003e1438c06078b2c2f311a9c122502fe3f6b cmake-3.19.7-macos10.10-universal.dmg -ff398dd24941f4a8836d94c62161e94a5c2b5925db0027f29aa5588476921821 cmake-3.19.7-macos10.10-universal.tar.gz -44f752aaa8bb7999b7ae2c1bf8d57c2654160be6172cb27850269386edb77611 cmake-3.19.7-win32-x86.msi -7771205d94022787bc4c3a623629d236b10bf697315e9f92c214dd8b53e8746e cmake-3.19.7-win32-x86.zip -f2201af7e2839323f516ee334aa7adbbe4f944c8c4af4cceae70d0b47de9a5a1 cmake-3.19.7-win64-x64.msi -e6788d6e23b3026c37fcfa7658075d6b5f9113f26fae17fe372ad4a7ee62d5fd cmake-3.19.7-win64-x64.zip -58a15f0d56a0afccc3cc5371234fce73fcc6c8f9dbd775d898e510b83175588e cmake-3.19.7.tar.gz -8ec03430ca068a5f76872f1771531d2d4cd1cd455159597dc298f80c043988b9 cmake-3.19.7.zip diff --git a/cmake-3.19.7-SHA-256.txt.asc b/cmake-3.19.7-SHA-256.txt.asc deleted file mode 100644 index 8c1f423..0000000 --- a/cmake-3.19.7-SHA-256.txt.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAmBPbYIACgkQLSzvEDSS -FoSl+A//Se8VIiuCEIyTV/Q95KPR2KYrBiHGfy3dzJXXOWDb837iEDbCBS2FL/4y -vImfvglj/ICpVni1Gp+QQSNc5jJerT8+dSCufbz0IjBBgQmbMidIPuo+9Sy2ppHe -1MlH8KEtcypoVyaTxyAFgwcsCZcLkFaTyMJDWVcmSPsLn2wPz91+s9OPPdgm+eaN -1MjEE0VuaAqrHlS9pOVU5OyVcB3P0YSU6mdOovLbcB3B4nkxftdZ8YPuqKnAFMzP -BAmW+Z5H5hkfFhte5+qhPZe8US8yxavUIzp28ziGdxxBidBVKeXk6r9knc8hTECx -0aDliFzjyjv8Uzubv2GgBR6Cj6xkUobcK/TZUCyAGJ1fYnQMfdmOIVhh9ENdtW8X -MUNO/tgG0hJxMSokvFLjlq1N/Q/NhL5aYMrM8PNFwuVgUo7/c273WNF8pjAzzFUE -ubiE7gGsSAubaFK61bxxTSn5oHq49UsItHNjTKjxwAqWlj3rbToNc2Jk6kKk6H4w -j1HiUDhYjEmNcRzdGeAwQmWIicuPy4LZ79OskU+gA83uNaQDn7JEzcS/Ati219kT -784FTlA0M3LfglTvi8DD4rZNt2z1h4i5W5pRdKDpjgPptbt4PhdjG5aWTmAAsgdV -lXfhQHO6gPhC47F5xyqzPogq1CbTQp8vY8GQGExsUvcCbrISVBs= -=SOtz ------END PGP SIGNATURE----- diff --git a/cmake-3.19.7.tar.gz b/cmake-3.19.7.tar.gz deleted file mode 100644 index 7b4f8ff..0000000 --- a/cmake-3.19.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:58a15f0d56a0afccc3cc5371234fce73fcc6c8f9dbd775d898e510b83175588e -size 9271358 diff --git a/cmake-3.20.1-SHA-256.txt b/cmake-3.20.1-SHA-256.txt new file mode 100644 index 0000000..a14c7d3 --- /dev/null +++ b/cmake-3.20.1-SHA-256.txt @@ -0,0 +1,15 @@ +f8fe477a9c5144ce02fddd7ac0176a59ec2eba7a332b567ffcd069ac0f545b69 cmake-3.20.1-files-v1.json +2761a222c14a15b9bdf1bdb4a17c10806757b7ed3bc26a84523f042ec212b76c cmake-3.20.1-linux-aarch64.sh +5ad1f8139498a1956df369c401658ec787f63c8cb4e9759f2edaa51626a86512 cmake-3.20.1-linux-aarch64.tar.gz +d25a8e8b76c137ffd55fa28b7a803309a2c6992e30fa0f1cb2172d5b970106e2 cmake-3.20.1-linux-x86_64.sh +b8c141bd7a6d335600ab0a8a35e75af79f95b837f736456b5532f4d717f20a09 cmake-3.20.1-linux-x86_64.tar.gz +6ace6bdf340f2e63b09ee3e4c03bfd93a6737b04d6d0eb94d5af1fd10f5b5839 cmake-3.20.1-macos-universal.dmg +44143d47fdcc7fc3042576c6a8b661e3b65a18143666f74d6e8d93ca3ab5cd95 cmake-3.20.1-macos-universal.tar.gz +8bdcc31d18b8b61b6032f364e960e75d61ec05fe51dd809d42e5f34dcd537258 cmake-3.20.1-macos10.10-universal.dmg +89afcb79f58bb1f0bb840047c146c3fac8051829b6025c3dbe9b75799b27deb4 cmake-3.20.1-macos10.10-universal.tar.gz +5d8514868d12c209f6b4533f47d20cfed0e871e4ee648fb36244504ca00aba0a cmake-3.20.1-windows-i386.msi +650026534e66dabe0ed6be3422e86fabce5fa86d43927171ea8b8dfd0877fc9d cmake-3.20.1-windows-i386.zip +a2eb2811aada9f4830281aa407231b9295dcac4b18bdbefc35d9dd71775110e8 cmake-3.20.1-windows-x86_64.msi +9ed05401722f60e006420f5974c164795b321f0d8d8e7f2c0ed1180b5382201b cmake-3.20.1-windows-x86_64.zip +3f1808b9b00281df06c91dd7a021d7f52f724101000da7985a401678dfe035b0 cmake-3.20.1.tar.gz +cd7c575daea51c504a30340d42e03a4f2b29390d583a153b4285777f7ac85552 cmake-3.20.1.zip diff --git a/cmake-3.20.1-SHA-256.txt.asc b/cmake-3.20.1-SHA-256.txt.asc new file mode 100644 index 0000000..77f681f --- /dev/null +++ b/cmake-3.20.1-SHA-256.txt.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAmBu/FMACgkQLSzvEDSS +FoSFphAAhf1BdSwCHE9HeEzQ9k69/XlOL74SxiFSk4bsIp/CohYRCfX6LJqx7dZT +9JibBid2nx932DQatb3h60rTtrki4CpK2YulSPg7/3vkx894eYLfP0E/o35g55GH +Pzw+Q9tU4FUPrbLbxD4ocVbtmKErPOyxr3hXL3HDkAhKJcyguLZRoBXizKPNymXI +hNaZuzT1FCaPLWjUNWDdJP9zbVeIhtkQjIf5Hh0T6spMaJ5X5twgWSYP0xnhTD5B +Ehf5EVczY6r4VYSWnGeFZxRCNSv5pMqDlLVk0m7bKnY7RfYEYrowqXqeoQ2hTfOB +GHPTJYw8w7ucN7+MsBs74B85C7URcm+rBCSba3NrXjkIoL3dzyF5aZAbGEXIJj2d +NECRQ2/YYHVyfM6wcYpCCEMIp49YjZqn1PyRlxgOvae+wcwaCd7Xn5lP/C81+JkQ +oCdWbifxA8Wklvf68tx6K9RJaZ07DdMbUVTW8pKUyN9reBh56RwzqMSC4zZAnzR4 +WGwcrumhpfR6/G7E35b0ZAwBaqSW+h8SCG+KnV5mioY5RrUunZriNHtDW+YsMQBl +ML/A+0bMJ3McjDlmkH4YUl0dJZiEy8iO4lw9rIP06svqGv4CnopmGBLoGyGixsEY +sF77WpwcrH8wNDLhkLOncKVy8LF6jq6xlm1hnX1GG50Cy91SWvU= +=wckc +-----END PGP SIGNATURE----- diff --git a/cmake-3.20.1.tar.gz b/cmake-3.20.1.tar.gz new file mode 100644 index 0000000..07f1438 --- /dev/null +++ b/cmake-3.20.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3f1808b9b00281df06c91dd7a021d7f52f724101000da7985a401678dfe035b0 +size 9438789 diff --git a/cmake-fix-png-include-dir.patch b/cmake-fix-png-include-dir.patch index e40cd00..adf95d7 100644 --- a/cmake-fix-png-include-dir.patch +++ b/cmake-fix-png-include-dir.patch @@ -2,7 +2,7 @@ Index: b/Modules/FindPNG.cmake =================================================================== --- a/Modules/FindPNG.cmake +++ b/Modules/FindPNG.cmake -@@ -52,11 +52,15 @@ +@@ -54,12 +54,16 @@ find_package(ZLIB ${_FIND_ZLIB_ARG}) if(ZLIB_FOUND) @@ -13,6 +13,7 @@ Index: b/Modules/FindPNG.cmake + 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) diff --git a/cmake.changes b/cmake.changes index 3d0005b..87331ab 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Thu Apr 29 07:33:25 UTC 2021 - Dirk Müller + +- add 53d523f2e11839bcbbdc9288b4f71c764d0efd5c.diff to fix automoc + race + +------------------------------------------------------------------- +Fri Apr 9 16:10:18 UTC 2021 - Andreas Stieger + +- cmake 3.20.1: + * Fix FindIntl to use sigle Intl_IS_BUILT_IN check + +------------------------------------------------------------------- +Tue Mar 23 21:59:51 UTC 2021 - Christoph G + +- Update to 3.20.0 + * The “cmake_path()” command was added for operations on + filesystem paths. + * The “target_sources()” command now supports targets created + by the “add_custom_target()” command. + * The “ExternalProject” module “ExternalProject_Add()” function + gained a “CONFIGURE_HANDLED_BY_BUILD” option. + * “ctest(1)” gained a “–test-dir” option to specify the directory + in which to look for tests. + ------------------------------------------------------------------- Tue Mar 16 00:01:56 UTC 2021 - Dirk Müller diff --git a/cmake.spec b/cmake.spec index 5353b07..12b93be 100644 --- a/cmake.spec +++ b/cmake.spec @@ -35,9 +35,9 @@ %else %bcond_with full %endif -%define shortversion 3.19 +%define shortversion 3.20 Name: cmake%{?psuffix} -Version: 3.19.7 +Version: 3.20.1 Release: 0 Summary: Cross-platform make system License: BSD-3-Clause @@ -55,6 +55,8 @@ 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 +# From https://gitlab.kitware.com/cmake/cmake/-/merge_requests/6008 +Patch3: 53d523f2e11839bcbbdc9288b4f71c764d0efd5c.diff BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: pkgconfig