<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/db5a4e58cf534e2d199a826cb767f026b7a174f4">https://github.com/macports/macports-ports/commit/db5a4e58cf534e2d199a826cb767f026b7a174f4</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 db5a4e58cf5 cmake: fix Qt GUI to be great again!
</span>db5a4e58cf5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit db5a4e58cf534e2d199a826cb767f026b7a174f4
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Mon Dec 7 14:01:42 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> cmake: fix Qt GUI to be great again!
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/61706
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/61726
</span>---
devel/cmake/Portfile | 56 ++------
devel/cmake/files/Info.plist.in | 42 ------
devel/cmake/files/macports.cmake | 5 +-
devel/cmake/files/patch-Modules-noArchCheck.diff | 8 +-
devel/cmake/files/patch-cmake-leopard-tiger.diff | 14 +-
devel/cmake/files/patch-qt4gui.diff | 172 -----------------------
devel/cmake/files/patch-qt5gui.diff | 139 +++++++++---------
7 files changed, 90 insertions(+), 346 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 219d298d3a1..1d800f6ca13 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;'>@@ -42,7 +42,7 @@ if {${subport} eq ${name}} {
</span> checksums rmd160 934ee2e839f743e33ec609854c70fc46f25a5566 \
sha256 8ddd992642e6050b302dfb66e70c17ab60063882d55421af070728638c194517 \
size 7128815
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span>
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,7 +64,6 @@ if {${subport} eq ${name}} {
</span> long_description ${base_long_description} \
The ${subport} release port is updated roughly every few months.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # release-only patches
</span> patchfiles-append \
patch-Modules-noArchCheck.diff \
patch-CMakeFindFrameworks.cmake.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,7 +71,8 @@ if {${subport} eq ${name}} {
</span> patch-fix_cxx14_17_checks.diff \
patch-fix-system-prefix-path.diff \
patch-cmake-leopard-tiger.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fix-clock_gettime-test.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-clock_gettime-test.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-qt5gui.diff
</span>
depends_lib-append \
port:curl \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -194,6 +194,10 @@ if {${subport} eq ${name}} {
</span> # patch FRAMEWORKS
reinplace "s|__FRAMEWORKS_DIR__|${frameworks_dir}|g" \
${worksrcpath}/Modules/CMakeFindFrameworks.cmake
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patch APPLICATIONS_DIR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|__APPLICATIONS_DIR__|${applications_dir}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/macports.cmake
</span> }
post-destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -205,23 +209,13 @@ if {${subport} eq ${name}} {
</span> xinstall -m 0644 -W ${worksrcpath}/Auxiliary/vim/${type} cmake.vim \
${destroot}${prefix}/share/vim/vimfiles/${type}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if ([variant_isset gui]) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set app CMake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${applications_dir}/${app}.app/Contents/MacOS \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${applications_dir}/${app}.app/Contents/Resources
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${filespath}/Info.plist.in ${destroot}${applications_dir}/${app}.app/Contents/Info.plist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@VERSION@|${version}|g" ${destroot}${applications_dir}/${app}.app/Contents/Info.plist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PREFIX@|${prefix}|g" ${destroot}${applications_dir}/${app}.app/Contents/Info.plist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/bin/cmake-gui ${destroot}${applications_dir}/${app}.app/Contents/MacOS/cmake-gui
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/Source/QtDialog/CMakeSetup.icns ${destroot}${applications_dir}/${app}.app/Contents/Resources/CMakeSetup.icns
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
# All the variants create circular dependencies on 10.6 with libc++,
# due to the default compiler needing cmake to build.
if {[info exists cmake_bootstrapping]} {
set some_variant_disabled 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach vname {gui qt4 qt5 docs python35 python36 python37 python38} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach vname { qt5 docs python35 python36 python37 python38} {
</span> if {[variant_isset $vname]} {
unset ::variations($vname)
set some_variant_disabled 1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -235,40 +229,12 @@ if {${subport} eq ${name}} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant gui description {Build Qt-based cmake-gui} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --qt-gui
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant qt4 conflicts qt5 requires gui description {Build Qt GUI using Qt4} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qt4 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-qt4gui.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-qt4gui.devel.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --qt-qmake=${qt_qmake_cmd}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant qt5 conflicts qt4 requires gui description {Build Qt GUI using Qt5} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant qt5 description {Build Qt GUI using Qt5} {
</span> PortGroup qt5 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-qt5gui.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-qt5gui.devel.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --qt-qmake=${qt_qmake_cmd}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --qt-gui --qt-qmake=${qt_qmake_cmd}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset gui]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset qt4] && ![variant_isset qt5]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +qt4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset qt4] && ![variant_isset qt5]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "\n\nYou must select either the +qt4 or +qt5 variant when using variant +gui.\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "Invalid variant selection"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset qt5]} {
</span> configure.args-append --no-qt-gui
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/Info.plist.in b/devel/cmake/files/Info.plist.in
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ebfa8793594..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/Info.plist.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,42 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<?xml version="1.0" encoding="UTF-8"?>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<plist version="1.0">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<dict>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>LSEnvironment</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <dict>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>PATH</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>@PREFIX@/bin:@PREFIX@/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </dict>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>CFBundleDevelopmentRegion</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>English</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>CFBundleExecutable</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>cmake-gui</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>CFBundleGetInfoString</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>CMake - Cross Platform Makefile Generator</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>CFBundleIconFile</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>CMakeSetup.icns</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>CFBundleIdentifier</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>com.kitware.cmake</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>CFBundleInfoDictionaryVersion</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>6.0</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>CFBundleLongVersionString</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>@VERSION@</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>CFBundleName</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>CMake</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>CFBundlePackageType</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>APPL</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>CFBundleShortVersionString</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>@VERSION@</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>CFBundleSignature</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>CMakeGui</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>CFBundleVersion</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>@VERSION</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>CSResourcesFileMapped</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <true/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>LSRequiresCarbon</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <true/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>NSHumanReadableCopyright</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>2000-2011 Kitware, Inc., Insight Software Consortium.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-All rights reserved.</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-</dict>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-</plist>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/macports.cmake b/devel/cmake/files/macports.cmake
</span><span style='display:block; white-space:pre;color:#808080;'>index 94b2940edd0..0e227b8a73d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/macports.cmake
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/macports.cmake
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# patch __PREFIX__ in the Portfile post-patch stage
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# NOTE: have patch in the Portfile post-patch stage once this file is installed!!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Where to install CMake.app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set(CMAKE_BUNDLE_LOCATION "__APPLICATIONS_DIR__" CACHE PATH "Where to install CMake.app bundle" FORCE)
</span>
# Coerge CMake to use MacPorts' BZIP2
set(BZIP2_INCLUDE_DIR "__PREFIX__/include" CACHE PATH "The BZIP2 include directory" FORCE)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-Modules-noArchCheck.diff b/devel/cmake/files/patch-Modules-noArchCheck.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 0338cf77f6d..8ae09b8154a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-Modules-noArchCheck.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-Modules-noArchCheck.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- Modules/BasicConfigVersion-AnyNewerVersion.cmake.in.orig
+++ Modules/BasicConfigVersion-AnyNewerVersion.cmake.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23,15 +23,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,15 +34,3 @@
</span> if("@CVF_ARCH_INDEPENDENT@")
return()
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,7 @@
</span> -endif()
--- Modules/BasicConfigVersion-ExactVersion.cmake.in.orig
+++ Modules/BasicConfigVersion-ExactVersion.cmake.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -38,15 +38,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,15 +45,3 @@
</span> if("@CVF_ARCH_INDEPENDENT@")
return()
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +36,7 @@
</span> -endif()
--- Modules/BasicConfigVersion-SameMajorVersion.cmake.in.orig
+++ Modules/BasicConfigVersion-SameMajorVersion.cmake.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -37,15 +37,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,15 +44,3 @@
</span> if("@CVF_ARCH_INDEPENDENT@")
return()
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,7 +54,7 @@
</span> -endif()
--- Modules/BasicConfigVersion-SameMinorVersion.cmake.in.orig
+++ Modules/BasicConfigVersion-SameMinorVersion.cmake.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -41,15 +41,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -48,15 +48,3 @@
</span> if("@CVF_ARCH_INDEPENDENT@")
return()
endif()
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-cmake-leopard-tiger.diff b/devel/cmake/files/patch-cmake-leopard-tiger.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 8fc7667b0da..c2dbdbd3788 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-cmake-leopard-tiger.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-cmake-leopard-tiger.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- Source/cmMachO.h
+++ Source/cmMachO.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7,6 +7,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6,6 +6,7 @@
</span>
#include <iosfwd>
#include <string>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@
</span> # error "This file may be included only if CMAKE_USE_MACH_PARSER is enabled."
--- Utilities/cmlibuv/src/unix/core.c
+++ Utilities/cmlibuv/src/unix/core.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -518,10 +518,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -530,10 +530,24 @@
</span> * will unwind the thread when it's in the cancel state. Work around that
* by making the system call directly. Musl libc is unaffected.
*/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +36,7 @@
</span> #if defined(__LP64__) || TARGET_OS_IPHONE
extern int close$NOCANCEL(int);
return close$NOCANCEL(fd);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -529,7 +543,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -541,7 +555,11 @@
</span> extern int close$NOCANCEL$UNIX2003(int);
return close$NOCANCEL$UNIX2003(fd);
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,7 +48,7 @@
</span> #elif defined(__linux__)
return syscall(SYS_close, fd);
#else
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1347,8 +1365,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1352,8 +1370,12 @@
</span> if (name == NULL)
return UV_EINVAL;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,7 +63,7 @@
</span> }
--- Utilities/cmlibuv/src/unix/fs.c
+++ Utilities/cmlibuv/src/unix/fs.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -919,7 +919,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -951,7 +951,7 @@
</span>
return -1;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,7 +72,7 @@
</span> defined(__DragonFly__) || \
defined(__FreeBSD__) || \
defined(__FreeBSD_kernel__)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1035,7 +1035,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1067,7 +1067,7 @@
</span> ts[0] = uv__fs_to_timespec(req->atime);
ts[1] = uv__fs_to_timespec(req->mtime);
return utimensat(AT_FDCWD, req->path, ts, AT_SYMLINK_NOFOLLOW);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,7 +81,7 @@
</span> defined(__DragonFly__) || \
defined(__FreeBSD__) || \
defined(__FreeBSD_kernel__) || \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1286,7 +1286,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1328,7 +1328,7 @@
</span> dst->st_blksize = src->st_blksize;
dst->st_blocks = src->st_blocks;
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-qt4gui.diff b/devel/cmake/files/patch-qt4gui.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9d4059c61e1..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-qt4gui.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,172 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Source/QtDialog/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Source/QtDialog/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,100 +3,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- project(QtDialog)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CMake_OPTIONAL_COMPONENT(cmake-gui)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--find_package(Qt5Widgets QUIET)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if (Qt5Widgets_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- include_directories(${Qt5Widgets_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- add_definitions(${Qt5Widgets_DEFINITONS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- macro(qt4_wrap_ui)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- qt5_wrap_ui(${ARGN})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endmacro()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- macro(qt4_wrap_cpp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- qt5_wrap_cpp(${ARGN})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endmacro()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- macro(qt4_add_resources)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- qt5_add_resources(${ARGN})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endmacro()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMake_QT_LIBRARIES ${Qt5Widgets_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(QT_QTMAIN_LIBRARY ${Qt5Core_QTMAIN_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Try to find the package WinExtras for the task bar progress
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- find_package(Qt5WinExtras QUIET)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (Qt5WinExtras_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- include_directories(${Qt5WinExtras_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- add_definitions(-DQT_WINEXTRAS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- list(APPEND CMake_QT_LIBRARIES ${Qt5WinExtras_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Remove this when the minimum version of Qt is 4.6.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(CMake_QT_STATIC_QXcbIntegrationPlugin_LIBRARIES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- list(APPEND CMake_QT_LIBRARIES ${CMake_QT_STATIC_QXcbIntegrationPlugin_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set_property(SOURCE CMakeSetup.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PROPERTY COMPILE_DEFINITIONS USE_QXcbIntegrationPlugin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(CMake_QT_STATIC_QWindowsIntegrationPlugin_LIBRARIES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- list(APPEND CMake_QT_LIBRARIES ${CMake_QT_STATIC_QWindowsIntegrationPlugin_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set_property(SOURCE CMakeSetup.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PROPERTY COMPILE_DEFINITIONS USE_QWindowsIntegrationPlugin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # We need to install platform plugin and add qt.conf for Qt5 on Mac and Windows.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # FIXME: This should be part of Qt5 CMake scripts, but unfortunately
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Qt5 support is missing there.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(CMake_INSTALL_DEPENDENCIES AND (APPLE OR WIN32))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- macro(install_qt5_plugin _qt_plugin_name _qt_plugins_var)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- get_target_property(_qt_plugin_path "${_qt_plugin_name}" LOCATION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(EXISTS "${_qt_plugin_path}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- get_filename_component(_qt_plugin_file "${_qt_plugin_path}" NAME)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- get_filename_component(_qt_plugin_type "${_qt_plugin_path}" PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- get_filename_component(_qt_plugin_type "${_qt_plugin_type}" NAME)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(_qt_plugin_dir "PlugIns")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- elseif(WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(_qt_plugin_dir "plugins")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(_qt_plugin_dest "${_qt_plugin_dir}/${_qt_plugin_type}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- install(FILES "${_qt_plugin_path}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DESTINATION "${_qt_plugin_dest}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${COMPONENT})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(${_qt_plugins_var}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "${${_qt_plugins_var}};\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${_qt_plugin_dest}/${_qt_plugin_file}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- message(FATAL_ERROR "QT plugin ${_qt_plugin_name} not found")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endmacro()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- install_qt5_plugin("Qt5::QCocoaIntegrationPlugin" QT_PLUGINS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "[Paths]\nPlugins = ${_qt_plugin_dir}\n")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DESTINATION "${CMAKE_INSTALL_PREFIX}/Resources"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${COMPONENT})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- elseif(WIN32 AND NOT CMake_QT_STATIC_QWindowsIntegrationPlugin_LIBRARIES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- install_qt5_plugin("Qt5::QWindowsIntegrationPlugin" QT_PLUGINS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "[Paths]\nPlugins = ../${_qt_plugin_dir}\n")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DESTINATION bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${COMPONENT})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(TARGET Qt5::Core)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- get_property(_Qt5_Core_LOCATION TARGET Qt5::Core PROPERTY LOCATION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- get_filename_component(Qt_BIN_DIR "${_Qt5_Core_LOCATION}" PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- get_filename_component(Qt_BIN_DIR "${Qt_BIN_DIR}" PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(QT_MIN_VERSION "4.4.0")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_package(Qt4 REQUIRED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(NOT QT4_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -108,8 +14,6 @@ else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMake_QT_LIBRARIES ${QT_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(SRCS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AddCacheEntry.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AddCacheEntry.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -154,7 +58,7 @@ set(SRCS ${SRCS} ${UI_SRCS} ${MOC_SRCS} ${RC_SRCS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(SRCS ${SRCS} CMakeSetup.rc)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(APPLEBUNDLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(SRCS ${SRCS} CMakeSetup.icns)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_source_files_properties(CMakeSetup.icns PROPERTIES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -171,7 +75,7 @@ endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_INCLUDE_CURRENT_DIR ON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS} ${MANIFEST_FILE})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+add_executable(cmake-gui WIN32 ${SRCS} ${MANIFEST_FILE})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${CMake_QT_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -201,7 +105,7 @@ Checks: '-*,llvm-twine-local'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(APPLEBUNDLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -247,7 +151,7 @@ if(UNIX AND NOT APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${COMPONENT})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(APPLEBUNDLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install(CODE "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- execute_process(COMMAND ln -s \"../MacOS/CMake\" cmake-gui
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -258,7 +162,7 @@ if(CMake_INSTALL_DEPENDENCIES AND (APPLE OR WIN32))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # install rules for including 3rd party libs such as Qt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if a system Qt is used (e.g. installed in /usr/lib/), it will not be included in the installation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/cmake-gui${CMAKE_EXECUTABLE_SUFFIX}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(APPLEBUNDLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/MacOS/CMake")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install(CODE "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -768,12 +768,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_BUNDLE_VERSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # make sure CMAKE_INSTALL_PREFIX ends in /
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(NOT CMAKE_INSTALL_PREFIX MATCHES "/$")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMAKE_INSTALL_PREFIX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "${CMAKE_INSTALL_PREFIX}CMake.app/Contents")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-qt5gui.diff b/devel/cmake/files/patch-qt5gui.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c72fbe905a7..4050901217f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-qt5gui.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-qt5gui.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,91 +1,80 @@
</span> --- Source/QtDialog/CMakeLists.txt.orig
+++ Source/QtDialog/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4,7 +4,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- project(QtDialog)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CMake_OPTIONAL_COMPONENT(cmake-gui)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_package(Qt5Widgets QUIET)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if (Qt5Widgets_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(NOT Qt5Widgets_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ message(FATAL_ERROR "Qt5 required but not found")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include_directories(${Qt5Widgets_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_definitions(${Qt5Widgets_DEFINITONS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macro(qt4_wrap_ui)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -96,19 +98,6 @@ if (Qt5Widgets_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- get_filename_component(Qt_BIN_DIR "${Qt_BIN_DIR}" PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(QT_MIN_VERSION "4.4.0")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- find_package(Qt4 REQUIRED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(NOT QT4_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- message(SEND_ERROR "Failed to find Qt 4.4 or greater.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- include(${QT_USE_FILE})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMake_QT_LIBRARIES ${QT_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(SRCS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AddCacheEntry.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -154,7 +143,7 @@ set(SRCS ${SRCS} ${UI_SRCS} ${MOC_SRCS} ${RC_SRCS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(SRCS ${SRCS} CMakeSetup.rc)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(APPLEBUNDLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(SRCS ${SRCS} CMakeSetup.icns)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_source_files_properties(CMakeSetup.icns PROPERTIES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -171,7 +160,7 @@ endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_INCLUDE_CURRENT_DIR ON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS} ${MANIFEST_FILE})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+add_executable(cmake-gui WIN32 ${SRCS} ${MANIFEST_FILE})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${CMake_QT_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -201,7 +190,7 @@ Checks: '-*,llvm-twine-local'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(APPLEBUNDLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -247,7 +236,7 @@ if(UNIX AND NOT APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${COMPONENT})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -202,7 +202,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OUTPUT_NAME CMake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MACOSX_BUNDLE_SHORT_VERSION_STRING "${CMAKE_BUNDLE_VERSION}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # TBD: MACOSX_BUNDLE_BUNDLE_VERSION "${CMAKE_BUNDLE_VERSION}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MACOSX_BUNDLE_LONG_VERSION_STRING "${CMAKE_BUNDLE_VERSION}-MacPorts"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MACOSX_BUNDLE_BUNDLE_VERSION "${CMAKE_BUNDLE_VERSION}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MACOSX_BUNDLE_COPYRIGHT "${copyright_line}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MACOSX_BUNDLE_GUI_IDENTIFIER "org.cmake.cmake"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -241,8 +242,12 @@
</span> endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>--if(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(APPLEBUNDLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # at install time, create a symlink from the CMake executable to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # bin/cmake-gui. Note that there is a build-time symlink created
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # above, but it is used just during build and test, and not
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # installed. This one is created in the installation.
</span> install(CODE "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- execute_process(COMMAND ln -s \"../MacOS/CMake\" cmake-gui
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- execute_process(COMMAND ln -s \"../MacOS/CMake\" cmake-gui
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ execute_process(COMMAND ln -s \"${CMAKE_BUNDLE_LOCATION}/CMake.app/MacOS/CMake\" cmake-gui
</span> WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -258,7 +247,7 @@ if(CMake_INSTALL_DEPENDENCIES AND (APPLE OR WIN32))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # install rules for including 3rd party libs such as Qt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if a system Qt is used (e.g. installed in /usr/lib/), it will not be included in the installation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/cmake-gui${CMAKE_EXECUTABLE_SUFFIX}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(APPLEBUNDLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/MacOS/CMake")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install(CODE "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ " ${COMPONENT})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/QtDialog/Info.plist.in.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/QtDialog/Info.plist.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2,8 +2,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <plist version="1.0">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <dict>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <key>LSEnvironment</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <dict>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <key>PATH</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <string>${CMAKE_INSTALL_PREFIX}/bin:${CMAKE_INSTALL_PREFIX}/sbin:/usr/bin:/bin:/usr/sbin:/sbin</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ </dict>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>CFBundleDevelopmentRegion</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>English</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <key>CFBundleGetInfoString</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <string>CMake - Cross Platform Makefile Generator</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>CFBundleExecutable</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>CFBundleIconFile</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -16,6 +23,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>CFBundlePackageType</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>APPL</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <key>CFBundleLongVersionString</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>CFBundleShortVersionString</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>CFBundleSignature</key>
</span> --- CMakeLists.txt.orig
+++ CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -768,12 +768,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -772,13 +772,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(APPLE)
</span> set(CMAKE_BUNDLE_VERSION
"${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
</span> - # make sure CMAKE_INSTALL_PREFIX ends in /
- if(NOT CMAKE_INSTALL_PREFIX MATCHES "/$")
- set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(CMAKE_BUNDLE_LOCATION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(STATUS "Using provided bundle location: ${CMAKE_BUNDLE_LOCATION}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(STATUS "Using default install prefix: ${CMAKE_INSTALL_PREFIX}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # make sure CMAKE_INSTALL_PREFIX ends in /
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(NOT CMAKE_INSTALL_PREFIX MATCHES "/$")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(CMAKE_INSTALL_PREFIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "${CMAKE_INSTALL_PREFIX}CMake.app/Contents")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(STATUS "Using default Qt bundle location: ${CMAKE_BUNDLE_LOCATION}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(STATUS "Using special install prefix: ${CMAKE_INSTALL_PREFIX}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span> - set(CMAKE_INSTALL_PREFIX
- "${CMAKE_INSTALL_PREFIX}CMake.app/Contents")
endif()
</pre><pre style='margin:0'>
</pre>