diff options
| -rw-r--r-- | kde-base/kwin/ChangeLog | 7 | ||||
| -rw-r--r-- | kde-base/kwin/files/kwin-4.7.0-xcomposite_cmake_automagic.patch | 16 | ||||
| -rw-r--r-- | kde-base/kwin/kwin-4.7.0-r1.ebuild | 11 | ||||
| -rw-r--r-- | kde-base/kwin/kwin-4.7.0.ebuild | 65 |
4 files changed, 11 insertions, 88 deletions
diff --git a/kde-base/kwin/ChangeLog b/kde-base/kwin/ChangeLog index 7f67b857479f..b3d9c21fb09d 100644 --- a/kde-base/kwin/ChangeLog +++ b/kde-base/kwin/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/kwin # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.238 2011/08/15 20:35:49 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.239 2011/08/17 20:49:44 dilfridge Exp $ + + 17 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kwin-4.7.0.ebuild, + kwin-4.7.0-r1.ebuild, -files/kwin-4.7.0-xcomposite_cmake_automagic.patch: + According to mgraesslin on #kde-devel, libXcomposite is now a hard dependency. + Remove use-flag, nothing else depends on it. "Fixes" bug 379519. 15 Aug 2011; Markus Meier <maekke@gentoo.org> kwin-4.6.5.ebuild: x86 stable, bug #377465 diff --git a/kde-base/kwin/files/kwin-4.7.0-xcomposite_cmake_automagic.patch b/kde-base/kwin/files/kwin-4.7.0-xcomposite_cmake_automagic.patch deleted file mode 100644 index 726abe9a5962..000000000000 --- a/kde-base/kwin/files/kwin-4.7.0-xcomposite_cmake_automagic.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -ruN kwin-4.7.0.orig/ConfigureChecks.cmake kwin-4.7.0/ConfigureChecks.cmake ---- kwin-4.7.0.orig/ConfigureChecks.cmake 2011-05-20 22:32:06.000000000 +0200 -+++ kwin-4.7.0/ConfigureChecks.cmake 2011-08-15 16:56:52.165002024 +0200 -@@ -67,6 +67,12 @@ - macro_bool_to_01(X11_XShm_FOUND HAVE_XSHM) # kwin, ksplash - macro_bool_to_01(X11_XTest_FOUND HAVE_XTEST) # khotkeys, kxkb, kdm - macro_bool_to_01(X11_Xcomposite_FOUND HAVE_XCOMPOSITE) # kicker, kwin -+ -+if(NOT WITH_X11_Xcomposite) -+ set(X11_Xcomposite_FOUND FALSE) -+ MESSAGE(STATUS "Disabling Xcomposite as requested on commandline.") -+endif(NOT WITH_X11_Xcomposite) -+ - macro_bool_to_01(X11_Xcursor_FOUND HAVE_XCURSOR) # many uses - macro_bool_to_01(X11_Xdamage_FOUND HAVE_XDAMAGE) # kwin - macro_bool_to_01(X11_Xfixes_FOUND HAVE_XFIXES) # klipper, kicker, kwin diff --git a/kde-base/kwin/kwin-4.7.0-r1.ebuild b/kde-base/kwin/kwin-4.7.0-r1.ebuild index 1faf5af55ab6..e01c6625bab5 100644 --- a/kde-base/kwin/kwin-4.7.0-r1.ebuild +++ b/kde-base/kwin/kwin-4.7.0-r1.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/kwin/kwin-4.7.0-r1.ebuild,v 1.1 2011/08/15 15:03:04 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.7.0-r1.ebuild,v 1.2 2011/08/17 20:49:44 dilfridge Exp $ EAPI=4 @@ -10,27 +10,27 @@ inherit kde4-meta DESCRIPTION="KDE window manager" KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="debug gles +xcomposite xinerama" +IUSE="debug gles xinerama" COMMONDEPEND=" $(add_kdebase_dep kephal) $(add_kdebase_dep libkworkspace) $(add_kdebase_dep liboxygenstyle) + x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes >=x11-libs/libXrandr-1.2.1 x11-libs/libXrender opengl? ( >=media-libs/mesa-7.10 ) gles? ( >=media-libs/mesa-7.10[egl(+),gles] ) - xcomposite? ( x11-libs/libXcomposite ) xinerama? ( x11-libs/libXinerama ) " DEPEND="${COMMONDEPEND} + x11-proto/compositeproto x11-proto/damageproto x11-proto/fixesproto x11-proto/randrproto x11-proto/renderproto - xcomposite? ( x11-proto/compositeproto ) xinerama? ( x11-proto/xineramaproto ) " RDEPEND="${COMMONDEPEND} @@ -45,7 +45,6 @@ KMEXTRACTONLY=" PATCHES=( "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" - "${FILESDIR}/${PN}-4.7.0-xcomposite_cmake_automagic.patch" ) # you can use just gles or opengl or none @@ -60,7 +59,7 @@ src_configure() { $(cmake-utils_use gles KWIN_BUILD_WITH_OPENGLES) $(cmake-utils_use_with opengl OpenGL) $(cmake-utils_use_with xinerama X11_Xinerama) - $(cmake-utils_use_with xcomposite X11_Xcomposite) + -DWITH_X11_Xcomposite=ON ) kde4-meta_src_configure diff --git a/kde-base/kwin/kwin-4.7.0.ebuild b/kde-base/kwin/kwin-4.7.0.ebuild deleted file mode 100644 index 04b105ce9dd7..000000000000 --- a/kde-base/kwin/kwin-4.7.0.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.7.0.ebuild,v 1.1 2011/07/27 14:04:42 alexxy Exp $ - -EAPI=4 - -KMNAME="kde-workspace" -OPENGL_REQUIRED="optional" -inherit kde4-meta - -DESCRIPTION="KDE window manager" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="debug gles xcomposite xinerama" - -COMMONDEPEND=" - $(add_kdebase_dep kephal) - $(add_kdebase_dep libkworkspace) - $(add_kdebase_dep liboxygenstyle) - x11-libs/libXdamage - x11-libs/libXfixes - >=x11-libs/libXrandr-1.2.1 - x11-libs/libXrender - opengl? ( >=media-libs/mesa-7.10 ) - gles? ( >=media-libs/mesa-7.10[egl(+),gles] ) - xcomposite? ( x11-libs/libXcomposite ) - xinerama? ( x11-libs/libXinerama ) -" -DEPEND="${COMMONDEPEND} - x11-proto/damageproto - x11-proto/fixesproto - x11-proto/randrproto - x11-proto/renderproto - xcomposite? ( x11-proto/compositeproto ) - xinerama? ( x11-proto/xineramaproto ) -" -RDEPEND="${COMMONDEPEND} - x11-apps/scripts -" - -KMEXTRACTONLY=" - ksmserver/ - libs/kephal/ - libs/oxygen/ -" - -PATCHES=( - "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" -) - -# you can use just gles or opengl or none -REQUIRED_USE="opengl? ( !gles ) gles? ( !opengl )" - -src_configure() { - # FIXME Remove when activity API moved away from libkworkspace - append-cppflags "-I${EPREFIX}/usr/include/kworkspace" - - mycmakeargs=( - $(cmake-utils_use_with gles OpenGLES) - $(cmake-utils_use gles KWIN_BUILD_WITH_OPENGLES) - $(cmake-utils_use_with opengl OpenGL) - $(cmake-utils_use_with xinerama X11_Xinerama) - ) - - kde4-meta_src_configure -} |