diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-04-07 22:11:32 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-04-07 22:11:32 +0000 |
| commit | d4b83809b72db851c2ee8d4bef1b88fb7b60afdc (patch) | |
| tree | a99500a8c466d8533e61c4ddca9f36506a80f608 /kde-base | |
| parent | Depend on a logger (at runtime) instead of depending on syslog-ng, as it does... (diff) | |
| download | gentoo-2-d4b83809b72db851c2ee8d4bef1b88fb7b60afdc.tar.gz gentoo-2-d4b83809b72db851c2ee8d4bef1b88fb7b60afdc.tar.bz2 gentoo-2-d4b83809b72db851c2ee8d4bef1b88fb7b60afdc.zip | |
Disable automagic linking to x11-libs/libXxf86misc on request from scarabeus
(Portage version: 2.1.9.45/cvs/Linux x86_64)
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/krunner/ChangeLog | 7 | ||||
| -rw-r--r-- | kde-base/krunner/files/krunner-4.6.2-noxf86misc.patch | 12 | ||||
| -rw-r--r-- | kde-base/krunner/krunner-4.6.2.ebuild | 4 |
3 files changed, 21 insertions, 2 deletions
diff --git a/kde-base/krunner/ChangeLog b/kde-base/krunner/ChangeLog index faaf612a38f6..0d30feb0b5ff 100644 --- a/kde-base/krunner/ChangeLog +++ b/kde-base/krunner/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/krunner # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/krunner/ChangeLog,v 1.86 2011/04/06 14:19:09 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/krunner/ChangeLog,v 1.87 2011/04/07 22:11:32 dilfridge Exp $ + + 07 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org> + krunner-4.6.2.ebuild, +files/krunner-4.6.2-noxf86misc.patch: + Disable automagic linking to x11-libs/libXxf86misc on request from + scarabeus *krunner-4.6.2 (06 Apr 2011) diff --git a/kde-base/krunner/files/krunner-4.6.2-noxf86misc.patch b/kde-base/krunner/files/krunner-4.6.2-noxf86misc.patch new file mode 100644 index 000000000000..b6bfaf8d1e01 --- /dev/null +++ b/kde-base/krunner/files/krunner-4.6.2-noxf86misc.patch @@ -0,0 +1,12 @@ +diff -ruN krunner-4.6.2.orig/krunner/lock/CMakeLists.txt krunner-4.6.2/krunner/lock/CMakeLists.txt +--- krunner-4.6.2.orig/krunner/lock/CMakeLists.txt 2011-02-25 22:54:48.000000000 +0100 ++++ krunner-4.6.2/krunner/lock/CMakeLists.txt 2011-04-08 00:09:58.749240497 +0200 +@@ -2,7 +2,7 @@ + + ########### next target ############### + +-check_library_exists(Xxf86misc XF86MiscSetGrabKeysState "" HAVE_XF86MISCSETGRABKEYSSTATE) ++set(HAVE_XF86MISC 0) + if(WITH_OpenGL) + check_library_exists(GL glXChooseVisual "" HAVE_GLXCHOOSEVISUAL) + endif(WITH_OpenGL) diff --git a/kde-base/krunner/krunner-4.6.2.ebuild b/kde-base/krunner/krunner-4.6.2.ebuild index bca180ea010c..076fceaa9802 100644 --- a/kde-base/krunner/krunner-4.6.2.ebuild +++ b/kde-base/krunner/krunner-4.6.2.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-base/krunner/krunner-4.6.2.ebuild,v 1.1 2011/04/06 14:19:09 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/krunner/krunner-4.6.2.ebuild,v 1.2 2011/04/07 22:11:32 dilfridge Exp $ EAPI=3 @@ -32,6 +32,8 @@ DEPEND="${COMMONDEPEND} " RDEPEND="${COMMONDEPEND}" +PATCHES=( "${FILESDIR}/${PN}"-4.6.2-noxf86misc.patch ) + KMEXTRACTONLY=" libs/kdm/ libs/kephal/ |