[arch-commits] Commit in cmake/trunk (PKGBUILD python2.7.patch)
Andrea Scarpino
andrea at archlinux.org
Thu Nov 4 07:38:02 UTC 2010
Date: Thursday, November 4, 2010 @ 03:38:02
Author: andrea
Revision: 98165
upstream release
Modified:
cmake/trunk/PKGBUILD
Deleted:
cmake/trunk/python2.7.patch
-----------------+
PKGBUILD | 14 ++++++--------
python2.7.patch | 24 ------------------------
2 files changed, 6 insertions(+), 32 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-11-03 23:14:43 UTC (rev 98164)
+++ PKGBUILD 2010-11-04 07:38:02 UTC (rev 98165)
@@ -5,8 +5,8 @@
# Contributor: Konstantinos Pachnis <kpachnis at mes-direct.com>
pkgname=cmake
-pkgver=2.8.2
-pkgrel=3
+pkgver=2.8.3
+pkgrel=1
pkgdesc="A cross-platform open-source make system"
arch=('i686' 'x86_64')
license=('custom')
@@ -14,15 +14,12 @@
depends=('expat' 'curl' 'gcc-libs' 'shared-mime-info')
makedepends=('qt')
optdepends=('qt: cmake-gui')
-install=${pkgname}.install
-source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz"
- 'python2.7.patch')
-md5sums=('8c967d5264657a798f22ee23976ff0d9'
- '308304c7a8f48ccfc86d6d1e4b2cdf91')
+install="${pkgname}.install"
+source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz")
+md5sums=('8c967d5264657a798f22ee23976ff0d9')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- patch -Np1 -i ${srcdir}/python2.7.patch
./bootstrap --prefix=/usr \
--mandir=/share/man \
@@ -43,3 +40,4 @@
install -Dm644 Docs/cmake-mode.el ${pkgdir}/usr/share/emacs/site-lisp/cmake-mode.el
install -Dm644 Copyright.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
}
+md5sums=('a76a44b93acf5e3badda9de111385921')
Deleted: python2.7.patch
===================================================================
--- python2.7.patch 2010-11-03 23:14:43 UTC (rev 98164)
+++ python2.7.patch 2010-11-04 07:38:02 UTC (rev 98165)
@@ -1,24 +0,0 @@
---- cmake-2.8.2/Modules/FindPythonLibs.cmake~ 2010-09-10 23:34:55.733333338 +0200
-+++ cmake-2.8.2/Modules/FindPythonLibs.cmake 2010-09-10 23:35:15.980000004 +0200
-@@ -27,7 +27,7 @@
- # Search for the python framework on Apple.
- CMAKE_FIND_FRAMEWORKS(Python)
-
--FOREACH(_CURRENT_VERSION 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
-+FOREACH(_CURRENT_VERSION 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
- STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION})
- IF(WIN32)
- FIND_LIBRARY(PYTHON_DEBUG_LIBRARY
---- cmake-2.8.2/Modules/FindPythonInterp.cmake~ 2010-09-10 23:44:15.746666671 +0200
-+++ cmake-2.8.2/Modules/FindPythonInterp.cmake 2010-09-10 23:44:34.643333339 +0200
-@@ -20,8 +20,9 @@
- # License text for the above reference.)
-
- FIND_PROGRAM(PYTHON_EXECUTABLE
-- NAMES python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python
-+ NAMES python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python
- PATHS
-+ [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath]
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]
More information about the arch-commits
mailing list