From e6b5a428ea4630e86c9290801bdcf1dc80f83923 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Tue, 5 Jul 2011 20:22:44 +0200 Subject: [PATCH] Disable build of MagnifierEffect Magnifier is broken without PaintClipper. Needs a better implementation, see: http://lists.kde.org/?l=kwin&m=130972453005390&w=2 --- effects/CMakeLists.txt | 3 ++- effects/configs_builtins.cpp | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/effects/CMakeLists.txt b/effects/CMakeLists.txt index 0312ac253e..8683b35779 100644 --- a/effects/CMakeLists.txt +++ b/effects/CMakeLists.txt @@ -106,7 +106,8 @@ if( KWIN_HAVE_OPENGL_COMPOSITING ) include( glide/CMakeLists.txt ) include( invert/CMakeLists.txt ) include( lookingglass/CMakeLists.txt ) - include( magnifier/CMakeLists.txt ) +# Magnifier currently broken due to removed PaintClipper +# include( magnifier/CMakeLists.txt ) include( mousemark/CMakeLists.txt ) include( sheet/CMakeLists.txt ) include( snaphelper/CMakeLists.txt ) diff --git a/effects/configs_builtins.cpp b/effects/configs_builtins.cpp index b37ba585b8..ba3b52e77f 100644 --- a/effects/configs_builtins.cpp +++ b/effects/configs_builtins.cpp @@ -44,7 +44,10 @@ along with this program. If not, see . #include "glide/glide_config.h" #include "invert/invert_config.h" #include "lookingglass/lookingglass_config.h" +#if 0 +// Magnifier currently broken due to removed PaintClipper #include "magnifier/magnifier_config.h" +#endif #include "mousemark/mousemark_config.h" #include "trackmouse/trackmouse_config.h" #include "wobblywindows/wobblywindows_config.h" @@ -80,7 +83,9 @@ KWIN_EFFECT_CONFIG_MULTIPLE(builtins, KWIN_EFFECT_CONFIG_SINGLE(glide, GlideEffectConfig) KWIN_EFFECT_CONFIG_SINGLE(invert, InvertEffectConfig) KWIN_EFFECT_CONFIG_SINGLE(lookingglass, LookingGlassEffectConfig) +#if 0 KWIN_EFFECT_CONFIG_SINGLE(magnifier, MagnifierEffectConfig) +#endif KWIN_EFFECT_CONFIG_SINGLE(mousemark, MouseMarkEffectConfig) KWIN_EFFECT_CONFIG_SINGLE(trackmouse, TrackMouseEffectConfig) KWIN_EFFECT_CONFIG_SINGLE(wobblywindows, WobblyWindowsEffectConfig)