summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWulf Krueger <philantrop@gentoo.org>2008-03-11 00:06:58 +0000
committerWulf Krueger <philantrop@gentoo.org>2008-03-11 00:06:58 +0000
commita6ba61ac978970a41ab4b23c964969ef2b19623b (patch)
tree23a41907bf1e3e7fe4e040c49ac7279c752222e5 /kde-base/systemsettings
parentVersion bump to KDE 4.0.2. (diff)
downloadgentoo-2-a6ba61ac978970a41ab4b23c964969ef2b19623b.tar.gz
gentoo-2-a6ba61ac978970a41ab4b23c964969ef2b19623b.tar.bz2
gentoo-2-a6ba61ac978970a41ab4b23c964969ef2b19623b.zip
Version bump to KDE 4.0.2.
(Portage version: 2.1.4.4)
Diffstat (limited to 'kde-base/systemsettings')
-rw-r--r--kde-base/systemsettings/ChangeLog8
-rw-r--r--kde-base/systemsettings/files/systemsettings-4.0.2-opengl.patch10
-rw-r--r--kde-base/systemsettings/systemsettings-4.0.2.ebuild61
3 files changed, 78 insertions, 1 deletions
diff --git a/kde-base/systemsettings/ChangeLog b/kde-base/systemsettings/ChangeLog
index 1672782a5742..51cf998ff36b 100644
--- a/kde-base/systemsettings/ChangeLog
+++ b/kde-base/systemsettings/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for kde-base/systemsettings
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.5 2008/02/17 02:03:48 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.6 2008/03/11 00:06:57 philantrop Exp $
+
+*systemsettings-4.0.2 (10 Mar 2008)
+
+ 10 Mar 2008; Wulf C. Krueger <philantrop@gentoo.org>
+ +files/systemsettings-4.0.2-opengl.patch, +systemsettings-4.0.2.ebuild:
+ Version bump to KDE 4.0.2
16 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
-files/systemsettings-4.0.0-opengl.patch, -systemsettings-4.0.0.ebuild:
diff --git a/kde-base/systemsettings/files/systemsettings-4.0.2-opengl.patch b/kde-base/systemsettings/files/systemsettings-4.0.2-opengl.patch
new file mode 100644
index 000000000000..1a933ec23b11
--- /dev/null
+++ b/kde-base/systemsettings/files/systemsettings-4.0.2-opengl.patch
@@ -0,0 +1,10 @@
+--- workspace/kcontrol/screensaver/CMakeLists.txt
++++ workspace/kcontrol/screensaver/CMakeLists.txt
+@@ -1,5 +1,7 @@
+
++if(OPENGL_FOUND)
+ check_library_exists(GL glXChooseVisual "" HAVE_GLXCHOOSEVISUAL)
++endif(OPENGL_FOUND)
+ configure_file (config-screensaver.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-screensaver.h )
+
+ add_definitions (-DQT3_SUPPORT)
diff --git a/kde-base/systemsettings/systemsettings-4.0.2.ebuild b/kde-base/systemsettings/systemsettings-4.0.2.ebuild
new file mode 100644
index 000000000000..adfa63035aba
--- /dev/null
+++ b/kde-base/systemsettings/systemsettings-4.0.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.0.2.ebuild,v 1.1 2008/03/11 00:06:57 philantrop Exp $
+
+EAPI="1"
+
+KMNAME=kdebase-workspace
+OPENGL_REQUIRED="optional"
+inherit kde4-meta
+
+DESCRIPTION="System settings utility"
+IUSE="debug htmlhandbook opengl +usb xinerama"
+KEYWORDS="~amd64 ~x86"
+
+COMMONDEPEND="
+ >=app-misc/strigi-0.5.7
+ >=dev-libs/glib-2
+ media-libs/fontconfig
+ >=media-libs/freetype-2
+ >=x11-libs/libxklavier-3.2
+ x11-libs/libXcursor
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXft
+ >=x11-libs/libXrandr-1.2.1
+ x11-libs/libXtst
+ opengl? ( virtual/opengl )
+ usb? ( >=dev-libs/libusb-0.1.10a )
+ xinerama? ( x11-libs/libXinerama )"
+DEPEND="${COMMONDEPEND}
+ x11-proto/xextproto
+ x11-proto/kbproto
+ xinerama? ( x11-proto/xineramaproto )"
+RDEPEND="${COMMONDEPEND}
+ || ( x11-misc/xkeyboard-config
+ x11-misc/xkbdata )
+ x11-apps/setxkbmap"
+
+KMEXTRA="kcontrol/"
+
+KMEXTRACTONLY="krunner/org.kde.krunner.App.xml
+ krunner/org.kde.screensaver.xml
+ kwin/
+ libs/
+ plasma/"
+
+PATCHES="${FILESDIR}/${P}-opengl.patch"
+
+# FIXME: is have_openglxvisual found without screensaver
+src_compile() {
+ # Old keyboard-detection code is unmaintained,
+ # so we force the new stuff, using libxklavier.
+ mycmakeargs="${mycmakeargs}
+ -DUSE_XKLAVIER=ON -DWITH_LibXKlavier=ON
+ -DWITH_GLIB2=ON -DWITH_GObject=ON
+ $(cmake-utils_use_with opengl OpenGL)
+ $(cmake-utils_use_with usb USB)
+ $(cmake-utils_use_with xinerama X11_Xinerama)"
+
+ kde4-meta_src_compile
+}