summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWulf Krueger <philantrop@gentoo.org>2008-03-10 23:51:00 +0000
committerWulf Krueger <philantrop@gentoo.org>2008-03-10 23:51:00 +0000
commit43e9c6b0a2ced53fd8747c6b0a5f6edd8a1a2b11 (patch)
treeb75ad4deabb97d22b400d20da92a007a0dd4bb81 /kde-base/krunner
parentVersion bump to KDE 4.0.2. (diff)
downloadgentoo-2-43e9c6b0a2ced53fd8747c6b0a5f6edd8a1a2b11.tar.gz
gentoo-2-43e9c6b0a2ced53fd8747c6b0a5f6edd8a1a2b11.tar.bz2
gentoo-2-43e9c6b0a2ced53fd8747c6b0a5f6edd8a1a2b11.zip
Version bump to KDE 4.0.2.
(Portage version: 2.1.4.4)
Diffstat (limited to 'kde-base/krunner')
-rw-r--r--kde-base/krunner/ChangeLog9
-rw-r--r--kde-base/krunner/files/krunner-4.0.2-linkage.patch22
-rw-r--r--kde-base/krunner/files/krunner-4.0.2-opengl.patch12
-rw-r--r--kde-base/krunner/krunner-4.0.2.ebuild50
4 files changed, 92 insertions, 1 deletions
diff --git a/kde-base/krunner/ChangeLog b/kde-base/krunner/ChangeLog
index 90d0e0212ad2..5586b5d3c174 100644
--- a/kde-base/krunner/ChangeLog
+++ b/kde-base/krunner/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for kde-base/krunner
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krunner/ChangeLog,v 1.5 2008/02/17 03:25:57 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krunner/ChangeLog,v 1.6 2008/03/10 23:50:59 philantrop Exp $
+
+*krunner-4.0.2 (10 Mar 2008)
+
+ 10 Mar 2008; Wulf C. Krueger <philantrop@gentoo.org>
+ +files/krunner-4.0.2-linkage.patch, +files/krunner-4.0.2-opengl.patch,
+ +krunner-4.0.2.ebuild:
+ Version bump to KDE 4.0.2
17 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
-files/krunner-4.0.0-linkage.patch, -files/krunner-4.0.0-opengl.patch,
diff --git a/kde-base/krunner/files/krunner-4.0.2-linkage.patch b/kde-base/krunner/files/krunner-4.0.2-linkage.patch
new file mode 100644
index 000000000000..2ea129e4854c
--- /dev/null
+++ b/kde-base/krunner/files/krunner-4.0.2-linkage.patch
@@ -0,0 +1,22 @@
+commit 4f68e8ffcb5adfc2f020f2cc58cbf0aa92e8be18
+Author: Ingmar Vanhassel <ingmar.vanhassel@gmail.com>
+Date: Wed Jan 9 23:35:56 2008 +0100
+
+ Fix linkage in krunner.
+---
+ kdebase/workspace/krunner/CMakeLists.txt | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/kdebase/workspace/krunner/CMakeLists.txt b/kdebase/workspace/krunner/CMakeLists.txt
+index 732496e..422bea8 100644
+--- a/kdebase/workspace/krunner/CMakeLists.txt
++++ b/kdebase/workspace/krunner/CMakeLists.txt
+@@ -40,7 +40,7 @@ kde4_add_ui_files(krunner_SRCS runners/shell/shellOptions.ui)
+ kde4_add_kdeinit_executable(krunner ${krunner_SRCS})
+ # needs qt3support for Q3ListView in lockdlg
+ target_link_libraries(kdeinit_krunner plasma kworkspace processui ${KDE4_SOLID_LIBRARIES} ${KDE4_THREADWEAVER_LIBRARIES} ${X11_Xrender_LIB} ${KDE4_KDEUI_LIBS}
+-${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDE3SUPPORT_LIBRARY} )
++${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDE3SUPPORT_LIBRARY} ${KDE4_KIO_LIBS} )
+ if(X11_Xss_LIB)
+ target_link_libraries(kdeinit_krunner ${X11_Xss_LIB})
+ endif(X11_Xss_LIB)
diff --git a/kde-base/krunner/files/krunner-4.0.2-opengl.patch b/kde-base/krunner/files/krunner-4.0.2-opengl.patch
new file mode 100644
index 000000000000..2eb6d918f788
--- /dev/null
+++ b/kde-base/krunner/files/krunner-4.0.2-opengl.patch
@@ -0,0 +1,12 @@
+--- workspace/krunner/lock/CMakeLists.txt (revision 766878)
++++ workspace/krunner/lock/CMakeLists.txt (working copy)
+@@ -5,7 +5,9 @@
+ ########### next target ###############
+
+ check_library_exists(Xxf86misc XF86MiscSetGrabKeysState "" HAVE_XF86MISCSETGRABKEYSSTATE)
++if(OPENGL_FOUND)
+ check_library_exists(GL glXChooseVisual "" HAVE_GLXCHOOSEVISUAL)
++endif(OPENGL_FOUND)
+
+ configure_file(config-krunner-lock.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-krunner-lock.h)
+
diff --git a/kde-base/krunner/krunner-4.0.2.ebuild b/kde-base/krunner/krunner-4.0.2.ebuild
new file mode 100644
index 000000000000..d410b64a4ecb
--- /dev/null
+++ b/kde-base/krunner/krunner-4.0.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krunner/krunner-4.0.2.ebuild,v 1.1 2008/03/10 23:50:59 philantrop Exp $
+
+EAPI="1"
+
+KMNAME=kdebase-workspace
+OPENGL_REQUIRED="optional"
+inherit kde4-meta
+
+DESCRIPTION="KDE Command Runner"
+IUSE="debug opengl xcomposite xscreensaver"
+KEYWORDS="~amd64 ~x86"
+
+COMMONDEPEND="
+ >=kde-base/ksmserver-${PV}:${SLOT}
+ >=kde-base/ksysguard-${PV}:${SLOT}
+ >=kde-base/libkworkspace-${PV}:${SLOT}
+ >=kde-base/libplasma-${PV}:${SLOT}
+ >=kde-base/plasma-${PV}:${SLOT}
+ x11-libs/libXxf86misc
+ opengl? ( virtual/opengl )
+ xcomposite? ( x11-libs/libXcomposite )
+ xscreensaver? ( x11-libs/libXScrnSaver )"
+DEPEND="${COMMONDEPEND}
+ x11-proto/xf86miscproto
+ xcomposite? ( x11-proto/compositeproto )"
+RDEPEND="${COMMONDEPEND}
+ >=kde-base/kdebase-data-${PV}:${SLOT}"
+
+KMEXTRACTONLY="
+ libs/kdm/
+ libs/ksysguard/
+ libs/kworkspace/
+ kcontrol/
+ ksysguard/
+ ksmserver/org.kde.KSMServerInterface.xml
+ kcheckpass/"
+
+PATCHES="${FILESDIR}/${P}-linkage.patch
+ ${FILESDIR}/${P}-opengl.patch"
+
+src_compile() {
+ mycmakeargs="${mycmakeargs}
+ $(cmake-utils_use_with opengl OpenGL)
+ $(cmake-utils_use_with xcomposite X11_Xcomposite)
+ $(cmake-utils_use_with xscreensaver X11_Xscreensaver)"
+
+ kde4-meta_src_compile
+}