[149983] trunk/dports/devel/cmake
michaelld at macports.org
michaelld at macports.org
Thu Jul 7 04:02:26 PDT 2016
Revision: 149983
https://trac.macports.org/changeset/149983
Author: michaelld at macports.org
Date: 2016-07-07 04:02:26 -0700 (Thu, 07 Jul 2016)
Log Message:
-----------
cmake-devel: update to 20160706 (gd845ba); tweak qt* patchfiles to patch cleanly.
Modified Paths:
--------------
trunk/dports/devel/cmake/Portfile
trunk/dports/devel/cmake/files/patch-qt4gui.devel.diff
trunk/dports/devel/cmake/files/patch-qt4gui.release.diff
trunk/dports/devel/cmake/files/patch-qt5gui.devel.diff
trunk/dports/devel/cmake/files/patch-qt5gui.release.diff
Modified: trunk/dports/devel/cmake/Portfile
===================================================================
--- 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)
@@ -55,12 +55,12 @@
# devel
- version 20160628
+ version 20160706
set dist_branch 3.6
- set dist_date 20160628
- set dist_hash gc664b9
- checksums rmd160 ad455843f0e63a9e53f9b3956fb0f13b4bf1a3b7 \
- sha256 7c05845754a48d6e7cf584614c9e354185c219c516f6721029ad279e77f63c2d
+ set dist_date 20160706
+ set dist_hash gd845ba
+ checksums rmd160 19b5eaf52bf2e13f5216006838e39953dc8ee2bf \
+ sha256 f47167985e15e27929f86039137d0770167f9cd880907554634d5ca6965a22b6
master_sites http://www.cmake.org/files/dev/
distname ${name}-${dist_branch}.${dist_date}-${dist_hash}
Modified: trunk/dports/devel/cmake/files/patch-qt4gui.devel.diff
===================================================================
--- 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)
@@ -1,6 +1,6 @@
--- Source/QtDialog/CMakeLists.txt.orig
+++ Source/QtDialog/CMakeLists.txt
-@@ -15,77 +15,6 @@
+@@ -15,83 +15,6 @@
cmake_policy(SET CMP0020 NEW) # Drop when CMake >= 2.8.11 required
endif()
CMake_OPTIONAL_COMPONENT(cmake-gui)
@@ -25,6 +25,12 @@
-
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
-
+- 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()
+-
- # We need to install platform plugin and add qt.conf for Qt5 on Mac and Windows.
- # FIXME: This should be part of Qt5 CMake scripts, but unfortunatelly
- # Qt5 support is missing there.
@@ -78,7 +84,7 @@
set(QT_MIN_VERSION "4.4.0")
find_package(Qt4 REQUIRED)
if(NOT QT4_FOUND)
-@@ -97,8 +26,6 @@
+@@ -103,8 +26,6 @@
set(CMake_QT_LIBRARIES ${QT_LIBRARIES})
@@ -87,7 +93,7 @@
set(SRCS
AddCacheEntry.cxx
AddCacheEntry.h
-@@ -143,7 +70,7 @@
+@@ -149,7 +70,7 @@
if(WIN32)
set(SRCS ${SRCS} CMakeSetup.rc)
endif()
@@ -96,7 +102,7 @@
set(SRCS ${SRCS} CMakeSetup.icns)
set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
set_source_files_properties(CMakeSetup.icns PROPERTIES
-@@ -160,10 +87,10 @@
+@@ -166,10 +87,10 @@
set(CMAKE_INCLUDE_CURRENT_DIR ON)
@@ -109,7 +115,7 @@
file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")
-@@ -209,18 +136,18 @@
+@@ -215,18 +136,18 @@
${COMPONENT})
endif()
@@ -133,7 +139,7 @@
install(CODE "
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -592,12 +592,6 @@
+@@ -602,12 +602,6 @@
set(CMAKE_BUNDLE_VERSION
"${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
Modified: trunk/dports/devel/cmake/files/patch-qt4gui.release.diff
===================================================================
--- 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)
@@ -78,7 +78,7 @@
set(QT_MIN_VERSION "4.4.0")
find_package(Qt4 REQUIRED)
if(NOT QT4_FOUND)
-@@ -97,8 +26,6 @@ else()
+@@ -97,8 +26,6 @@
set(CMake_QT_LIBRARIES ${QT_LIBRARIES})
@@ -87,7 +87,7 @@
set(SRCS
AddCacheEntry.cxx
AddCacheEntry.h
-@@ -135,7 +62,7 @@ set(SRCS ${SRCS} ${UI_SRCS} ${MOC_SRCS} ${RC_SRCS})
+@@ -143,7 +70,7 @@
if(WIN32)
set(SRCS ${SRCS} CMakeSetup.rc)
endif()
@@ -96,7 +96,7 @@
set(SRCS ${SRCS} CMakeSetup.icns)
set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
set_source_files_properties(CMakeSetup.icns PROPERTIES
-@@ -152,10 +79,10 @@ endif()
+@@ -160,10 +87,10 @@
set(CMAKE_INCLUDE_CURRENT_DIR ON)
@@ -109,7 +109,7 @@
file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")
-@@ -200,18 +127,18 @@ if(UNIX AND NOT APPLE)
+@@ -209,18 +136,18 @@
${COMPONENT})
endif()
@@ -133,7 +133,7 @@
install(CODE "
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -563,12 +563,6 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
+@@ -584,12 +584,6 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
set(CMAKE_BUNDLE_VERSION
"${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
Modified: trunk/dports/devel/cmake/files/patch-qt5gui.devel.diff
===================================================================
--- 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)
@@ -1,6 +1,6 @@
--- Source/QtDialog/CMakeLists.txt.orig
+++ Source/QtDialog/CMakeLists.txt
-@@ -16,7 +16,10 @@
+@@ -16,7 +16,9 @@
endif()
CMake_OPTIONAL_COMPONENT(cmake-gui)
find_package(Qt5Widgets QUIET)
@@ -8,11 +8,10 @@
+if(NOT Qt5Widgets_FOUND)
+ message(FATAL_ERROR "Qt5 required but not found")
+endif()
-+
include_directories(${Qt5Widgets_INCLUDE_DIRS})
add_definitions(${Qt5Widgets_DEFINITONS})
macro(qt4_wrap_ui)
-@@ -85,19 +88,6 @@
+@@ -91,19 +93,6 @@
get_filename_component(Qt_BIN_DIR "${Qt_BIN_DIR}" PATH)
endif()
endif()
@@ -32,7 +31,7 @@
set(SRCS
AddCacheEntry.cxx
-@@ -143,7 +133,7 @@
+@@ -149,7 +138,7 @@
if(WIN32)
set(SRCS ${SRCS} CMakeSetup.rc)
endif()
@@ -41,7 +40,7 @@
set(SRCS ${SRCS} CMakeSetup.icns)
set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
set_source_files_properties(CMakeSetup.icns PROPERTIES
-@@ -160,10 +150,10 @@
+@@ -166,10 +155,10 @@
set(CMAKE_INCLUDE_CURRENT_DIR ON)
@@ -54,7 +53,7 @@
file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")
-@@ -209,18 +199,18 @@
+@@ -215,18 +204,18 @@
${COMPONENT})
endif()
@@ -78,7 +77,7 @@
install(CODE "
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -592,12 +592,6 @@
+@@ -602,12 +602,6 @@
set(CMAKE_BUNDLE_VERSION
"${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
Modified: trunk/dports/devel/cmake/files/patch-qt5gui.release.diff
===================================================================
--- 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)
@@ -32,7 +32,7 @@
set(SRCS
AddCacheEntry.cxx
-@@ -135,7 +125,7 @@
+@@ -143,7 +133,7 @@
if(WIN32)
set(SRCS ${SRCS} CMakeSetup.rc)
endif()
@@ -41,7 +41,7 @@
set(SRCS ${SRCS} CMakeSetup.icns)
set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
set_source_files_properties(CMakeSetup.icns PROPERTIES
-@@ -152,10 +142,10 @@
+@@ -160,10 +150,10 @@
set(CMAKE_INCLUDE_CURRENT_DIR ON)
@@ -54,7 +54,7 @@
file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")
-@@ -200,18 +190,18 @@
+@@ -209,18 +199,18 @@
${COMPONENT})
endif()
@@ -78,7 +78,7 @@
install(CODE "
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -563,12 +563,6 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
+@@ -584,12 +584,6 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
set(CMAKE_BUNDLE_VERSION
"${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160707/f9460f61/attachment.html>
More information about the macports-changes
mailing list