CVS commit: pkgsrc/devel/cmake

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sat Jan 16 11:16:25 UTC 2021

Modified Files:
        pkgsrc/devel/cmake: distinfo version.mk
        pkgsrc/devel/cmake/patches: patch-Source_QtDialog_CMakeLists.txt

Log Message:
cmake: updated to 3.19.3

CMake 3.19.3
* cmSystemTools: Revert use of MOVEFILE_WRITE_THROUGH by RenameFile on Windows
* Tests: Fix ConfigSources test with empty CMAKE_BUILD_TYPE
* gitlab-ci: consolidate Linux release package job spec for x86_64
* Help: Add 3.19.3 release note for Linux aarch64 binary
* gitlab-ci: update macOS jobs to use Xcode 12.3
* cmGlobalXCodeGenerator: Adopt pbxproj object id generation
* cmGlobalXCodeGenerator: Add infrastructure for deterministic object ids
* Xcode: Use deterministic object ids for script build phases
* gitlab-ci: update upload jobs to go to cmake.org
* cmake-gui: Fix macOS styling for binaries distributed with Qt 5.10+
* Utilities/Release: Fix macOS Qt 5.9 build script umask
* Utilities/Release: Add script to build Qt 5.15.2 macOS universal binaries
* ci: build separate macOS packages for macOS 10.13+ and macOS 10.10+
* Help: Fix Sphinx not recognising list in XCODE_LINK_BUILD_PHASE_MODE
* FetchContent: Relative SOURCE_DIR override cannot be a hard error
* FindMPI: remove single quotes from include path
* Utilities/Release: Add docker specs for Linux aarch64 binaries
* gitlab-ci: add jobs to make Linux release packages for aarch64 on 3.19 branch
* FindHDF5: Fix finding both debug and release libs
* cmake-gui: Restore linking of Qt resources
* cmMakefile: Don't expand bracket arguments in --trace-expand


To generate a diff of this commit:
cvs rdiff -u -r1.169 -r1.170 pkgsrc/devel/cmake/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/cmake/version.mk
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/devel/cmake/patches/patch-Source_QtDialog_CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/cmake/distinfo
diff -u pkgsrc/devel/cmake/distinfo:1.169 pkgsrc/devel/cmake/distinfo:1.170
--- pkgsrc/devel/cmake/distinfo:1.169   Thu Dec 17 12:14:35 2020
+++ pkgsrc/devel/cmake/distinfo Sat Jan 16 11:16:25 2021
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.169 2020/12/17 12:14:35 adam Exp $
+$NetBSD: distinfo,v 1.170 2021/01/16 11:16:25 adam Exp $
 
-SHA1 (cmake-3.19.2.tar.gz) = a8096c1584a3efa5282ddb8f5b419f098099faed
-RMD160 (cmake-3.19.2.tar.gz) = b6cd816cdc5dc3baef30807e7c046d64305161a6
-SHA512 (cmake-3.19.2.tar.gz) = d811122af89d46174b8fdb2a26e8553200d9dc7eb6385ece4e4b3e7584880f73a799813d5a81e64e956fd2574b63264fa8944d862c74a076e9d61f5e6521e91a
-Size (cmake-3.19.2.tar.gz) = 9264414 bytes
+SHA1 (cmake-3.19.3.tar.gz) = 3728308244166d6ed0a390d12d690d77fd2cc987
+RMD160 (cmake-3.19.3.tar.gz) = cf9dc9f999e6614ac417a4c656e9eeacc5eeab03
+SHA512 (cmake-3.19.3.tar.gz) = 54c91fa76882152d3933b696d7e547bc4edf6f97f3810e8dd57ca28c98e9fcaf757eac7c77e1e7fab88aced10937ed354917aeac3997edef406313dcf76ba0c5
+Size (cmake-3.19.3.tar.gz) = 9265831 bytes
 SHA1 (patch-CMakeLists.txt) = fabdb0590f4b97c34c2242749ae3b6af18aefc0a
 SHA1 (patch-Modules_Compiler_GNU.cmake) = e091c53ac3f3a6cd811119d3231563df32e76bf9
 SHA1 (patch-Modules_FindCurses.cmake) = 98cac805a6abafcfb8b61e441b50a1d6aec27ad0
@@ -18,5 +18,5 @@ SHA1 (patch-Source_CMakeLists.txt) = 533
 SHA1 (patch-Source_Checks_Curses_CMakeLists.txt) = 37d95c6162cc1f4c0e47b537ac8204cb9fe75b8c
 SHA1 (patch-Source_Checks_Curses_CheckCurses.c) = c86cae48f7b39fb735eba4788d4e9d595b2ccf3b
 SHA1 (patch-Source_Checks_cm__cxx17__check.cpp) = d5e2708df6fcda078b1b5ea59264c663d2633ced
