rev 9207 - branches/kde4/packages/kdelibs/debian/patches
Fathi Boudra
fabo at alioth.debian.org
Thu Jan 31 18:44:05 UTC 2008
Author: fabo
Date: 2008-01-31 18:44:05 +0000 (Thu, 31 Jan 2008)
New Revision: 9207
Added:
branches/kde4/packages/kdelibs/debian/patches/01_make_stackingOrder_work_r769072.diff
Removed:
branches/kde4/packages/kdelibs/debian/patches/r769072_make_stackingOrder_work.diff
Modified:
branches/kde4/packages/kdelibs/debian/patches/08_add_debian_build_type.diff
branches/kde4/packages/kdelibs/debian/patches/14_hardcode_ptm_device.diff
branches/kde4/packages/kdelibs/debian/patches/15_kfreebsd_support.diff
branches/kde4/packages/kdelibs/debian/patches/series
Log:
quilt refresh + rename patch to use branch pull style.
Added: branches/kde4/packages/kdelibs/debian/patches/01_make_stackingOrder_work_r769072.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/01_make_stackingOrder_work_r769072.diff (rev 0)
+++ branches/kde4/packages/kdelibs/debian/patches/01_make_stackingOrder_work_r769072.diff 2008-01-31 18:44:05 UTC (rev 9207)
@@ -0,0 +1,43 @@
+--- a/kdeui/windowmanagement/kwindowsystem_x11.cpp
++++ b/kdeui/windowmanagement/kwindowsystem_x11.cpp
+@@ -56,7 +56,9 @@
+ NET::WorkArea |
+ NET::WM2ShowingDesktop };
+
+-static unsigned long desktop_properties[ 2 ] = { NET::ClientList |
++// ClientList and ClientListStacking is not per-window information, but a desktop information,
++// so track it even with only INFO_BASIC
++static unsigned long desktop_properties[ 2 ] = { NET::ClientList | NET::ClientListStacking |
+ NET::Supported |
+ NET::NumberOfDesktops |
+ NET::DesktopGeometry |
+@@ -72,6 +74,7 @@
+ {
+ public:
+ KWindowSystemPrivate(int _what);
++ void activate();
+ QList<WId> windows;
+ QList<WId> stackingOrder;
+
+@@ -110,6 +113,12 @@
+ if (kapp)
+ kapp->installX11EventFilter( this );
+ (void ) qApp->desktop(); //trigger desktop widget creation to select root window events
++}
++
++// not virtual, but it's called directly only from init()
++void KWindowSystemPrivate::activate()
++{
++ NETRootInfo::activate();
+ updateStackingOrder();
+ }
+
+@@ -325,8 +334,6 @@
+ what = INFO_WINDOWS;
+ else if( QLatin1String( signal ) == SIGNAL(strutChanged()))
+ what = INFO_WINDOWS;
+- else if( QLatin1String( signal ) == SIGNAL(stackingOrderChanged()))
+- what = INFO_WINDOWS;
+ else if( QLatin1String( signal ) == QMetaObject::normalizedSignature(SIGNAL(windowChanged(WId,const unsigned long*))).data())
+ what = INFO_WINDOWS;
+ else if( QLatin1String( signal ) == QMetaObject::normalizedSignature(SIGNAL(windowChanged(WId,unsigned int))).data())
Modified: branches/kde4/packages/kdelibs/debian/patches/08_add_debian_build_type.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/08_add_debian_build_type.diff 2008-01-31 18:27:36 UTC (rev 9206)
+++ branches/kde4/packages/kdelibs/debian/patches/08_add_debian_build_type.diff 2008-01-31 18:44:05 UTC (rev 9207)
@@ -6,7 +6,7 @@
Debug output is not completely disabled, because QT_NO_DEBUG is not set.
--- a/cmake/modules/FindKDE4Internal.cmake
+++ b/cmake/modules/FindKDE4Internal.cmake
-@@ -833,11 +833,13 @@
+@@ -839,11 +839,13 @@
set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline")
set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
Modified: branches/kde4/packages/kdelibs/debian/patches/14_hardcode_ptm_device.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/14_hardcode_ptm_device.diff 2008-01-31 18:27:36 UTC (rev 9206)
+++ branches/kde4/packages/kdelibs/debian/patches/14_hardcode_ptm_device.diff 2008-01-31 18:44:05 UTC (rev 9207)
@@ -1,6 +1,6 @@
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
-@@ -185,13 +185,7 @@
+@@ -188,13 +188,7 @@
set(HAVE_OPENPTY)
EXECUTE_PROCESS(
Modified: branches/kde4/packages/kdelibs/debian/patches/15_kfreebsd_support.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/15_kfreebsd_support.diff 2008-01-31 18:27:36 UTC (rev 9206)
+++ branches/kde4/packages/kdelibs/debian/patches/15_kfreebsd_support.diff 2008-01-31 18:44:05 UTC (rev 9207)
@@ -1,10 +1,8 @@
I do not think we can push this patch to upstream since the:
CMAKE_SYSTEM_NAME MATCHES kFreeBSD stuff, needs the Debian patched
cmake.
-Index: kde4libs-3.98.0~svn755919/kpty/kpty.cpp
-===================================================================
---- kde4libs-3.98.0~svn755919.orig/kpty/kpty.cpp 2008-01-02 13:17:23.000000000 +0100
-+++ kde4libs-3.98.0~svn755919/kpty/kpty.cpp 2008-01-04 16:36:41.000000000 +0100
+--- a/kpty/kpty.cpp
++++ b/kpty/kpty.cpp
@@ -108,24 +108,24 @@
# define _NEW_TTY_CTRL
#endif
@@ -42,10 +40,8 @@
#endif
#include <kdebug.h>
-Index: kde4libs-3.98.0~svn755919/kio/kfile/kpropertiesdialog.cpp
-===================================================================
---- kde4libs-3.98.0~svn755919.orig/kio/kfile/kpropertiesdialog.cpp 2008-01-02 13:17:07.000000000 +0100
-+++ kde4libs-3.98.0~svn755919/kio/kfile/kpropertiesdialog.cpp 2008-01-04 16:36:41.000000000 +0100
+--- a/kio/kfile/kpropertiesdialog.cpp
++++ b/kio/kfile/kpropertiesdialog.cpp
@@ -1887,7 +1887,15 @@
fileSystemSupportsACLs = ( statfs( path.data(), &buf ) == 0 ) && ( buf.f_flags & MNT_ACLS );
#else
@@ -63,10 +59,8 @@
#endif
return fileSystemSupportsACLs;
}
-Index: kde4libs-3.98.0~svn755919/kioslave/file/file.cpp
-===================================================================
---- kde4libs-3.98.0~svn755919.orig/kioslave/file/file.cpp 2008-01-02 13:16:20.000000000 +0100
-+++ kde4libs-3.98.0~svn755919/kioslave/file/file.cpp 2008-01-04 16:36:41.000000000 +0100
+--- a/kioslave/file/file.cpp
++++ b/kioslave/file/file.cpp
@@ -361,9 +361,10 @@
}
@@ -101,10 +95,8 @@
#ifdef HAVE_POSIX_ACL
acl = acl_get_fd(src_fd);
-Index: kde4libs-3.98.0~svn755919/ConfigureChecks.cmake
-===================================================================
---- kde4libs-3.98.0~svn755919.orig/ConfigureChecks.cmake 2008-01-04 16:36:58.000000000 +0100
-+++ kde4libs-3.98.0~svn755919/ConfigureChecks.cmake 2008-01-04 16:38:04.000000000 +0100
+--- a/ConfigureChecks.cmake
++++ b/ConfigureChecks.cmake
@@ -150,11 +150,11 @@
set(UTIL_LIBRARY util)
endif (login_in_libutil)
@@ -119,4 +111,4 @@
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME MATCHES Darwin OR CMAKE_SYSTEM_NAME MATCHES GNU/FreeBSD OR CMAKE_SYSTEM_NAME MATCHES kFreeBSD)
if (HAVE_UTMPX)
set(utmp utmpx)
- else (HAVE_UTMPX)
+ if (login_in_libutil)
Deleted: branches/kde4/packages/kdelibs/debian/patches/r769072_make_stackingOrder_work.diff
Modified: branches/kde4/packages/kdelibs/debian/patches/series
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/series 2008-01-31 18:27:36 UTC (rev 9206)
+++ branches/kde4/packages/kdelibs/debian/patches/series 2008-01-31 18:44:05 UTC (rev 9207)
@@ -1,3 +1,4 @@
+01_make_stackingOrder_work_r769072.diff
08_add_debian_build_type.diff
09_disable_debug_messages_if_not_explicitly_enabled.diff
10_kdehome_kde4.diff
@@ -6,4 +7,3 @@
13_qt4_designer_plugins_path.diff
14_hardcode_ptm_device.diff
15_kfreebsd_support.diff
-r769072_make_stackingOrder_work.diff
More information about the pkg-kde-commits
mailing list