diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-12-27 23:55:53 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-12-27 23:55:53 +0000 |
| commit | 65eeff79fff8a1bfdf67ca51d147384f46f4d5c0 (patch) | |
| tree | fbfdff322b28d9a3c37e6e31c94caf1d8e48dac1 /extra/cmake | |
| parent | d53c44f055929b18d7d1b25f8367ee5836c435fc (diff) | |
Fri Dec 27 23:54:04 UTC 2013
Diffstat (limited to 'extra/cmake')
| -rw-r--r-- | extra/cmake/PKGBUILD | 14 | ||||
| -rw-r--r-- | extra/cmake/findfreetype.patch | 26 |
2 files changed, 35 insertions, 5 deletions
diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD index aed99644a..81cae3171 100644 --- a/extra/cmake/PKGBUILD +++ b/extra/cmake/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 196220 2013-10-08 19:06:31Z andrea $ +# $Id: PKGBUILD 200685 2013-12-02 11:59:05Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=cmake -pkgver=2.8.12 -pkgrel=1 +pkgver=2.8.12.1 +pkgrel=3 pkgdesc="A cross-platform open-source make system" arch=('i686' 'x86_64') url="http://www.cmake.org/" @@ -13,12 +13,16 @@ depends=('curl' 'libarchive' 'shared-mime-info') makedepends=('qt4' 'emacs') optdepends=('qt4: cmake-gui') install="${pkgname}.install" -source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz") -md5sums=('105bc6d21cc2e9b6aff901e43c53afea') +source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz" + "findfreetype.patch") +md5sums=('9d38cd4e2c94c3cea97d0e2924814acc' + '90321de1d9d46cd8d6609d0509dbd7b0') build() { cd ${pkgname}-${pkgver} + patch -Np1 < ${srcdir}/findfreetype.patch + ./bootstrap --prefix=/usr \ --mandir=/share/man \ --docdir=/share/doc/cmake \ diff --git a/extra/cmake/findfreetype.patch b/extra/cmake/findfreetype.patch new file mode 100644 index 000000000..454b591dd --- /dev/null +++ b/extra/cmake/findfreetype.patch @@ -0,0 +1,26 @@ +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 |