diff options
| author |   Johannes Huber <johu@gentoo.org> | 2013-12-15 00:16:15 +0000 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2013-12-15 00:16:15 +0000 |
| commit | 1992a5741b3face7b12cd5f3e869971e08ec16d0 (patch) | |
| tree | c592ef8c098bef002651ced07919737f5ddbf4e8 /dev-util | |
| parent | Port to python-single-r1 by floppym (diff) | |
| download | gentoo-2-1992a5741b3face7b12cd5f3e869971e08ec16d0.tar.gz gentoo-2-1992a5741b3face7b12cd5f3e869971e08ec16d0.tar.bz2 gentoo-2-1992a5741b3face7b12cd5f3e869971e08ec16d0.zip | |
Revision bump add patch by Julian Ospald <hasufell@gentoo.org> to unbreak find logic for media-libs/freetype-2.5.1, bug #493656.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/cmake/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-util/cmake/cmake-2.8.12.1-r2.ebuild (renamed from dev-util/cmake/cmake-2.8.12.1-r1.ebuild) | 3 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-2.8.12.1-FindFreetype.patch | 43 |
3 files changed, 53 insertions, 2 deletions
diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog index 182be1505535..c0099ab6a608 100644 --- a/dev-util/cmake/ChangeLog +++ b/dev-util/cmake/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-util/cmake # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.264 2013/11/30 15:13:15 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.265 2013/12/15 00:16:15 johu Exp $ + +*cmake-2.8.12.1-r2 (14 Dec 2013) + + 14 Dec 2013; Johannes Huber <johu@gentoo.org> +cmake-2.8.12.1-r2.ebuild, + +files/cmake-2.8.12.1-FindFreetype.patch, -cmake-2.8.12.1-r1.ebuild: + Revision bump add patch by Julian Ospald <hasufell@gentoo.org> to unbreak find + logic for media-libs/freetype-2.5.1, bug #493656. 30 Nov 2013; Johannes Huber <johu@gentoo.org> cmake-2.8.11.2.ebuild: x86 stable wrt bug #488586 diff --git a/dev-util/cmake/cmake-2.8.12.1-r1.ebuild b/dev-util/cmake/cmake-2.8.12.1-r2.ebuild index 4339e91d4370..973c300bb15f 100644 --- a/dev-util/cmake/cmake-2.8.12.1-r1.ebuild +++ b/dev-util/cmake/cmake-2.8.12.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.12.1-r1.ebuild,v 1.1 2013/11/13 18:26:34 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.12.1-r2.ebuild,v 1.1 2013/12/15 00:16:15 johu Exp $ EAPI=5 @@ -70,6 +70,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.8.11-FindBoost-python.patch "${FILESDIR}"/${PN}-2.8.11-more-no_host_paths.patch "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch + "${FILESDIR}"/${PN}-2.8.12.1-FindFreetype.patch ) cmake_src_bootstrap() { diff --git a/dev-util/cmake/files/cmake-2.8.12.1-FindFreetype.patch b/dev-util/cmake/files/cmake-2.8.12.1-FindFreetype.patch new file mode 100644 index 000000000000..6dc244c239c5 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.12.1-FindFreetype.patch @@ -0,0 +1,43 @@ +From: Julian Ospald <hasufell@gentoo.org> +Date: Sun Dec 8 13:38:06 UTC 2013 +Subject: fix check for freetype-2.5.1 + +--- Modules/FindFreetype.cmake ++++ Modules/FindFreetype.cmake +@@ -64,6 +64,19 @@ + PATH_SUFFIXES include/freetype2 include + ) + ++if(NOT FREETYPE_INCLUDE_DIR_freetype2) ++ find_path(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h ++ HINTS ++ ENV FREETYPE_DIR ++ PATHS ++ /usr/X11R6 ++ /usr/local/X11R6 ++ /usr/local/X11 ++ /usr/freeware ++ PATH_SUFFIXES include/freetype2 include ++ ) ++endif() ++ + find_library(FREETYPE_LIBRARY + NAMES freetype libfreetype freetype219 + HINTS +@@ -82,8 +95,14 @@ + endif() + set(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}") + +-if(FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h") +- file(STRINGS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h" freetype_version_str ++if(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h") ++ set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h") ++elseif(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h") ++ set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h") ++endif() ++ ++if(FREETYPE_INCLUDE_DIR_freetype2 AND FREETYPE_H) ++ file(STRINGS "${FREETYPE_H}" freetype_version_str + REGEX "^#[\t ]*define[\t ]+FREETYPE_(MAJOR|MINOR|PATCH)[\t ]+[0-9]+$") + + unset(FREETYPE_VERSION_STRING) |