[arch-commits] Commit in cmake/trunk (2 files)

[Bartłomiej Piotrowski]

    Date: Thursday, March 20, 2014 @ 08:54:53
  Author: bpiotrowski
Revision: 208237

upgpkg: cmake 2.8.12.2-2

backport python 3.4 support

Added:
  cmake/trunk/FindPython-Interp-Libs-Search-for-Python-3.4.patch
Modified:
  cmake/trunk/PKGBUILD

----------------------------------------------------+
 FindPython-Interp-Libs-Search-for-Python-3.4.patch |   40 +++++++++++++++++++
 PKGBUILD                                           |    9 ++--
 2 files changed, 46 insertions(+), 3 deletions(-)

Added: FindPython-Interp-Libs-Search-for-Python-3.4.patch
===================================================================
--- FindPython-Interp-Libs-Search-for-Python-3.4.patch	                        (rev 0)
+++ FindPython-Interp-Libs-Search-for-Python-3.4.patch	2014-03-20 07:54:53 UTC (rev 208237)
@@ -0,0 +1,40 @@
+From ab6201ab647c13fee44c44822b8502e9848faaaf Mon Sep 17 00:00:00 2001
+From: Matt McCormick <matt.mccormick at kitware.com>
+Date: Wed, 5 Mar 2014 17:41:47 -0500
+Subject: [PATCH] FindPython{Interp,Libs}: Search for Python 3.4.
+
+Python 3.4.0rnc1 was released on 2014-02-20.
+---
+ Modules/FindPythonInterp.cmake | 2 +-
+ Modules/FindPythonLibs.cmake   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake
+index 8da848c..e23a58b 100644
+--- a/Modules/FindPythonInterp.cmake
++++ b/Modules/FindPythonInterp.cmake
+@@ -47,7 +47,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.3 3.2 3.1 3.0)
++set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0)
+ 
+ if(PythonInterp_FIND_VERSION)
+     if(PythonInterp_FIND_VERSION_COUNT GREATER 1)
+diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
+index 0749efc..1dbc967 100644
+--- a/Modules/FindPythonLibs.cmake
++++ b/Modules/FindPythonLibs.cmake
+@@ -51,7 +51,7 @@ CMAKE_FIND_FRAMEWORKS(Python)
+ 
+ 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.3 3.2 3.1 3.0)
++set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0)
+ 
+ if(PythonLibs_FIND_VERSION)
+     if(PythonLibs_FIND_VERSION_COUNT GREATER 1)
+-- 
+1.9.0
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-20 06:29:06 UTC (rev 208236)
+++ PKGBUILD	2014-03-20 07:54:53 UTC (rev 208237)
@@ -4,7 +4,7 @@
 
 pkgname=cmake
 pkgver=2.8.12.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A cross-platform open-source make system"
 arch=('i686' 'x86_64')
 url="http://www.cmake.org/"
@@ -14,14 +14,17 @@
 optdepends=('qt4: cmake-gui')
 install="${pkgname}.install"
 source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz"
-        "findfreetype.patch")
+        "findfreetype.patch"
+        "FindPython-Interp-Libs-Search-for-Python-3.4.patch")
 md5sums=('17c6513483d23590cbce6957ec6d1e66'
-         '90321de1d9d46cd8d6609d0509dbd7b0')
+         '90321de1d9d46cd8d6609d0509dbd7b0'
+         '5e036a37f9b0b3368b8cfcc5784d1514')
 
 build() {
   cd ${pkgname}-${pkgver}
 
   patch -Np1 < ${srcdir}/findfreetype.patch
+  patch -Np1 < ${srcdir}/FindPython-Interp-Libs-Search-for-Python-3.4.patch
 
   ./bootstrap --prefix=/usr \
     --mandir=/share/man \