-SHA1 (patch-Source_QtDialog_CMakeLists.txt) = 663880c10a923090839eda84fabe4da229020a26
+SHA1 (patch-Source_QtDialog_CMakeLists.txt) = b286fca47e221836c87b9812112cf973f98eaa82
 SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = e4bdf9fc58757e87bf7e3e3e195839eededbc796

Index: pkgsrc/devel/cmake/version.mk
diff -u pkgsrc/devel/cmake/version.mk:1.6 pkgsrc/devel/cmake/version.mk:1.7
--- pkgsrc/devel/cmake/version.mk:1.6   Thu Dec 17 12:14:35 2020
+++ pkgsrc/devel/cmake/version.mk       Sat Jan 16 11:16:25 2021
@@ -1,6 +1,6 @@
-# $NetBSD: version.mk,v 1.6 2020/12/17 12:14:35 adam Exp $
+# $NetBSD: version.mk,v 1.7 2021/01/16 11:16:25 adam Exp $
 # used by devel/cmake/Makefile.common
 # used by devel/cmake-fedora/Makefile
 
-CMAKE_VERSION= 3.19.2
+CMAKE_VERSION= 3.19.3
 CMAKE_API=     ${CMAKE_VERSION:R}

Index: pkgsrc/devel/cmake/patches/patch-Source_QtDialog_CMakeLists.txt
diff -u pkgsrc/devel/cmake/patches/patch-Source_QtDialog_CMakeLists.txt:1.2 pkgsrc/devel/cmake/patches/patch-Source_QtDialog_CMakeLists.txt:1.3
--- pkgsrc/devel/cmake/patches/patch-Source_QtDialog_CMakeLists.txt:1.2 Wed Nov 25 10:33:28 2020
+++ pkgsrc/devel/cmake/patches/patch-Source_QtDialog_CMakeLists.txt     Sat Jan 16 11:16:25 2021
@@ -1,10 +1,10 @@
-$NetBSD: patch-Source_QtDialog_CMakeLists.txt,v 1.2 2020/11/25 10:33:28 adam Exp $
+$NetBSD: patch-Source_QtDialog_CMakeLists.txt,v 1.3 2021/01/16 11:16:25 adam Exp $
 
 Do not make app bundle on Darwin.
 
---- Source/QtDialog/CMakeLists.txt.orig        2020-11-24 13:50:26.000000000 +0000
+--- Source/QtDialog/CMakeLists.txt.orig        2021-01-13 12:58:18.000000000 +0000
 +++ Source/QtDialog/CMakeLists.txt
-@@ -158,13 +158,13 @@ target_link_libraries(CMakeGUILib PUBLIC
+@@ -161,14 +161,14 @@ target_link_libraries(CMakeGUILib PUBLIC
  add_library(CMakeGUIMainLib STATIC CMakeSetup.cxx)
  target_link_libraries(CMakeGUIMainLib PUBLIC CMakeGUILib)
  
@@ -12,6 +12,7 @@ Do not make app bundle on Darwin.
 +add_executable(cmake-gui WIN32 CMakeGUIExec.cxx ${MANIFEST_FILE})
  target_link_libraries(cmake-gui CMakeGUIMainLib Qt5::Core)
  
+ target_sources(CMakeGUIMainLib INTERFACE $<TARGET_OBJECTS:CMakeGUIQRCLib>)
  if(WIN32)
    target_sources(CMakeGUIMainLib INTERFACE $<TARGET_OBJECTS:CMakeVersion> CMakeSetup.rc)
  endif()
@@ -20,7 +21,7 @@ Do not make app bundle on Darwin.
    target_sources(CMakeGUIMainLib INTERFACE CMakeSetup.icns)
    set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
    set_source_files_properties(CMakeSetup.icns PROPERTIES
-@@ -194,7 +194,7 @@ Checks: '-*,llvm-twine-local'
+@@ -198,7 +198,7 @@ Checks: '-*,llvm-twine-local'
  ...
  ")
  
@@ -29,7 +30,7 @@ Do not make app bundle on Darwin.
    file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
      LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")
  
-@@ -221,7 +221,7 @@ install(TARGETS cmake-gui
+@@ -225,7 +225,7 @@ install(TARGETS cmake-gui
    RUNTIME DESTINATION bin ${COMPONENT}
    ${CMAKE_INSTALL_DESTINATION_ARGS})
  
@@ -38,7 +39,7 @@ Do not make app bundle on Darwin.
    foreach (size IN ITEMS 32 128)
      install(
        FILES       "${CMAKE_CURRENT_SOURCE_DIR}/CMakeSetup${size}.png"
-@@ -240,14 +240,14 @@ if(UNIX AND NOT APPLE)
+@@ -244,14 +244,14 @@ if(UNIX AND NOT APPLE)
      ${COMPONENT})
  endif()