<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[149983] trunk/dports/devel/cmake</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/149983">149983</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2016-07-07 04:02:26 -0700 (Thu, 07 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>cmake-devel: update to 20160706 (gd845ba); tweak qt* patchfiles to patch cleanly.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelcmakePortfile">trunk/dports/devel/cmake/Portfile</a></li>
<li><a href="#trunkdportsdevelcmakefilespatchqt4guideveldiff">trunk/dports/devel/cmake/files/patch-qt4gui.devel.diff</a></li>
<li><a href="#trunkdportsdevelcmakefilespatchqt4guireleasediff">trunk/dports/devel/cmake/files/patch-qt4gui.release.diff</a></li>
<li><a href="#trunkdportsdevelcmakefilespatchqt5guideveldiff">trunk/dports/devel/cmake/files/patch-qt5gui.devel.diff</a></li>
<li><a href="#trunkdportsdevelcmakefilespatchqt5guireleasediff">trunk/dports/devel/cmake/files/patch-qt5gui.release.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelcmakePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/cmake/Portfile (149982 => 149983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cmake/Portfile 2016-07-07 09:45:09 UTC (rev 149982)
+++ trunk/dports/devel/cmake/Portfile 2016-07-07 11:02:26 UTC (rev 149983)
</span><span class="lines">@@ -55,12 +55,12 @@
</span><span class="cx">
</span><span class="cx"> # devel
</span><span class="cx">
</span><del>- version 20160628
</del><ins>+ version 20160706
</ins><span class="cx"> set dist_branch 3.6
</span><del>- set dist_date 20160628
- set dist_hash gc664b9
- checksums rmd160 ad455843f0e63a9e53f9b3956fb0f13b4bf1a3b7 \
- sha256 7c05845754a48d6e7cf584614c9e354185c219c516f6721029ad279e77f63c2d
</del><ins>+ set dist_date 20160706
+ set dist_hash gd845ba
+ checksums rmd160 19b5eaf52bf2e13f5216006838e39953dc8ee2bf \
+ sha256 f47167985e15e27929f86039137d0770167f9cd880907554634d5ca6965a22b6
</ins><span class="cx">
</span><span class="cx"> master_sites http://www.cmake.org/files/dev/
</span><span class="cx"> distname ${name}-${dist_branch}.${dist_date}-${dist_hash}
</span></span></pre></div>
<a id="trunkdportsdevelcmakefilespatchqt4guideveldiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/cmake/files/patch-qt4gui.devel.diff (149982 => 149983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cmake/files/patch-qt4gui.devel.diff 2016-07-07 09:45:09 UTC (rev 149982)
+++ trunk/dports/devel/cmake/files/patch-qt4gui.devel.diff 2016-07-07 11:02:26 UTC (rev 149983)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> --- Source/QtDialog/CMakeLists.txt.orig
</span><span class="cx"> +++ Source/QtDialog/CMakeLists.txt
</span><del>-@@ -15,77 +15,6 @@
</del><ins>+@@ -15,83 +15,6 @@
</ins><span class="cx"> cmake_policy(SET CMP0020 NEW) # Drop when CMake >= 2.8.11 required
</span><span class="cx"> endif()
</span><span class="cx"> CMake_OPTIONAL_COMPONENT(cmake-gui)
</span><span class="lines">@@ -25,6 +25,12 @@
</span><span class="cx"> -
</span><span class="cx"> - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
</span><span class="cx"> -
</span><ins>+- if(CMake_QT_STATIC_QXcbIntegrationPlugin_LIBRARIES)
+- list(APPEND CMake_QT_LIBRARIES ${CMake_QT_STATIC_QXcbIntegrationPlugin_LIBRARIES})
+- set_property(SOURCE CMakeSetup.cxx
+- PROPERTY COMPILE_DEFINITIONS USE_QXcbIntegrationPlugin)
+- endif()
+-
</ins><span class="cx"> - # We need to install platform plugin and add qt.conf for Qt5 on Mac and Windows.
</span><span class="cx"> - # FIXME: This should be part of Qt5 CMake scripts, but unfortunatelly
</span><span class="cx"> - # Qt5 support is missing there.
</span><span class="lines">@@ -78,7 +84,7 @@
</span><span class="cx"> set(QT_MIN_VERSION "4.4.0")
</span><span class="cx"> find_package(Qt4 REQUIRED)
</span><span class="cx"> if(NOT QT4_FOUND)
</span><del>-@@ -97,8 +26,6 @@
</del><ins>+@@ -103,8 +26,6 @@
</ins><span class="cx">
</span><span class="cx"> set(CMake_QT_LIBRARIES ${QT_LIBRARIES})
</span><span class="cx">
</span><span class="lines">@@ -87,7 +93,7 @@
</span><span class="cx"> set(SRCS
</span><span class="cx"> AddCacheEntry.cxx
</span><span class="cx"> AddCacheEntry.h
</span><del>-@@ -143,7 +70,7 @@
</del><ins>+@@ -149,7 +70,7 @@
</ins><span class="cx"> if(WIN32)
</span><span class="cx"> set(SRCS ${SRCS} CMakeSetup.rc)
</span><span class="cx"> endif()
</span><span class="lines">@@ -96,7 +102,7 @@
</span><span class="cx"> set(SRCS ${SRCS} CMakeSetup.icns)
</span><span class="cx"> set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
</span><span class="cx"> set_source_files_properties(CMakeSetup.icns PROPERTIES
</span><del>-@@ -160,10 +87,10 @@
</del><ins>+@@ -166,10 +87,10 @@
</ins><span class="cx">
</span><span class="cx"> set(CMAKE_INCLUDE_CURRENT_DIR ON)
</span><span class="cx">
</span><span class="lines">@@ -109,7 +115,7 @@
</span><span class="cx"> file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
</span><span class="cx"> LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")
</span><span class="cx">
</span><del>-@@ -209,18 +136,18 @@
</del><ins>+@@ -215,18 +136,18 @@
</ins><span class="cx"> ${COMPONENT})
</span><span class="cx"> endif()
</span><span class="cx">
</span><span class="lines">@@ -133,7 +139,7 @@
</span><span class="cx"> install(CODE "
</span><span class="cx"> --- CMakeLists.txt.orig
</span><span class="cx"> +++ CMakeLists.txt
</span><del>-@@ -592,12 +592,6 @@
</del><ins>+@@ -602,12 +602,6 @@
</ins><span class="cx"> set(CMAKE_BUNDLE_VERSION
</span><span class="cx"> "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
</span><span class="cx"> set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
</span></span></pre></div>
<a id="trunkdportsdevelcmakefilespatchqt4guireleasediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/cmake/files/patch-qt4gui.release.diff (149982 => 149983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cmake/files/patch-qt4gui.release.diff 2016-07-07 09:45:09 UTC (rev 149982)
+++ trunk/dports/devel/cmake/files/patch-qt4gui.release.diff 2016-07-07 11:02:26 UTC (rev 149983)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> set(QT_MIN_VERSION "4.4.0")
</span><span class="cx"> find_package(Qt4 REQUIRED)
</span><span class="cx"> if(NOT QT4_FOUND)
</span><del>-@@ -97,8 +26,6 @@ else()
</del><ins>+@@ -97,8 +26,6 @@
</ins><span class="cx">
</span><span class="cx"> set(CMake_QT_LIBRARIES ${QT_LIBRARIES})
</span><span class="cx">
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> set(SRCS
</span><span class="cx"> AddCacheEntry.cxx
</span><span class="cx"> AddCacheEntry.h
</span><del>-@@ -135,7 +62,7 @@ set(SRCS ${SRCS} ${UI_SRCS} ${MOC_SRCS} ${RC_SRCS})
</del><ins>+@@ -143,7 +70,7 @@
</ins><span class="cx"> if(WIN32)
</span><span class="cx"> set(SRCS ${SRCS} CMakeSetup.rc)
</span><span class="cx"> endif()
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> set(SRCS ${SRCS} CMakeSetup.icns)
</span><span class="cx"> set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
</span><span class="cx"> set_source_files_properties(CMakeSetup.icns PROPERTIES
</span><del>-@@ -152,10 +79,10 @@ endif()
</del><ins>+@@ -160,10 +87,10 @@
</ins><span class="cx">
</span><span class="cx"> set(CMAKE_INCLUDE_CURRENT_DIR ON)
</span><span class="cx">
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
</span><span class="cx"> LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")
</span><span class="cx">
</span><del>-@@ -200,18 +127,18 @@ if(UNIX AND NOT APPLE)
</del><ins>+@@ -209,18 +136,18 @@
</ins><span class="cx"> ${COMPONENT})
</span><span class="cx"> endif()
</span><span class="cx">
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> install(CODE "
</span><span class="cx"> --- CMakeLists.txt.orig
</span><span class="cx"> +++ CMakeLists.txt
</span><del>-@@ -563,12 +563,6 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
</del><ins>+@@ -584,12 +584,6 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
</ins><span class="cx"> set(CMAKE_BUNDLE_VERSION
</span><span class="cx"> "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
</span><span class="cx"> set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
</span></span></pre></div>
<a id="trunkdportsdevelcmakefilespatchqt5guideveldiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/cmake/files/patch-qt5gui.devel.diff (149982 => 149983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cmake/files/patch-qt5gui.devel.diff 2016-07-07 09:45:09 UTC (rev 149982)
+++ trunk/dports/devel/cmake/files/patch-qt5gui.devel.diff 2016-07-07 11:02:26 UTC (rev 149983)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> --- Source/QtDialog/CMakeLists.txt.orig
</span><span class="cx"> +++ Source/QtDialog/CMakeLists.txt
</span><del>-@@ -16,7 +16,10 @@
</del><ins>+@@ -16,7 +16,9 @@
</ins><span class="cx"> endif()
</span><span class="cx"> CMake_OPTIONAL_COMPONENT(cmake-gui)
</span><span class="cx"> find_package(Qt5Widgets QUIET)
</span><span class="lines">@@ -8,11 +8,10 @@
</span><span class="cx"> +if(NOT Qt5Widgets_FOUND)
</span><span class="cx"> + message(FATAL_ERROR "Qt5 required but not found")
</span><span class="cx"> +endif()
</span><del>-+
</del><span class="cx"> include_directories(${Qt5Widgets_INCLUDE_DIRS})
</span><span class="cx"> add_definitions(${Qt5Widgets_DEFINITONS})
</span><span class="cx"> macro(qt4_wrap_ui)
</span><del>-@@ -85,19 +88,6 @@
</del><ins>+@@ -91,19 +93,6 @@
</ins><span class="cx"> get_filename_component(Qt_BIN_DIR "${Qt_BIN_DIR}" PATH)
</span><span class="cx"> endif()
</span><span class="cx"> endif()
</span><span class="lines">@@ -32,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> set(SRCS
</span><span class="cx"> AddCacheEntry.cxx
</span><del>-@@ -143,7 +133,7 @@
</del><ins>+@@ -149,7 +138,7 @@
</ins><span class="cx"> if(WIN32)
</span><span class="cx"> set(SRCS ${SRCS} CMakeSetup.rc)
</span><span class="cx"> endif()
</span><span class="lines">@@ -41,7 +40,7 @@
</span><span class="cx"> set(SRCS ${SRCS} CMakeSetup.icns)
</span><span class="cx"> set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
</span><span class="cx"> set_source_files_properties(CMakeSetup.icns PROPERTIES
</span><del>-@@ -160,10 +150,10 @@
</del><ins>+@@ -166,10 +155,10 @@
</ins><span class="cx">
</span><span class="cx"> set(CMAKE_INCLUDE_CURRENT_DIR ON)
</span><span class="cx">
</span><span class="lines">@@ -54,7 +53,7 @@
</span><span class="cx"> file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
</span><span class="cx"> LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")
</span><span class="cx">
</span><del>-@@ -209,18 +199,18 @@
</del><ins>+@@ -215,18 +204,18 @@
</ins><span class="cx"> ${COMPONENT})
</span><span class="cx"> endif()
</span><span class="cx">
</span><span class="lines">@@ -78,7 +77,7 @@
</span><span class="cx"> install(CODE "
</span><span class="cx"> --- CMakeLists.txt.orig
</span><span class="cx"> +++ CMakeLists.txt
</span><del>-@@ -592,12 +592,6 @@
</del><ins>+@@ -602,12 +602,6 @@
</ins><span class="cx"> set(CMAKE_BUNDLE_VERSION
</span><span class="cx"> "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
</span><span class="cx"> set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
</span></span></pre></div>
<a id="trunkdportsdevelcmakefilespatchqt5guireleasediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/cmake/files/patch-qt5gui.release.diff (149982 => 149983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cmake/files/patch-qt5gui.release.diff 2016-07-07 09:45:09 UTC (rev 149982)
+++ trunk/dports/devel/cmake/files/patch-qt5gui.release.diff 2016-07-07 11:02:26 UTC (rev 149983)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> set(SRCS
</span><span class="cx"> AddCacheEntry.cxx
</span><del>-@@ -135,7 +125,7 @@
</del><ins>+@@ -143,7 +133,7 @@
</ins><span class="cx"> if(WIN32)
</span><span class="cx"> set(SRCS ${SRCS} CMakeSetup.rc)
</span><span class="cx"> endif()
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> set(SRCS ${SRCS} CMakeSetup.icns)
</span><span class="cx"> set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
</span><span class="cx"> set_source_files_properties(CMakeSetup.icns PROPERTIES
</span><del>-@@ -152,10 +142,10 @@
</del><ins>+@@ -160,10 +150,10 @@
</ins><span class="cx">
</span><span class="cx"> set(CMAKE_INCLUDE_CURRENT_DIR ON)
</span><span class="cx">
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
</span><span class="cx"> LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")
</span><span class="cx">
</span><del>-@@ -200,18 +190,18 @@
</del><ins>+@@ -209,18 +199,18 @@
</ins><span class="cx"> ${COMPONENT})
</span><span class="cx"> endif()
</span><span class="cx">
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> install(CODE "
</span><span class="cx"> --- CMakeLists.txt.orig
</span><span class="cx"> +++ CMakeLists.txt
</span><del>-@@ -563,12 +563,6 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
</del><ins>+@@ -584,12 +584,6 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
</ins><span class="cx"> set(CMAKE_BUNDLE_VERSION
</span><span class="cx"> "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
</span><span class="cx"> set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
</span></span></pre>
</div>
</div>
</body>
</html>