<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fd69627bd325ad8b21444a998056b810e2b9b57f">https://github.com/macports/macports-ports/commit/fd69627bd325ad8b21444a998056b810e2b9b57f</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new fd69627 cmake-devel: update to 772edffb (20181128)
</span>fd69627 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit fd69627bd325ad8b21444a998056b810e2b9b57f
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Wed Nov 28 13:49:20 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> cmake-devel: update to 772edffb (20181128)
</span>---
devel/cmake/Portfile | 10 +++++-----
devel/cmake/files/patch-qt4gui.devel.diff | 25 ++++++++++++++++++-------
devel/cmake/files/patch-qt5gui.devel.diff | 12 ++++++------
3 files changed, 29 insertions(+), 18 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/Portfile b/devel/cmake/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 30e40a7..f38263e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,11 +64,11 @@ if {${subport} eq ${name}} {
</span>
# devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20181113
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set commit 64bc4bda748b6c33d496fe294e959e7609b89260
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 284fec201d54592d604c89952f8b95979527a853 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 57280fe0364e4a268344c025d4f77996b298fbf91a5baad26510987b1dd6852e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6498578
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20181128
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set commit 772edffbf0c08fc0a6fcf74fb98545b7afcfee13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 c704c91148b44a5092b9ea19b71107265f8d7ccf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0d26b360414f477ed50a5305b61634cc86f09e9e6ffdea19ce17d8cf5d9189fb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6506100
</span>
use_bzip2 yes
master_sites https://gitlab.kitware.com/cmake/cmake/repository/archive${extract.suffix}?ref=${commit}&
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-qt4gui.devel.diff b/devel/cmake/files/patch-qt4gui.devel.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 6ffe357..c6c6ea5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-qt4gui.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-qt4gui.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- Source/QtDialog/CMakeLists.txt.orig
+++ Source/QtDialog/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6,89 +6,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6,100 +6,6 @@
</span> cmake_policy(SET CMP0020 NEW) # Drop when CMake >= 2.8.11 required
endif()
CMake_OPTIONAL_COMPONENT(cmake-gui)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,9 +17,20 @@
</span> - macro(qt4_add_resources)
- qt5_add_resources(${ARGN})
- endmacro()
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> - set(CMake_QT_LIBRARIES ${Qt5Widgets_LIBRARIES})
- set(QT_QTMAIN_LIBRARY ${Qt5Core_QTMAIN_LIBRARIES})
-
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Try to find the package WinExtras for the task bar progress
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_package(Qt5WinExtras QUIET)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (Qt5WinExtras_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- include_directories(${Qt5WinExtras_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_definitions(-DQT_WINEXTRAS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- list(APPEND CMake_QT_LIBRARIES ${Qt5WinExtras_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> - # Remove this when the minimum version of Qt is 4.6.
- add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0)
-
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,7 +101,7 @@
</span> set(QT_MIN_VERSION "4.4.0")
find_package(Qt4 REQUIRED)
if(NOT QT4_FOUND)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -100,8 +17,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -111,8 +17,6 @@
</span>
set(CMake_QT_LIBRARIES ${QT_LIBRARIES})
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -99,7 +110,7 @@
</span> set(SRCS
AddCacheEntry.cxx
AddCacheEntry.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -146,7 +61,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -157,7 +61,7 @@
</span> if(WIN32)
set(SRCS ${SRCS} CMakeSetup.rc)
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -108,7 +119,7 @@
</span> set(SRCS ${SRCS} CMakeSetup.icns)
set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
set_source_files_properties(CMakeSetup.icns PROPERTIES
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -163,7 +78,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -174,7 +78,7 @@
</span>
set(CMAKE_INCLUDE_CURRENT_DIR ON)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -117,7 +128,7 @@
</span> target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${CMake_QT_LIBRARIES})
if(WIN32)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -189,7 +104,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -200,7 +104,7 @@
</span> ...
")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -126,7 +137,7 @@
</span> file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -235,7 +150,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -246,7 +150,7 @@
</span> ${COMPONENT})
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -135,7 +146,7 @@
</span> install(CODE "
execute_process(COMMAND ln -s \"../MacOS/CMake\" cmake-gui
WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -246,7 +161,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -257,7 +161,7 @@
</span> # install rules for including 3rd party libs such as Qt
# if a system Qt is used (e.g. installed in /usr/lib/), it will not be included in the installation
set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/cmake-gui${CMAKE_EXECUTABLE_SUFFIX}")
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-qt5gui.devel.diff b/devel/cmake/files/patch-qt5gui.devel.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 349c1df..4f47248 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-qt5gui.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-qt5gui.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@
</span> include_directories(${Qt5Widgets_INCLUDE_DIRS})
add_definitions(${Qt5Widgets_DEFINITONS})
macro(qt4_wrap_ui)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -88,19 +90,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -99,19 +101,6 @@
</span> get_filename_component(Qt_BIN_DIR "${Qt_BIN_DIR}" PATH)
endif()
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +31,7 @@
</span>
set(SRCS
AddCacheEntry.cxx
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -146,7 +135,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -157,7 +146,7 @@
</span> if(WIN32)
set(SRCS ${SRCS} CMakeSetup.rc)
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,7 +40,7 @@
</span> set(SRCS ${SRCS} CMakeSetup.icns)
set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
set_source_files_properties(CMakeSetup.icns PROPERTIES
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -163,7 +152,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -174,7 +163,7 @@
</span>
set(CMAKE_INCLUDE_CURRENT_DIR ON)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +49,7 @@
</span> target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${CMake_QT_LIBRARIES})
if(WIN32)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -189,7 +178,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -200,7 +189,7 @@
</span> ...
")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,7 +58,7 @@
</span> file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -235,7 +224,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -246,7 +235,7 @@
</span> ${COMPONENT})
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +67,7 @@
</span> install(CODE "
execute_process(COMMAND ln -s \"../MacOS/CMake\" cmake-gui
WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -246,7 +235,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -257,7 +246,7 @@
</span> # install rules for including 3rd party libs such as Qt
# if a system Qt is used (e.g. installed in /usr/lib/), it will not be included in the installation
set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/cmake-gui${CMAKE_EXECUTABLE_SUFFIX}")
</pre><pre style='margin:0'>
</pre>