[arch-commits] Commit in cmake/trunk (PKGBUILD python-3.5.patch)

[Felix Yan]

    Date: Saturday, September 19, 2015 @ 18:03:51
  Author: fyan
Revision: 246643

upgpkg: cmake 3.3.2-2

add a patch to detech python 3.5

Added:
  cmake/trunk/python-3.5.patch
Modified:
  cmake/trunk/PKGBUILD

------------------+
 PKGBUILD         |   10 +++++++---
 python-3.5.patch |   36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-19 15:34:59 UTC (rev 246642)
+++ PKGBUILD	2015-09-19 16:03:51 UTC (rev 246643)
@@ -5,7 +5,7 @@
 
 pkgname=cmake
 pkgver=3.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc='A cross-platform open-source make system'
 arch=('i686' 'x86_64')
 url="http://www.cmake.org/"
@@ -15,9 +15,10 @@
 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')
+source=("http://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz" 'kdelibs-4.14.11.patch' 'python-3.5.patch')
 md5sums=('5febbd11bcaac854a27eebaf4a124be2'
-         '1eeec67ab4bff6d92430d52acdbde142')
+         '1eeec67ab4bff6d92430d52acdbde142'
+         'cc5305ef44b935ef85e5ed2773a01aee')
 
 prepare() {
   cd ${pkgname}-${pkgver}
@@ -24,6 +25,9 @@
 
 # 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() {

Added: python-3.5.patch
===================================================================
--- python-3.5.patch	                        (rev 0)
+++ python-3.5.patch	2015-09-19 16:03:51 UTC (rev 246643)
@@ -0,0 +1,36 @@
+From 2db092b1f60b3677a2d44d5563bec216ae687e2f Mon Sep 17 00:00:00 2001
+From: David Gobbi <david.gobbi at gmail.com>
+Date: Mon, 14 Sep 2015 21:44:36 -0600
+Subject: [PATCH] FindPython{Interp,Libs}: Add versions 3.5 and 3.6
+
+---
+ 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 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)
+diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
+index b80d3ce..d01fae4 100644
+--- a/Modules/FindPythonLibs.cmake
++++ b/Modules/FindPythonLibs.cmake
+@@ -64,7 +64,7 @@ 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)