Date: Wednesday, June 11, 2014 @ 00:45:39 Author: andrea Revision: 214961
upgpkg: cmake 3.0.0-1 Upstream release Modified: cmake/trunk/PKGBUILD Deleted: cmake/trunk/FindPython-Interp-Libs-Search-for-Python-3.4.patch cmake/trunk/findfreetype.patch ----------------------------------------------------+ FindPython-Interp-Libs-Search-for-Python-3.4.patch | 40 ------------------- PKGBUILD | 25 ++++------- findfreetype.patch | 26 ------------ 3 files changed, 9 insertions(+), 82 deletions(-) Deleted: FindPython-Interp-Libs-Search-for-Python-3.4.patch =================================================================== --- FindPython-Interp-Libs-Search-for-Python-3.4.patch 2014-06-10 19:20:46 UTC (rev 214960) +++ FindPython-Interp-Libs-Search-for-Python-3.4.patch 2014-06-10 22:45:39 UTC (rev 214961) @@ -1,40 +0,0 @@ -From ab6201ab647c13fee44c44822b8502e9848faaaf Mon Sep 17 00:00:00 2001 -From: Matt McCormick <[email protected]> -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-06-10 19:20:46 UTC (rev 214960) +++ PKGBUILD 2014-06-10 22:45:39 UTC (rev 214961) @@ -3,8 +3,8 @@ # Contributor: Pierre Schmitz <[email protected]> pkgname=cmake -pkgver=2.8.12.2 -pkgrel=2 +pkgver=3.0.0 +pkgrel=1 pkgdesc="A cross-platform open-source make system" arch=('i686' 'x86_64') url="http://www.cmake.org/"; @@ -13,19 +13,12 @@ makedepends=('qt4' 'emacs') optdepends=('qt4: cmake-gui') install="${pkgname}.install" -source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz"; - "findfreetype.patch" - "FindPython-Interp-Libs-Search-for-Python-3.4.patch") -md5sums=('17c6513483d23590cbce6957ec6d1e66' - '90321de1d9d46cd8d6609d0509dbd7b0' - '5e036a37f9b0b3368b8cfcc5784d1514') +source=("http://www.cmake.org/files/v3.0/${pkgname}-${pkgver}.tar.gz";) +md5sums=('21a1c85e1a3b803c4b48e7ff915a863e') 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 \ --docdir=/share/doc/cmake \ @@ -40,12 +33,12 @@ make DESTDIR="${pkgdir}" install vimpath="${pkgdir}/usr/share/vim/vimfiles" - install -Dm644 Docs/cmake-indent.vim "${vimpath}"/indent/cmake-indent.vim - install -Dm644 Docs/cmake-syntax.vim "${vimpath}"/syntax/cmake-syntax.vim + mkdir -p "${vimpath}"/{help,indent,syntax} + ln -s /usr/share/cmake-3.0/editors/vim/cmake-help.vim "${vimpath}"/help/ + ln -s /usr/share/cmake-3.0/editors/vim/cmake-indent.vim "${vimpath}"/indent/ + ln -s /usr/share/cmake-3.0/editors/vim/cmake-syntax.vim "${vimpath}"/syntax/ - install -Dm644 Docs/cmake-mode.el \ - "${pkgdir}"/usr/share/emacs/site-lisp/cmake-mode.el - emacs -batch -f batch-byte-compile "${pkgdir}"/usr/share/emacs/site-lisp/cmake-mode.el + emacs -batch -f batch-byte-compile "${pkgdir}"/usr/share/cmake-3.0/editors/emacs/cmake-mode.el install -Dm644 Copyright.txt \ "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE Deleted: findfreetype.patch =================================================================== --- findfreetype.patch 2014-06-10 19:20:46 UTC (rev 214960) +++ findfreetype.patch 2014-06-10 22:45:39 UTC (rev 214961) @@ -1,26 +0,0 @@ -diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake -index 179dc00..0f5a2b4 100644 ---- a/Modules/FindFreetype.cmake -+++ b/Modules/FindFreetype.cmake -@@ -62,10 +62,10 @@ find_path(FREETYPE_INCLUDE_DIR_ft2build ft2build.h - ENV GTKMM_BASEPATH - [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path] - [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path] -- PATH_SUFFIXES include/freetype2 include -+ PATH_SUFFIXES include/freetype2 include/freetype include - ) - --find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h -+find_path(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h - HINTS - ENV FREETYPE_DIR - PATHS -@@ -76,7 +76,7 @@ find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h - ENV GTKMM_BASEPATH - [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path] - [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path] -- PATH_SUFFIXES include/freetype2 include -+ PATH_SUFFIXES include/freetype2 include/freetype include include/freetype2/freetype - ) - - find_library(FREETYPE_LIBRARY
