diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2013-01-07 12:12:35 +0000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2013-01-07 12:12:35 +0000 |
| commit | cc4290246abd90ce40a25c7de9350279f905e8eb (patch) | |
| tree | 4f4d125c534f769c745a3f1c8930a176ab55d629 /dev-util/cmake | |
| parent | Depend on >=1.11.6, per bug#450644, thanks to Martin Mokrejš (diff) | |
| download | gentoo-2-cc4290246abd90ce40a25c7de9350279f905e8eb.tar.gz gentoo-2-cc4290246abd90ce40a25c7de9350279f905e8eb.tar.bz2 gentoo-2-cc4290246abd90ce40a25c7de9350279f905e8eb.zip | |
Fix Qt5 automagic.
(Portage version: 2.1.11.38/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)
Diffstat (limited to 'dev-util/cmake')
| -rw-r--r-- | dev-util/cmake/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/cmake/cmake-2.8.10.2-r1.ebuild | 3 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-2.8.10.2-qt5.patch | 16 |
3 files changed, 23 insertions, 2 deletions
diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog index 1ef0e52a34aa..7b5b9ff34a65 100644 --- a/dev-util/cmake/ChangeLog +++ b/dev-util/cmake/ChangeLog @@ -1,6 +1,10 @@ # 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.229 2013/01/01 19:25:58 creffett Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.230 2013/01/07 12:12:35 kensington Exp $ + + 07 Jan 2013; Michael Palimaka <kensington@gentoo.org> + +files/cmake-2.8.10.2-qt5.patch, cmake-2.8.10.2-r1.ebuild: + Fix Qt5 automagic. *cmake-2.8.10.2-r1 (01 Jan 2013) diff --git a/dev-util/cmake/cmake-2.8.10.2-r1.ebuild b/dev-util/cmake/cmake-2.8.10.2-r1.ebuild index 0f26d5a35d11..a2cbf85342f9 100644 --- a/dev-util/cmake/cmake-2.8.10.2-r1.ebuild +++ b/dev-util/cmake/cmake-2.8.10.2-r1.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.10.2-r1.ebuild,v 1.1 2013/01/01 19:25:58 creffett Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.10.2-r1.ebuild,v 1.2 2013/01/07 12:12:35 kensington Exp $ EAPI=4 @@ -57,6 +57,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.8.10-libform.patch "${FILESDIR}"/${PN}-2.8.10-more-no_host_paths.patch "${FILESDIR}"/${PN}-2.8.10.2-implicit-include.patch + "${FILESDIR}"/${PN}-2.8.10.2-qt5.patch ) cmake_src_bootstrap() { diff --git a/dev-util/cmake/files/cmake-2.8.10.2-qt5.patch b/dev-util/cmake/files/cmake-2.8.10.2-qt5.patch new file mode 100644 index 000000000000..1f2bef0cec14 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.10.2-qt5.patch @@ -0,0 +1,16 @@ +--- Source/QtDoalog/CMakeLists.txt ++++ Source/QtDialog/CMakeLists.txt +@@ -11,7 +11,12 @@ + #============================================================================= + + project(QtDialog) +-find_package(Qt5Widgets QUIET) ++option(WITH_Qt5 ON) ++ ++if(WITH_Qt5) ++ find_package(Qt5Widgets QUIET) ++endif() ++ + if (Qt5Widgets_FOUND) + include_directories(${Qt5Widgets_INCLUDE_DIRS}) + add_definitions(${Qt5Widgets_DEFINITONS}) |