[arch-commits] Commit in cmake/repos (14 files)
Bartłomiej Piotrowski
bpiotrowski at nymeria.archlinux.org
Thu Mar 20 07:55:00 UTC 2014
Date: Thursday, March 20, 2014 @ 08:54:59
Author: bpiotrowski
Revision: 208238
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
cmake/repos/extra-i686/FindPython-Interp-Libs-Search-for-Python-3.4.patch
(from rev 208237, cmake/trunk/FindPython-Interp-Libs-Search-for-Python-3.4.patch)
cmake/repos/extra-i686/PKGBUILD
(from rev 208237, cmake/trunk/PKGBUILD)
cmake/repos/extra-i686/cmake.install
(from rev 208237, cmake/trunk/cmake.install)
cmake/repos/extra-i686/findfreetype.patch
(from rev 208237, cmake/trunk/findfreetype.patch)
cmake/repos/extra-x86_64/FindPython-Interp-Libs-Search-for-Python-3.4.patch
(from rev 208237, cmake/trunk/FindPython-Interp-Libs-Search-for-Python-3.4.patch)
cmake/repos/extra-x86_64/PKGBUILD
(from rev 208237, cmake/trunk/PKGBUILD)
cmake/repos/extra-x86_64/cmake.install
(from rev 208237, cmake/trunk/cmake.install)
cmake/repos/extra-x86_64/findfreetype.patch
(from rev 208237, cmake/trunk/findfreetype.patch)
Deleted:
cmake/repos/extra-i686/PKGBUILD
cmake/repos/extra-i686/cmake.install
cmake/repos/extra-i686/findfreetype.patch
cmake/repos/extra-x86_64/PKGBUILD
cmake/repos/extra-x86_64/cmake.install
cmake/repos/extra-x86_64/findfreetype.patch
-----------------------------------------------------------------+
/PKGBUILD | 104 ++++++++++
/cmake.install | 24 ++
/findfreetype.patch | 52 +++++
extra-i686/FindPython-Interp-Libs-Search-for-Python-3.4.patch | 40 +++
extra-i686/PKGBUILD | 49 ----
extra-i686/cmake.install | 12 -
extra-i686/findfreetype.patch | 26 --
extra-x86_64/FindPython-Interp-Libs-Search-for-Python-3.4.patch | 40 +++
extra-x86_64/PKGBUILD | 49 ----
extra-x86_64/cmake.install | 12 -
extra-x86_64/findfreetype.patch | 26 --
11 files changed, 260 insertions(+), 174 deletions(-)
Copied: cmake/repos/extra-i686/FindPython-Interp-Libs-Search-for-Python-3.4.patch (from rev 208237, cmake/trunk/FindPython-Interp-Libs-Search-for-Python-3.4.patch)
===================================================================
--- extra-i686/FindPython-Interp-Libs-Search-for-Python-3.4.patch (rev 0)
+++ extra-i686/FindPython-Interp-Libs-Search-for-Python-3.4.patch 2014-03-20 07:54:59 UTC (rev 208238)
@@ -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
+
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-03-20 07:54:53 UTC (rev 208237)
+++ extra-i686/PKGBUILD 2014-03-20 07:54:59 UTC (rev 208238)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=cmake
-pkgver=2.8.12.2
-pkgrel=1
-pkgdesc="A cross-platform open-source make system"
-arch=('i686' 'x86_64')
-url="http://www.cmake.org/"
-license=('custom')
-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"
- "findfreetype.patch")
-md5sums=('17c6513483d23590cbce6957ec6d1e66'
- '90321de1d9d46cd8d6609d0509dbd7b0')
-
-build() {
- cd ${pkgname}-${pkgver}
-
- patch -Np1 < ${srcdir}/findfreetype.patch
-
- ./bootstrap --prefix=/usr \
- --mandir=/share/man \
- --docdir=/share/doc/cmake \
- --system-libs \
- --qt-gui \
- --parallel=$(/usr/bin/getconf _NPROCESSORS_ONLN)
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- 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
-
- 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
-
- install -Dm644 Copyright.txt \
- "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
Copied: cmake/repos/extra-i686/PKGBUILD (from rev 208237, cmake/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-03-20 07:54:59 UTC (rev 208238)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=cmake
+pkgver=2.8.12.2
+pkgrel=2
+pkgdesc="A cross-platform open-source make system"
+arch=('i686' 'x86_64')
+url="http://www.cmake.org/"
+license=('custom')
+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"
+ "findfreetype.patch"
+ "FindPython-Interp-Libs-Search-for-Python-3.4.patch")
+md5sums=('17c6513483d23590cbce6957ec6d1e66'
+ '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 \
+ --docdir=/share/doc/cmake \
+ --system-libs \
+ --qt-gui \
+ --parallel=$(/usr/bin/getconf _NPROCESSORS_ONLN)
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ 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
+
+ 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
+
+ install -Dm644 Copyright.txt \
+ "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
Deleted: extra-i686/cmake.install
===================================================================
--- extra-i686/cmake.install 2014-03-20 07:54:53 UTC (rev 208237)
+++ extra-i686/cmake.install 2014-03-20 07:54:59 UTC (rev 208238)
@@ -1,12 +0,0 @@
-post_install() {
- update-mime-database usr/share/mime &> /dev/null
- [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: cmake/repos/extra-i686/cmake.install (from rev 208237, cmake/trunk/cmake.install)
===================================================================
--- extra-i686/cmake.install (rev 0)
+++ extra-i686/cmake.install 2014-03-20 07:54:59 UTC (rev 208238)
@@ -0,0 +1,12 @@
+post_install() {
+ update-mime-database usr/share/mime &> /dev/null
+ [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: extra-i686/findfreetype.patch
===================================================================
--- extra-i686/findfreetype.patch 2014-03-20 07:54:53 UTC (rev 208237)
+++ extra-i686/findfreetype.patch 2014-03-20 07:54:59 UTC (rev 208238)
@@ -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
Copied: cmake/repos/extra-i686/findfreetype.patch (from rev 208237, cmake/trunk/findfreetype.patch)
===================================================================
--- extra-i686/findfreetype.patch (rev 0)
+++ extra-i686/findfreetype.patch 2014-03-20 07:54:59 UTC (rev 208238)
@@ -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
Copied: cmake/repos/extra-x86_64/FindPython-Interp-Libs-Search-for-Python-3.4.patch (from rev 208237, cmake/trunk/FindPython-Interp-Libs-Search-for-Python-3.4.patch)
===================================================================
--- extra-x86_64/FindPython-Interp-Libs-Search-for-Python-3.4.patch (rev 0)
+++ extra-x86_64/FindPython-Interp-Libs-Search-for-Python-3.4.patch 2014-03-20 07:54:59 UTC (rev 208238)
@@ -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
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-03-20 07:54:53 UTC (rev 208237)
+++ extra-x86_64/PKGBUILD 2014-03-20 07:54:59 UTC (rev 208238)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=cmake
-pkgver=2.8.12.2
-pkgrel=1
-pkgdesc="A cross-platform open-source make system"
-arch=('i686' 'x86_64')
-url="http://www.cmake.org/"
-license=('custom')
-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"
- "findfreetype.patch")
-md5sums=('17c6513483d23590cbce6957ec6d1e66'
- '90321de1d9d46cd8d6609d0509dbd7b0')
-
-build() {
- cd ${pkgname}-${pkgver}
-
- patch -Np1 < ${srcdir}/findfreetype.patch
-
- ./bootstrap --prefix=/usr \
- --mandir=/share/man \
- --docdir=/share/doc/cmake \
- --system-libs \
- --qt-gui \
- --parallel=$(/usr/bin/getconf _NPROCESSORS_ONLN)
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- 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
-
- 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
-
- install -Dm644 Copyright.txt \
- "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
Copied: cmake/repos/extra-x86_64/PKGBUILD (from rev 208237, cmake/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-03-20 07:54:59 UTC (rev 208238)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=cmake
+pkgver=2.8.12.2
+pkgrel=2
+pkgdesc="A cross-platform open-source make system"
+arch=('i686' 'x86_64')
+url="http://www.cmake.org/"
+license=('custom')
+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"
+ "findfreetype.patch"
+ "FindPython-Interp-Libs-Search-for-Python-3.4.patch")
+md5sums=('17c6513483d23590cbce6957ec6d1e66'
+ '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 \
+ --docdir=/share/doc/cmake \
+ --system-libs \
+ --qt-gui \
+ --parallel=$(/usr/bin/getconf _NPROCESSORS_ONLN)
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ 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
+
+ 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
+
+ install -Dm644 Copyright.txt \
+ "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
Deleted: extra-x86_64/cmake.install
===================================================================
--- extra-x86_64/cmake.install 2014-03-20 07:54:53 UTC (rev 208237)
+++ extra-x86_64/cmake.install 2014-03-20 07:54:59 UTC (rev 208238)
@@ -1,12 +0,0 @@
-post_install() {
- update-mime-database usr/share/mime &> /dev/null
- [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: cmake/repos/extra-x86_64/cmake.install (from rev 208237, cmake/trunk/cmake.install)
===================================================================
--- extra-x86_64/cmake.install (rev 0)
+++ extra-x86_64/cmake.install 2014-03-20 07:54:59 UTC (rev 208238)
@@ -0,0 +1,12 @@
+post_install() {
+ update-mime-database usr/share/mime &> /dev/null
+ [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: extra-x86_64/findfreetype.patch
===================================================================
--- extra-x86_64/findfreetype.patch 2014-03-20 07:54:53 UTC (rev 208237)
+++ extra-x86_64/findfreetype.patch 2014-03-20 07:54:59 UTC (rev 208238)
@@ -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
Copied: cmake/repos/extra-x86_64/findfreetype.patch (from rev 208237, cmake/trunk/findfreetype.patch)
===================================================================
--- extra-x86_64/findfreetype.patch (rev 0)
+++ extra-x86_64/findfreetype.patch 2014-03-20 07:54:59 UTC (rev 208238)
@@ -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
More information about the arch-commits
mailing list