diff --git a/kdebase-workspace-4.2.0-pykde4.patch b/kdebase-workspace-4.2.0-pykde4.patch deleted file mode 100644 index 8f70646..0000000 --- a/kdebase-workspace-4.2.0-pykde4.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up kdebase-workspace-4.2.0/CMakeLists.txt.orig kdebase-workspace-4.2.0/CMakeLists.txt ---- kdebase-workspace-4.2.0/CMakeLists.txt.orig 2009-02-18 15:47:51.000000000 +0100 -+++ kdebase-workspace-4.2.0/CMakeLists.txt 2009-02-18 15:50:34.000000000 +0100 -@@ -59,9 +59,9 @@ endif(PYQT4_FOUND AND PYQT4_VERSION STRL - - macro_optional_find_package(PyKDE4) - set(PythonSupport_FOUND FALSE) --if(PYTHONLIBRARY_FOUND AND SIP_FOUND AND PYQT4_FOUND AND PYKDE4_FOUND) -+if(PYTHONLIBRARY_FOUND) - set(PythonSupport_FOUND TRUE) --endif(PYTHONLIBRARY_FOUND AND SIP_FOUND AND PYQT4_FOUND AND PYKDE4_FOUND) -+endif(PYTHONLIBRARY_FOUND) - - macro_log_feature(PythonSupport_FOUND "Python" "KDE Python support" "http://techbase.kde.org/Development/Languages/Python" FALSE "" "Needed to build plasma scriptengine for Python") - #### End Python support #### diff --git a/kdebase-workspace-4.4.85-kdebug239963.patch b/kdebase-workspace-4.4.85-kdebug239963.patch deleted file mode 100644 index ddc8a6b..0000000 --- a/kdebase-workspace-4.4.85-kdebug239963.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up kdebase-workspace-4.4.85/kwin/main.cpp.kdebug239963 kdebase-workspace-4.4.85/kwin/main.cpp ---- kdebase-workspace-4.4.85/kwin/main.cpp.kdebug239963 2010-06-01 13:10:52.000000000 -0500 -+++ kdebase-workspace-4.4.85/kwin/main.cpp 2010-06-13 17:11:17.389165805 -0500 -@@ -500,6 +500,10 @@ KDE_EXPORT int kdemain( int argc, char * - // HACK: this is needed to work around a Qt4.4.0RC1 bug (#157659) - setenv( "QT_SLOW_TOPLEVEL_RESIZE", "1", true ); - -+ // Disable the glib event loop integration, since it seems to be responsible -+ // for several bug reports about high CPU usage (bug #239963) -+ setenv( "QT_NO_GLIB", "1", true ); -+ - KWin::Application a; - KWin::SessionManager weAreIndeed; - KWin::SessionSaveDoneHelper helper; diff --git a/kdebase-workspace.spec b/kdebase-workspace.spec index 66387e5..451b74c 100644 --- a/kdebase-workspace.spec +++ b/kdebase-workspace.spec @@ -37,7 +37,6 @@ Patch8: kdebase-workspace-4.2.85-klipper-url.patch # 434824: KDE4 System Settings - No Method To Enter Administrative Mode Patch9: kdebase-workspace-4.3.75-rootprivs.patch Patch11: kdebase-workspace-4.1.96-font.patch -Patch13: kdebase-workspace-4.2.0-pykde4.patch Patch14: kdebase-workspace-4.2.0-klipper-arora.patch Patch15: kdebase-workspace-4.3.75-kio_sysinfo.patch # show the remaining time in the battery plasmoid's popup (#515166) @@ -67,8 +66,6 @@ Patch53: kdebase-workspace-4.4.4-kdebug183143.patch ## 4.5 patches ## trunk patches -# Significant CPU penalty for using Kwin effects, https://bugs.kde.org/239963 -Patch200: kdebase-workspace-4.4.85-kdebug239963.patch # moving to non-multilib hack @@ -299,7 +296,6 @@ Requires: akonadi ## FIXME/TODO for jreznik :) #patch9 -p1 -b .rootprivs %patch11 -p1 -b .font -%patch13 -p1 -b .pykde4 # kio_sysinfo based on OpenSUSE's patch %patch15 -p1 -b .kio_sysinfo %patch16 -p1 -b .showremainingtime @@ -322,7 +318,6 @@ Requires: akonadi # 4.5 patches # trunk patches -%patch200 -p1 -b .kdebug239963 %build