[gentoo-commits] proj/kde:master commit in: kde-base/krunner/, kde-base/krunner/files/

[gentoo-commits] proj/kde:master commit in: kde-base/krunner/, kde-base/krunner/files/

[Andreas K. Huettel]

commit:     5ed8caa312ba965e13b7d46ff780c5a3355d604e
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Thu Apr  7 22:16:11 2011 +0000
Commit:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Apr  7 22:16:24 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5ed8caa3

[kde-base/krunner] Disable automagic linking to x11-libs/libXxf86misc on request from scarabeus

(Portage version: 2.1.9.45/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

---
 .../krunner/files/krunner-4.6.2-noxf86misc.patch   |   12 ++++++++++++
 kde-base/krunner/krunner-4.6.9999.ebuild           |    2 ++
 kde-base/krunner/krunner-9999.ebuild               |    2 ++
 3 files changed, 16 insertions(+), 0 deletions(-)

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 0000000..b6bfaf8
--- /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.9999.ebuild b/kde-base/krunner/krunner-4.6.9999.ebuild
index a438095..f44b68b 100644
--- a/kde-base/krunner/krunner-4.6.9999.ebuild
+++ b/kde-base/krunner/krunner-4.6.9999.ebuild
@@ -32,6 +32,8 @@ DEPEND="${COMMONDEPEND}
 "
 RDEPEND="${COMMONDEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}"-4.6.2-noxf86misc.patch )
+
 KMEXTRACTONLY="
 	libs/kdm/
 	libs/kephal/

diff --git a/kde-base/krunner/krunner-9999.ebuild b/kde-base/krunner/krunner-9999.ebuild
index a438095..f44b68b 100644
--- a/kde-base/krunner/krunner-9999.ebuild
+++ b/kde-base/krunner/krunner-9999.ebuild
@@ -32,6 +32,8 @@ DEPEND="${COMMONDEPEND}
 "
 RDEPEND="${COMMONDEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}"-4.6.2-noxf86misc.patch )
+
 KMEXTRACTONLY="
 	libs/kdm/
 	libs/kephal/