diff options
| author | Michael Palimaka <kensington@astralcloak.net> | 2012-04-23 21:35:04 +1000 |
|---|---|---|
| committer | Michael Palimaka <kensington@astralcloak.net> | 2012-04-23 21:36:34 +1000 |
| commit | 0e8f725fcf4ddde600aada9d4dba250f66a685fc (patch) | |
| tree | 48161e80f498172955b23b5c8c6e581f1cb9d860 | |
| parent | b25a0c87a347e7cf825e6d055abb68320c0c7107 (diff) | |
| download | kde-0e8f725fcf4ddde600aada9d4dba250f66a685fc.tar.gz kde-0e8f725fcf4ddde600aada9d4dba250f66a685fc.tar.bz2 kde-0e8f725fcf4ddde600aada9d4dba250f66a685fc.zip | |
[kde-base/kwin] Remove xinerama use flag and patch since the library is not used directly.
(Portage version: 2.1.10.56/git/Linux x86_64, unsigned Manifest commit)
| -rw-r--r-- | kde-base/kwin/files/kwin-4.4.2-xinerama_cmake_automagic.patch | 18 | ||||
| -rw-r--r-- | kde-base/kwin/kwin-4.8.49.9999.ebuild | 9 | ||||
| -rw-r--r-- | kde-base/kwin/kwin-9999.ebuild | 9 |
3 files changed, 2 insertions, 34 deletions
diff --git a/kde-base/kwin/files/kwin-4.4.2-xinerama_cmake_automagic.patch b/kde-base/kwin/files/kwin-4.4.2-xinerama_cmake_automagic.patch deleted file mode 100644 index 5596f415d84..00000000000 --- a/kde-base/kwin/files/kwin-4.4.2-xinerama_cmake_automagic.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -r -u kdebase-workspace-4.4.2-orig/ConfigureChecks.cmake kdebase-workspace-4.4.2/ConfigureChecks.cmake ---- kdebase-workspace-4.4.2-orig/ConfigureChecks.cmake 2009-11-21 10:44:36.000000000 +0100 -+++ kdebase-workspace-4.4.2/ConfigureChecks.cmake 2010-04-02 00:04:32.000000000 +0200 -@@ -71,7 +71,14 @@ - 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 -+ -+if(NOT WITH_X11_Xinerama) -+ set(X11_Xinerama_FOUND FALSE) -+ MESSAGE(STATUS "Disabling Xinerama as requested on commandline.") -+endif(NOT WITH_X11_Xinerama) -+ - macro_bool_to_01(X11_Xinerama_FOUND HAVE_XINERAMA) -+ - macro_bool_to_01(X11_Xrandr_FOUND HAVE_XRANDR) # kwin - macro_bool_to_01(X11_Xrender_FOUND HAVE_XRENDER) # kcontrol/style, kicker - macro_bool_to_01(X11_xf86misc_FOUND HAVE_XF86MISC) # kdesktop and kcontrol/lock diff --git a/kde-base/kwin/kwin-4.8.49.9999.ebuild b/kde-base/kwin/kwin-4.8.49.9999.ebuild index d377847e738..4702ad0f1bc 100644 --- a/kde-base/kwin/kwin-4.8.49.9999.ebuild +++ b/kde-base/kwin/kwin-4.8.49.9999.ebuild @@ -10,7 +10,7 @@ inherit kde4-meta DESCRIPTION="KDE window manager" KEYWORDS="" -IUSE="debug gles opengl xinerama" +IUSE="debug gles opengl" COMMONDEPEND=" $(add_kdebase_dep kactivities) @@ -28,7 +28,6 @@ COMMONDEPEND=" || ( ( >=media-libs/mesa-7.10[egl(+),gles] <media-libs/mesa-7.12[egl(+),gles] ) >=media-libs/mesa-7.12[egl(+),gles2] ) ) - xinerama? ( x11-libs/libXinerama ) " DEPEND="${COMMONDEPEND} x11-proto/compositeproto @@ -36,7 +35,6 @@ DEPEND="${COMMONDEPEND} x11-proto/fixesproto x11-proto/randrproto x11-proto/renderproto - xinerama? ( x11-proto/xineramaproto ) " RDEPEND="${COMMONDEPEND} x11-apps/scripts @@ -48,10 +46,6 @@ KMEXTRACTONLY=" libs/oxygen/ " -PATCHES=( - "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" -) - # you need one of these REQUIRED_USE="!opengl? ( gles ) !gles? ( opengl )" @@ -63,7 +57,6 @@ src_configure() { $(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) -DWITH_X11_Xcomposite=ON ) diff --git a/kde-base/kwin/kwin-9999.ebuild b/kde-base/kwin/kwin-9999.ebuild index d377847e738..4702ad0f1bc 100644 --- a/kde-base/kwin/kwin-9999.ebuild +++ b/kde-base/kwin/kwin-9999.ebuild @@ -10,7 +10,7 @@ inherit kde4-meta DESCRIPTION="KDE window manager" KEYWORDS="" -IUSE="debug gles opengl xinerama" +IUSE="debug gles opengl" COMMONDEPEND=" $(add_kdebase_dep kactivities) @@ -28,7 +28,6 @@ COMMONDEPEND=" || ( ( >=media-libs/mesa-7.10[egl(+),gles] <media-libs/mesa-7.12[egl(+),gles] ) >=media-libs/mesa-7.12[egl(+),gles2] ) ) - xinerama? ( x11-libs/libXinerama ) " DEPEND="${COMMONDEPEND} x11-proto/compositeproto @@ -36,7 +35,6 @@ DEPEND="${COMMONDEPEND} x11-proto/fixesproto x11-proto/randrproto x11-proto/renderproto - xinerama? ( x11-proto/xineramaproto ) " RDEPEND="${COMMONDEPEND} x11-apps/scripts @@ -48,10 +46,6 @@ KMEXTRACTONLY=" libs/oxygen/ " -PATCHES=( - "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" -) - # you need one of these REQUIRED_USE="!opengl? ( gles ) !gles? ( opengl )" @@ -63,7 +57,6 @@ src_configure() { $(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) -DWITH_X11_Xcomposite=ON ) |