Mailinglist Archive: opensuse-commit (1945 mails)
| < Previous | Next > |
commit kdebase4-workspace
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Tue, 04 Nov 2008 17:44:40 +0100
- Message-id: <20081104164440.6CD1A6780AA@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package kdebase4-workspace
checked in at Tue Nov 4 17:44:40 CET 2008.
--------
--- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-11-03
18:11:25.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase4-wallpapers.changes
2008-11-04 17:44:02.138641000 +0100
@@ -1,0 +2,6 @@
+Mon Nov 3 22:27:07 CET 2008 - llunak@xxxxxxx
+
+- update from randr branch (bnc#427645)
+- update from kwin branch (sync with 4.1 branch)
+
+-------------------------------------------------------------------
kdebase4-workspace.changes: same change
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase4-wallpapers.spec ++++++
--- /var/tmp/diff_new_pack.zd6970/_old 2008-11-04 17:44:11.000000000 +0100
+++ /var/tmp/diff_new_pack.zd6970/_new 2008-11-04 17:44:11.000000000 +0100
@@ -29,7 +29,7 @@
Summary: KDE 4 Wallpapers
Url: http://www.kde.org/
Version: 4.1.3
-Release: 1
+Release: 2
Source0: kdebase-workspace-%version.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@@ -66,6 +66,9 @@
/usr/share/wallpapers
%changelog
+* Mon Nov 03 2008 llunak@xxxxxxx
+- update from randr branch (bnc#427645)
+- update from kwin branch (sync with 4.1 branch)
* Mon Nov 03 2008 stbinner@xxxxxxx
- update to 4.1.3
* see http://kde.org/announcements/changelogs/changelog4_1_2to4_1_3.php
++++++ kdebase4-workspace.spec ++++++
--- /var/tmp/diff_new_pack.zd6970/_old 2008-11-04 17:44:11.000000000 +0100
+++ /var/tmp/diff_new_pack.zd6970/_new 2008-11-04 17:44:11.000000000 +0100
@@ -37,7 +37,7 @@
Summary: The KDE Workspace Components
Url: http://www.kde.org/
Version: 4.1.3
-Release: 1
+Release: 2
Source0: kdebase-workspace-%version.tar.bz2
Source1: rediff-plasma.sh
Source2: titlebar_decor.png
@@ -762,6 +762,9 @@
/usr/share/kde4/servicetypes/plasma-wallpaper.desktop
%changelog
+* Mon Nov 03 2008 llunak@xxxxxxx
+- update from randr branch (bnc#427645)
+- update from kwin branch (sync with 4.1 branch)
* Mon Nov 03 2008 stbinner@xxxxxxx
- update to 4.1.3
* see http://kde.org/announcements/changelogs/changelog4_1_2to4_1_3.php
++++++ kwin.diff ++++++
++++ 1848 lines (skipped)
++++ between KDE/kdebase4-workspace/kwin.diff
++++ and /mounts/work_src_done/STABLE/kdebase4-workspace/kwin.diff
++++++ randr12.diff ++++++
--- /var/tmp/diff_new_pack.zd6970/_old 2008-11-04 17:44:13.000000000 +0100
+++ /var/tmp/diff_new_pack.zd6970/_new 2008-11-04 17:44:13.000000000 +0100
@@ -1,7 +1,7 @@
Index: randrconfig.h
===================================================================
---- kcontrol/randr/randrconfig.h
(.../KDE/4.1/kdebase/workspace/kcontrol/randr) (revision 861923)
-+++ kcontrol/randr/randrconfig.h (.../work/~seli/randr) (revision
861923)
+--- kcontrol/randr/randrconfig.h
(.../KDE/4.1/kdebase/workspace/kcontrol/randr) (revision 879729)
++++ kcontrol/randr/randrconfig.h (.../work/~seli/randr) (revision
879729)
@@ -24,6 +24,7 @@
#include "randr.h"
@@ -38,8 +38,8 @@
Index: layoutmanager.cpp
===================================================================
---- kcontrol/randr/layoutmanager.cpp
(.../KDE/4.1/kdebase/workspace/kcontrol/randr) (revision 861923)
-+++ kcontrol/randr/layoutmanager.cpp (.../work/~seli/randr) (revision
861923)
+--- kcontrol/randr/layoutmanager.cpp
(.../KDE/4.1/kdebase/workspace/kcontrol/randr) (revision 879729)
++++ kcontrol/randr/layoutmanager.cpp (.../work/~seli/randr) (revision
879729)
@@ -148,3 +148,13 @@
}
@@ -56,8 +56,8 @@
+ }
Index: krandrtray.cpp
===================================================================
---- kcontrol/randr/krandrtray.cpp
(.../KDE/4.1/kdebase/workspace/kcontrol/randr) (revision 861923)
-+++ kcontrol/randr/krandrtray.cpp (.../work/~seli/randr) (revision
861923)
+--- kcontrol/randr/krandrtray.cpp
(.../KDE/4.1/kdebase/workspace/kcontrol/randr) (revision 879729)
++++ kcontrol/randr/krandrtray.cpp (.../work/~seli/randr) (revision
879729)
@@ -468,4 +468,5 @@
kcm->setPlainCaption( i18n( "Configure Display" ) );
kcm->addModule( "display" );
@@ -66,8 +66,8 @@
}
Index: randrconfigbase.ui
===================================================================
---- kcontrol/randr/randrconfigbase.ui
(.../KDE/4.1/kdebase/workspace/kcontrol/randr) (revision 861923)
-+++ kcontrol/randr/randrconfigbase.ui (.../work/~seli/randr) (revision
861923)
+--- kcontrol/randr/randrconfigbase.ui
(.../KDE/4.1/kdebase/workspace/kcontrol/randr) (revision 879729)
++++ kcontrol/randr/randrconfigbase.ui (.../work/~seli/randr) (revision
879729)
@@ -12,28 +12,46 @@
<property name="windowTitle" >
<string>Display Configuration (X11 Resize, Rotate and Reflect)</string>
@@ -133,8 +133,8 @@
</ui>
Index: CMakeLists.txt
===================================================================
---- kcontrol/randr/CMakeLists.txt
(.../KDE/4.1/kdebase/workspace/kcontrol/randr) (revision 861923)
-+++ kcontrol/randr/CMakeLists.txt (.../work/~seli/randr) (revision
861923)
+--- kcontrol/randr/CMakeLists.txt
(.../KDE/4.1/kdebase/workspace/kcontrol/randr) (revision 879729)
++++ kcontrol/randr/CMakeLists.txt (.../work/~seli/randr) (revision
879729)
@@ -1,5 +1,9 @@
include_directories( ${X11_Xrandr_INCLUDE_PATH} )
@@ -147,8 +147,8 @@
Index: randrconfig.cpp
===================================================================
---- kcontrol/randr/randrconfig.cpp
(.../KDE/4.1/kdebase/workspace/kcontrol/randr) (revision 861923)
-+++ kcontrol/randr/randrconfig.cpp (.../work/~seli/randr) (revision
861923)
+--- kcontrol/randr/randrconfig.cpp
(.../KDE/4.1/kdebase/workspace/kcontrol/randr) (revision 879729)
++++ kcontrol/randr/randrconfig.cpp (.../work/~seli/randr) (revision
879729)
@@ -28,6 +28,10 @@
#include "randrdisplay.h"
#include "randrscreen.h"
@@ -249,8 +249,8 @@
Index: module/randrmonitor.cpp
===================================================================
--- kcontrol/randr/module/randrmonitor.cpp
(.../KDE/4.1/kdebase/workspace/kcontrol/randr) (revision 0)
-+++ kcontrol/randr/module/randrmonitor.cpp (.../work/~seli/randr)
(revision 861923)
-@@ -0,0 +1,208 @@
++++ kcontrol/randr/module/randrmonitor.cpp (.../work/~seli/randr)
(revision 879729)
+@@ -0,0 +1,210 @@
+/********************************************************************
+
+Copyright (C) 2008 Lubos Lunak <l.lunak@xxxxxxx>
@@ -329,10 +329,12 @@
+ // change e.g. Qt's event mask.
+ window = XCreateSimpleWindow( dpy, DefaultRootWindow( dpy ), 0, 0, 1, 1,
0, 0, 0 );
+ XRRSelectInput( dpy, window, RROutputChangeNotifyMask );
++#if 0 // xrandr apparently can't detect hw changes and on some systems
polling freezes X :(
+ // HACK: see poll()
+ QTimer* timer = new QTimer( this );
+ timer->start( 10000 ); // 10 s
+ connect( timer, SIGNAL( timeout()), this, SLOT( poll()));
++#endif
+ helper = new RandrMonitorHelper( this );
+ kapp->installX11EventFilter( helper );
+ dialog = NULL;
@@ -462,7 +464,7 @@
Index: module/randrmonitor.h
===================================================================
--- kcontrol/randr/module/randrmonitor.h
(.../KDE/4.1/kdebase/workspace/kcontrol/randr) (revision 0)
-+++ kcontrol/randr/module/randrmonitor.h (.../work/~seli/randr)
(revision 861923)
++++ kcontrol/randr/module/randrmonitor.h (.../work/~seli/randr)
(revision 879729)
@@ -0,0 +1,78 @@
+/********************************************************************
+
@@ -545,7 +547,7 @@
Index: module/TODO
===================================================================
--- kcontrol/randr/module/TODO (.../KDE/4.1/kdebase/workspace/kcontrol/randr)
(revision 0)
-+++ kcontrol/randr/module/TODO (.../work/~seli/randr) (revision 861923)
++++ kcontrol/randr/module/TODO (.../work/~seli/randr) (revision 879729)
@@ -0,0 +1,7 @@
+- zrusit ten modalni dialog
+- zkontrolovat, ze tohle opravdu nerusi randr eventmask pro Qt
@@ -557,7 +559,7 @@
Index: module/randrmonitor.desktop
===================================================================
--- kcontrol/randr/module/randrmonitor.desktop
(.../KDE/4.1/kdebase/workspace/kcontrol/randr) (revision 0)
-+++ kcontrol/randr/module/randrmonitor.desktop (.../work/~seli/randr)
(revision 861923)
++++ kcontrol/randr/module/randrmonitor.desktop (.../work/~seli/randr)
(revision 879729)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Detecting RANDR (monitor) changes
@@ -570,7 +572,7 @@
Index: module/CMakeLists.txt
===================================================================
--- kcontrol/randr/module/CMakeLists.txt
(.../KDE/4.1/kdebase/workspace/kcontrol/randr) (revision 0)
-+++ kcontrol/randr/module/CMakeLists.txt (.../work/~seli/randr)
(revision 861923)
++++ kcontrol/randr/module/CMakeLists.txt (.../work/~seli/randr)
(revision 879729)
@@ -0,0 +1,25 @@
+include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/..
${CMAKE_CURRENT_BINARY_DIR}/.. )
+
@@ -600,7 +602,7 @@
Index: module/randrpolltest.cpp
===================================================================
--- kcontrol/randr/module/randrpolltest.cpp
(.../KDE/4.1/kdebase/workspace/kcontrol/randr) (revision 0)
-+++ kcontrol/randr/module/randrpolltest.cpp (.../work/~seli/randr)
(revision 861923)
++++ kcontrol/randr/module/randrpolltest.cpp (.../work/~seli/randr)
(revision 879729)
@@ -0,0 +1,63 @@
+#include <X11/Xlib.h>
+#include <X11/extensions/Xrandr.h>
@@ -667,8 +669,8 @@
+ }
Index: randrscreen.cpp
===================================================================
---- kcontrol/randr/randrscreen.cpp
(.../KDE/4.1/kdebase/workspace/kcontrol/randr) (revision 861923)
-+++ kcontrol/randr/randrscreen.cpp (.../work/~seli/randr) (revision
861923)
+--- kcontrol/randr/randrscreen.cpp
(.../KDE/4.1/kdebase/workspace/kcontrol/randr) (revision 879729)
++++ kcontrol/randr/randrscreen.cpp (.../work/~seli/randr) (revision
879729)
@@ -389,7 +389,7 @@
m_unifiedRect = group.readEntry("UnifiedRect", QRect());
m_unifiedRotation = group.readEntry("UnifiedRotation", (int)
RandR::Rotate0);
@@ -678,10 +680,16 @@
foreach(RandROutput *output, m_outputs)
{
+Index: BRANCH
+===================================================================
+--- kcontrol/randr/BRANCH (.../KDE/4.1/kdebase/workspace/kcontrol/randr)
(revision 0)
++++ kcontrol/randr/BRANCH (.../work/~seli/randr) (revision 879729)
+@@ -0,0 +1 @@
++last sync: r878939
Index: layoutmanager.h
===================================================================
---- kcontrol/randr/layoutmanager.h
(.../KDE/4.1/kdebase/workspace/kcontrol/randr) (revision 861923)
-+++ kcontrol/randr/layoutmanager.h (.../work/~seli/randr) (revision
861923)
+--- kcontrol/randr/layoutmanager.h
(.../KDE/4.1/kdebase/workspace/kcontrol/randr) (revision 879729)
++++ kcontrol/randr/layoutmanager.h (.../work/~seli/randr) (revision
879729)
@@ -21,6 +21,7 @@
#include <QObject>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |