diff options
| author |   Johannes Huber <johu@gentoo.org> | 2011-12-16 14:46:08 +0000 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2011-12-16 14:46:08 +0000 |
| commit | 2499b15b4bc3cf1a57e4c061d01eec49dde4b0b6 (patch) | |
| tree | 2f4e52ec3bed9fd148a322c9b9a62b626851a2b0 /kde-misc/polkit-kde-kcmodules | |
| parent | Move to EAPI=4, version Bump (diff) | |
| download | gentoo-2-2499b15b4bc3cf1a57e4c061d01eec49dde4b0b6.tar.gz gentoo-2-2499b15b4bc3cf1a57e4c061d01eec49dde4b0b6.tar.bz2 gentoo-2-2499b15b4bc3cf1a57e4c061d01eec49dde4b0b6.zip | |
Add build fix. Thanks Alphat-PC <AlphatPC@gmail.com> for patch. bug #394921
(Portage version: 2.2.0_alpha81/cvs/Linux x86_64)
Diffstat (limited to 'kde-misc/polkit-kde-kcmodules')
3 files changed, 37 insertions, 2 deletions
diff --git a/kde-misc/polkit-kde-kcmodules/ChangeLog b/kde-misc/polkit-kde-kcmodules/ChangeLog index b46baf583ac2..028f5cd70ae5 100644 --- a/kde-misc/polkit-kde-kcmodules/ChangeLog +++ b/kde-misc/polkit-kde-kcmodules/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-misc/polkit-kde-kcmodules # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-misc/polkit-kde-kcmodules/ChangeLog,v 1.5 2011/11/05 20:19:27 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-misc/polkit-kde-kcmodules/ChangeLog,v 1.6 2011/12/16 14:46:08 johu Exp $ + + 16 Dec 2011; Johannes Huber <johu@gentoo.org> + +files/polkit-kde-kcmodules-version-check.patch, + polkit-kde-kcmodules-0.98_pre20101127.ebuild: + Add build fix. Thanks Alphat-PC <AlphatPC@gmail.com> for patch. bug #394921 05 Nov 2011; Kacper Kowalik <xarthisius@gentoo.org> polkit-kde-kcmodules-0.98_pre20101127.ebuild: diff --git a/kde-misc/polkit-kde-kcmodules/files/polkit-kde-kcmodules-version-check.patch b/kde-misc/polkit-kde-kcmodules/files/polkit-kde-kcmodules-version-check.patch new file mode 100644 index 000000000000..42fb559e2778 --- /dev/null +++ b/kde-misc/polkit-kde-kcmodules/files/polkit-kde-kcmodules-version-check.patch @@ -0,0 +1,26 @@ + cmake/modules/FindPolkitQt-1.cmake | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/cmake/modules/FindPolkitQt-1.cmake b/cmake/modules/FindPolkitQt-1.cmake +index 0bc86d5..5f51535 100644 +--- a/cmake/modules/FindPolkitQt-1.cmake ++++ b/cmake/modules/FindPolkitQt-1.cmake +@@ -47,14 +47,16 @@ if(POLKITQT-1_VERSION_FILE) + + if(POLKITQT-1_VERSION_MATCH) + string(REGEX REPLACE "POLKITQT1_VERSION_STRING \"(.*)\"\n" "\\1" POLKITQT-1_VERSION ${POLKITQT-1_VERSION_MATCH}) +- if(POLKITQT-1_VERSION STRLESS "${POLKITQT-1_MIN_VERSION}") ++ if(POLKITQT-1_VERSION VERSION_LESS "${POLKITQT-1_MIN_VERSION}") + set(POLKITQT-1_VERSION_OK FALSE) + if(PolkitQt-1_FIND_REQUIRED) + message(FATAL_ERROR "PolkitQt-1 version ${POLKITQT-1_VERSION} was found, but it is too old. Please install ${POLKITQT-1_MIN_VERSION} or newer.") + else(PolkitQt-1_FIND_REQUIRED) + message(STATUS "PolkitQt-1 version ${POLKITQT-1_VERSION} is too old. Please install ${POLKITQT-1_MIN_VERSION} or newer.") + endif(PolkitQt-1_FIND_REQUIRED) +- endif(POLKITQT-1_VERSION STRLESS "${POLKITQT-1_MIN_VERSION}") ++ else(POLKITQT-1_VERSION VERSION_LESS "${POLKITQT-1_MIN_VERSION}") ++ message(STATUS "Found PolkitQt-1: version ${POLKITQT-1_VERSION}") ++ endif(POLKITQT-1_VERSION VERSION_LESS "${POLKITQT-1_MIN_VERSION}") + endif(POLKITQT-1_VERSION_MATCH) + elseif(POLKITQT-1_INCLUDE_DIR) + # The version is so old that it does not even have the file diff --git a/kde-misc/polkit-kde-kcmodules/polkit-kde-kcmodules-0.98_pre20101127.ebuild b/kde-misc/polkit-kde-kcmodules/polkit-kde-kcmodules-0.98_pre20101127.ebuild index d5019542752b..9c7bdd5796dd 100644 --- a/kde-misc/polkit-kde-kcmodules/polkit-kde-kcmodules-0.98_pre20101127.ebuild +++ b/kde-misc/polkit-kde-kcmodules/polkit-kde-kcmodules-0.98_pre20101127.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-misc/polkit-kde-kcmodules/polkit-kde-kcmodules-0.98_pre20101127.ebuild,v 1.5 2011/11/05 20:19:27 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-misc/polkit-kde-kcmodules/polkit-kde-kcmodules-0.98_pre20101127.ebuild,v 1.6 2011/12/16 14:46:08 johu Exp $ EAPI="3" @@ -29,3 +29,7 @@ DEPEND=" RDEPEND="${DEPEND}" [[ ${PV} = *9999* ]] || S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}/${PN}-version-check.patch" +) |