You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
82 lines
3.0 KiB
82 lines
3.0 KiB
--- kdebase/kdesktop/bgmanager.cc.ORI 2012-09-06 17:20:49.564915154 -0400
|
|
+++ kdebase/kdesktop/bgmanager.cc 2012-09-06 17:21:01.969682348 -0400
|
|
@@ -1013,13 +1013,13 @@
|
|
slotChangeDesktop(0);
|
|
}
|
|
|
|
-#ifdef COMPOSITE
|
|
void KBackgroundManager::slotCmBackgroundChanged( bool )
|
|
{
|
|
+#ifdef COMPOSITE
|
|
m_tPixmap->fill(TQColor(0, 0x0));
|
|
m_Hash = 0;
|
|
slotChangeDesktop(0);
|
|
-}
|
|
#endif
|
|
+}
|
|
|
|
#include "bgmanager.moc"
|
|
--- kdebase/kdesktop/main.cc.ORI 2012-09-07 20:33:09.716283507 +0200
|
|
+++ kdebase/kdesktop/main.cc 2012-09-07 20:33:31.683842727 +0200
|
|
@@ -43,7 +43,7 @@
|
|
#include <fcntl.h>
|
|
#include <stdlib.h>
|
|
|
|
-#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300
|
|
+#if defined(WITH_COMPOSITE) && defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300
|
|
#define COMPOSITE
|
|
#endif
|
|
|
|
--- kdebase/kdesktop/bgmanager.h.ORI 2012-09-07 20:36:28.196299160 +0200
|
|
+++ kdebase/kdesktop/bgmanager.h 2012-09-07 20:36:52.420812591 +0200
|
|
@@ -15,7 +15,7 @@
|
|
|
|
#include <KBackgroundIface.h>
|
|
|
|
-#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300
|
|
+#if defined(WITH_COMPOSITE) && defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300
|
|
#define COMPOSITE
|
|
#endif
|
|
|
|
--- kdebase/kdesktop/kdesktopapp.h.ORI 2012-09-07 20:37:14.677365503 +0200
|
|
+++ kdebase/kdesktop/kdesktopapp.h 2012-09-07 20:37:25.194154223 +0200
|
|
@@ -23,7 +23,7 @@
|
|
#include <config.h>
|
|
#include <kuniqueapplication.h>
|
|
|
|
-#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300
|
|
+#if defined(WITH_COMPOSITE) && defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300
|
|
#define COMPOSITE
|
|
#endif
|
|
|
|
--- kdebase/konsole/konsole/main.cpp.ORI 2012-09-07 20:37:37.749901966 +0200
|
|
+++ kdebase/konsole/konsole/main.cpp 2012-09-07 20:37:46.683722469 +0200
|
|
@@ -46,7 +46,7 @@
|
|
|
|
#include "konsole.h"
|
|
|
|
-#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300
|
|
+#if defined(WITH_COMPOSITE) && defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300
|
|
#define COMPOSITE
|
|
#endif
|
|
|
|
--- trinity-tdebase-3.5.13.2/CMakeLists.txt.composite 2013-06-16 21:49:33.742313671 +0200
|
|
+++ trinity-tdebase-3.5.13.2/CMakeLists.txt 2013-06-16 21:49:40.485177448 +0200
|
|
@@ -82,6 +82,7 @@
|
|
option( WITH_I8K "Enable Dell laptop support (ksysguard)" ${WITH_ALL_OPTIONS} )
|
|
option( WITH_HAL "Enable HAL support" ${WITH_ALL_OPTIONS} )
|
|
option( WITH_KDESKTOP_LOCK_BACKTRACE "Enable backtrace in kdesktop_lock exception handler" ${WITH_ALL_OPTIONS} )
|
|
+option( WITH_COMPOSITE "Enable COMPOSITE support" OFF )
|
|
|
|
|
|
##### user requested modules ####################
|
|
--- trinity-tdebase-3.5.13.2/config.h.cmake.composite 2013-06-16 21:50:04.626689570 +0200
|
|
+++ trinity-tdebase-3.5.13.2/config.h.cmake 2013-06-16 21:50:13.094518380 +0200
|
|
@@ -188,3 +188,6 @@
|
|
// Kickoff menu
|
|
#cmakedefine KICKOFF_DIST_CONFIG_SHORTCUT1 "@KICKOFF_DIST_CONFIG_SHORTCUT1@"
|
|
#cmakedefine KICKOFF_DIST_CONFIG_SHORTCUT2 "@KICKOFF_DIST_CONFIG_SHORTCUT2@"
|
|
+
|
|
+// kdesktop, konsole
|
|
+#cmakedefine WITH_COMPOSITE "@WITH_COMPOSITE@"
|