Date: Friday, November 13, 2015 @ 08:41:34
Author: fyan
Revision: 250825
upgpkg: cmake 3.4.0-1
Modified:
cmake/trunk/PKGBUILD
Deleted:
cmake/trunk/kdelibs-4.14.11.patch
cmake/trunk/python-3.5.patch
-----------------------+
PKGBUILD | 16 +---
kdelibs-4.14.11.patch | 40 ----------
python-3.5.patch | 189 ------------------------------------------------
3 files changed, 4 insertions(+), 241 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-11-12 21:09:29 UTC (rev 250824)
+++ PKGBUILD 2015-11-13 07:41:34 UTC (rev 250825)
@@ -4,8 +4,8 @@
# Contributor: Pierre Schmitz <pie...@archlinux.de>
pkgname=cmake
-pkgver=3.3.2
-pkgrel=3
+pkgver=3.4.0
+pkgrel=1
pkgdesc='A cross-platform open-source make system'
arch=('i686' 'x86_64')
url="http://www.cmake.org/";
@@ -15,19 +15,11 @@
optdepends=('qt5-base: cmake-gui'
'libxkbcommon-x11: cmake-gui')
install="${pkgname}.install"
-source=("http://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz";
'kdelibs-4.14.11.patch' 'python-3.5.patch')
-md5sums=('5febbd11bcaac854a27eebaf4a124be2'
- '1eeec67ab4bff6d92430d52acdbde142'
- 'c172343ccd88551f8858de1c8806ab79')
+source=("http://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz";)
+md5sums=('cd3034e0a44256a0917e254167217fc8')
prepare() {
cd ${pkgname}-${pkgver}
-
-# fix build of KDE4 applications with kdelibs 4.14.11
http://www.cmake.org/gitweb?p=cmake.git;a=commit;h=b9ec9392da21a3421e48c6961976060d872faffb
- patch -p1 -i ../kdelibs-4.14.11.patch
-
-# fix detection of Python 3.5
- patch -p1 --no-backup-if-mismatch -i ../python-3.5.patch
}
build() {
Deleted: kdelibs-4.14.11.patch
===================================================================
--- kdelibs-4.14.11.patch 2015-11-12 21:09:29 UTC (rev 250824)
+++ kdelibs-4.14.11.patch 2015-11-13 07:41:34 UTC (rev 250825)
@@ -1,40 +0,0 @@
-From b9ec9392da21a3421e48c6961976060d872faffb Mon Sep 17 00:00:00 2001
-From: Rolf Eike Beer <e...@sf-mail.de>
-Date: Tue, 18 Aug 2015 12:14:43 +0200
-Subject: [PATCH 1/1] FindPkgConfig: remove variable dereference
-
-If CMAKE_MINIMUM_REQUIRED_VERSION is not set because no
-cmake_minimum_required() call is present this line can lead to an error as that
-string is empty so too few arguments are passed to if():
-
-See also
"/var/tmp/paludis/build/kde-krdc-15.08.0/work/build/CMakeFiles/CMakeOutput.log".
-See also
"/var/tmp/paludis/build/kde-krdc-15.08.0/work/build/CMakeFiles/CMakeError.log".
-CMake Error at /usr/share/cmake/Modules/FindPkgConfig.cmake:112 (elseif):
- given arguments:
-
- "VERSION_LESS" "3.1"
-
- Unknown arguments specified
-Call Stack (most recent call first):
- /usr/share/cmake/Modules/FindPkgConfig.cmake:501 (_pkgconfig_parse_options)
- /usr/share/cmake/Modules/FindOpenSSL.cmake:43 (pkg_check_modules)
----
- Modules/FindPkgConfig.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
-index 526a62e..ae6903e 100644
---- a/Modules/FindPkgConfig.cmake
-+++ b/Modules/FindPkgConfig.cmake
-@@ -109,7 +109,7 @@ macro(_pkgconfig_parse_options _result _is_req _is_silent
_no_cmake_path _no_cma
- set(${_no_cmake_path} 1)
- set(${_no_cmake_environment_path} 1)
- endif()
-- elseif(${CMAKE_MINIMUM_REQUIRED_VERSION} VERSION_LESS 3.1)
-+ elseif(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 3.1)
- set(${_no_cmake_path} 1)
- set(${_no_cmake_environment_path} 1)
- endif()
---
-1.7.10.4
-
Deleted: python-3.5.patch
===================================================================
--- python-3.5.patch 2015-11-12 21:09:29 UTC (rev 250824)
+++ python-3.5.patch 2015-11-13 07:41:34 UTC (rev 250825)
@@ -1,189 +0,0 @@
-diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake
-index 8784e18..879192e 100644
---- a/Modules/FindPythonInterp.cmake
-+++ b/Modules/FindPythonInterp.cmake
-@@ -51,7 +51,7 @@ unset(_Python_NAMES)
-
- set(_PYTHON1_VERSIONS 1.6 1.5)
- set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
--set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0)
-+set(_PYTHON3_VERSIONS 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
-
- if(PythonInterp_FIND_VERSION)
- if(PythonInterp_FIND_VERSION_COUNT GREATER 1)
---- a/Modules/FindPythonLibs.cmake 2015-09-17 00:53:05.000000000 +0800
-+++ b/Modules/FindPythonLibs.cmake 2015-09-20 10:49:56.252386270 +0800
-@@ -49,13 +49,41 @@
- # (To distribute this file outside of CMake, substitute the full
- # License text for the above reference.)
-
-+# Use the executable's path as a hint
-+set(_Python_LIBRARY_PATH_HINT)
-+if(PYTHON_EXECUTABLE)
-+ if(WIN32)
-+ get_filename_component(_Python_PREFIX ${PYTHON_EXECUTABLE} PATH)
-+ if(_Python_PREFIX)
-+ set(_Python_LIBRARY_PATH_HINT ${_Python_PREFIX}/libs)
-+ endif()
-+ unset(_Python_PREFIX)
-+ else()
-+ get_filename_component(_Python_PREFIX ${PYTHON_EXECUTABLE} PATH)
-+ get_filename_component(_Python_PREFIX ${_Python_PREFIX} PATH)
-+ if(_Python_PREFIX)
-+ set(_Python_LIBRARY_PATH_HINT ${_Python_PREFIX}/lib)
-+ endif()
-+ unset(_Python_PREFIX)
-+ endif()
-+endif()
-+
- include(${CMAKE_CURRENT_LIST_DIR}/CMakeFindFrameworks.cmake)
- # Search for the python framework on Apple.
- CMAKE_FIND_FRAMEWORKS(Python)
-
-+# Save CMAKE_FIND_FRAMEWORK
-+if(DEFINED CMAKE_FIND_FRAMEWORK)
-+ set(_PythonLibs_CMAKE_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK})
-+else()
-+ unset(_PythonLibs_CMAKE_FIND_FRAMEWORK)
-+endif()
-+# To avoid picking up the system Python.h pre-maturely.
-+set(CMAKE_FIND_FRAMEWORK LAST)
-+
- set(_PYTHON1_VERSIONS 1.6 1.5)
- set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
--set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0)
-+set(_PYTHON3_VERSIONS 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
-
- if(PythonLibs_FIND_VERSION)
- if(PythonLibs_FIND_VERSION_COUNT GREATER 1)
-@@ -103,6 +131,7 @@
- if(WIN32)
- find_library(PYTHON_DEBUG_LIBRARY
- NAMES python${_CURRENT_VERSION_NO_DOTS}_d python
-+ HINTS ${_Python_LIBRARY_PATH_HINT}
- PATHS
-
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs/Debug
-
[HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs/Debug
-@@ -111,14 +140,24 @@
- )
- endif()
-
-+ set(PYTHON_FRAMEWORK_LIBRARIES)
-+ if(Python_FRAMEWORKS AND NOT PYTHON_LIBRARY)
-+ foreach(dir ${Python_FRAMEWORKS})
-+ list(APPEND PYTHON_FRAMEWORK_LIBRARIES
-+ ${dir}/Versions/${_CURRENT_VERSION}/lib)
-+ endforeach()
-+ endif()
- find_library(PYTHON_LIBRARY
- NAMES
-- python${_CURRENT_VERSION_NO_DOTS}
-- python${_CURRENT_VERSION}mu
-- python${_CURRENT_VERSION}m
-- python${_CURRENT_VERSION}u
-- python${_CURRENT_VERSION}
-+ python${_CURRENT_VERSION_NO_DOTS}
-+ python${_CURRENT_VERSION}mu
-+ python${_CURRENT_VERSION}m
-+ python${_CURRENT_VERSION}u
-+ python${_CURRENT_VERSION}
-+ HINTS
-+ ${_Python_LIBRARY_PATH_HINT}
- PATHS
-+ ${PYTHON_FRAMEWORK_LIBRARIES}
-
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs
-
[HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs
- # Avoid finding the .dll in the PATH. We want the .lib.
-@@ -133,33 +172,42 @@
- PATH_SUFFIXES python${_CURRENT_VERSION}/config
- )
-
-- # For backward compatibility, honour value of PYTHON_INCLUDE_PATH, if
-- # PYTHON_INCLUDE_DIR is not set.
-- if(DEFINED PYTHON_INCLUDE_PATH AND NOT DEFINED PYTHON_INCLUDE_DIR)
-- set(PYTHON_INCLUDE_DIR "${PYTHON_INCLUDE_PATH}" CACHE PATH
-- "Path to where Python.h is found" FORCE)
-- endif()
-+ # Don't search for include dir until library location is known
-+ if(PYTHON_LIBRARY)
-
-- set(PYTHON_FRAMEWORK_INCLUDES)
-- if(Python_FRAMEWORKS AND NOT PYTHON_INCLUDE_DIR)
-- foreach(dir ${Python_FRAMEWORKS})
-- set(PYTHON_FRAMEWORK_INCLUDES ${PYTHON_FRAMEWORK_INCLUDES}
-- ${dir}/Versions/${_CURRENT_VERSION}/include/python${_CURRENT_VERSION})
-- endforeach()
-- endif()
-+ # Use the library's install prefix as a hint
-+ set(_Python_INCLUDE_PATH_HINT)
-+ get_filename_component(_Python_PREFIX ${PYTHON_LIBRARY} PATH)
-+ get_filename_component(_Python_PREFIX ${_Python_PREFIX} PATH)
-+ if(_Python_PREFIX)
-+ set(_Python_INCLUDE_PATH_HINT ${_Python_PREFIX}/include)
-+ endif()
-+ unset(_Python_PREFIX)
-
-- find_path(PYTHON_INCLUDE_DIR
-- NAMES Python.h
-- PATHS
-- ${PYTHON_FRAMEWORK_INCLUDES}
--
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/include
--
[HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/include
-- PATH_SUFFIXES
-- python${_CURRENT_VERSION}mu
-- python${_CURRENT_VERSION}m
-- python${_CURRENT_VERSION}u
-- python${_CURRENT_VERSION}
-- )
-+ # Add framework directories to the search paths
-+ set(PYTHON_FRAMEWORK_INCLUDES)
-+ if(Python_FRAMEWORKS AND NOT PYTHON_INCLUDE_DIR)
-+ foreach(dir ${Python_FRAMEWORKS})
-+ list(APPEND PYTHON_FRAMEWORK_INCLUDES
-+ ${dir}/Versions/${_CURRENT_VERSION}/include)
-+ endforeach()
-+ endif()
-+
-+ find_path(PYTHON_INCLUDE_DIR
-+ NAMES Python.h
-+ HINTS
-+ ${_Python_INCLUDE_PATH_HINT}
-+ PATHS
-+ ${PYTHON_FRAMEWORK_INCLUDES}
-+
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/include
-+
[HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/include
-+ PATH_SUFFIXES
-+ python${_CURRENT_VERSION}mu
-+ python${_CURRENT_VERSION}m
-+ python${_CURRENT_VERSION}u
-+ python${_CURRENT_VERSION}
-+ )
-+ endif()
-
- # For backward compatibility, set PYTHON_INCLUDE_PATH.
- set(PYTHON_INCLUDE_PATH "${PYTHON_INCLUDE_DIR}")
-@@ -177,6 +225,9 @@
- endif()
- endforeach()
-
-+unset(_Python_INCLUDE_PATH_HINT)
-+unset(_Python_LIBRARY_PATH_HINT)
-+
- mark_as_advanced(
- PYTHON_DEBUG_LIBRARY
- PYTHON_LIBRARY
-@@ -201,6 +252,14 @@
- # for historical reasons.
- unset(PYTHON_FOUND)
-
-+# Restore CMAKE_FIND_FRAMEWORK
-+if(DEFINED _PythonLibs_CMAKE_FIND_FRAMEWORK)
-+ set(CMAKE_FIND_FRAMEWORK ${_PythonLibs_CMAKE_FIND_FRAMEWORK})
-+ unset(_PythonLibs_CMAKE_FIND_FRAMEWORK)
-+else()
-+ unset(CMAKE_FIND_FRAMEWORK)
-+endif()
-+
- include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(PythonLibs
- REQUIRED_VARS PYTHON_LIBRARIES
PYTHON_INCLUDE_DIRS
