Hello community,
here is the log from the commit of package kdebase4-workspace for openSUSE:Factory
checked in at Thu Apr 21 13:37:09 CEST 2011.
--------
--- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2011-04-02 00:04:30.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase4-wallpapers.changes 2011-04-21 13:01:43.000000000 +0200
@@ -1,0 +2,25 @@
+Tue Apr 19 09:18:06 UTC 2011 - coolo@opensuse.org
+
+- port gspd client to new API
+
+-------------------------------------------------------------------
+Sat Apr 16 11:49:27 EEST 2011 - xgpub@tellas.gr
+
+- Fix multihead support (bko#256242)
+
+-------------------------------------------------------------------
+Sat Apr 9 18:48:39 UTC 2011 - wstephenson@novell.com
+
+- Fix Plasma assert when using Akonadi caliendar (bko#261593)
+
+-------------------------------------------------------------------
+Fri Apr 8 14:33:54 UTC 2011 - wstephenson@novell.com
+
+- Patch out incorrect FreeBSD shutdown syntax (bko#270228)
+
+-------------------------------------------------------------------
+Sun Apr 3 05:19:55 CET 2011 - gryffus@hkfree.org
+
+- Remove blacklist of Intel 945GM from KWin Blur effect (kwin blacklist removed upstream)
+
+-------------------------------------------------------------------
@@ -7 +31,0 @@
-
--- KDE/kdebase4-workspace/kdebase4-workspace.changes 2011-04-03 05:24:01.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase4-workspace.changes 2011-04-21 13:01:43.000000000 +0200
@@ -1,0 +2,20 @@
+Tue Apr 19 09:18:06 UTC 2011 - coolo@opensuse.org
+
+- port gspd client to new API
+
+-------------------------------------------------------------------
+Sat Apr 16 11:49:27 EEST 2011 - xgpub@tellas.gr
+
+- Fix multihead support (bko#256242)
+
+-------------------------------------------------------------------
+Sat Apr 9 18:48:39 UTC 2011 - wstephenson@novell.com
+
+- Fix Plasma assert when using Akonadi caliendar (bko#261593)
+
+-------------------------------------------------------------------
+Fri Apr 8 14:33:54 UTC 2011 - wstephenson@novell.com
+
+- Patch out incorrect FreeBSD shutdown syntax (bko#270228)
+
+-------------------------------------------------------------------
@@ -12 +31,0 @@
-
--- KDE/kdebase4-workspace/python-kdebase4.changes 2011-04-02 00:04:31.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdebase4-workspace/python-kdebase4.changes 2011-04-21 13:01:44.000000000 +0200
@@ -1,0 +2,25 @@
+Tue Apr 19 09:18:06 UTC 2011 - coolo@opensuse.org
+
+- port gspd client to new API
+
+-------------------------------------------------------------------
+Sat Apr 16 11:49:27 EEST 2011 - xgpub@tellas.gr
+
+- Fix multihead support (bko#256242)
+
+-------------------------------------------------------------------
+Sat Apr 9 18:48:39 UTC 2011 - wstephenson@novell.com
+
+- Fix Plasma assert when using Akonadi caliendar (bko#261593)
+
+-------------------------------------------------------------------
+Fri Apr 8 14:33:54 UTC 2011 - wstephenson@novell.com
+
+- Patch out incorrect FreeBSD shutdown syntax (bko#270228)
+
+-------------------------------------------------------------------
+Sun Apr 3 05:19:55 CET 2011 - gryffus@hkfree.org
+
+- Remove blacklist of Intel 945GM from KWin Blur effect (kwin blacklist removed upstream)
+
+-------------------------------------------------------------------
@@ -7 +31,0 @@
-
calling whatdependson for head-i586
New:
----
bko261593-b2a32244-plasma-assert.diff
bko270228-shutdown-fix.diff
kwin-multihead.diff
plasma-new-gpsd.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase4-wallpapers.spec ++++++
--- /var/tmp/diff_new_pack.gG78mu/_old 2011-04-21 13:36:43.000000000 +0200
+++ /var/tmp/diff_new_pack.gG78mu/_new 2011-04-21 13:36:43.000000000 +0200
@@ -23,7 +23,7 @@
Summary: KDE 4 Wallpapers
Url: http://www.kde.org/
Version: 4.6.2
-Release: 1
+Release: 2
BuildRequires: libdbusmenu-qt-devel
BuildRequires: libkdepimlibs4-devel >= %version
BuildRequires: libqimageblitz-devel
++++++ kdebase4-workspace.spec ++++++
--- /var/tmp/diff_new_pack.gG78mu/_old 2011-04-21 13:36:43.000000000 +0200
+++ /var/tmp/diff_new_pack.gG78mu/_new 2011-04-21 13:36:43.000000000 +0200
@@ -23,7 +23,7 @@
Summary: The KDE Workspace Components
Url: http://www.kde.org/
Version: 4.6.2
-Release: 1
+Release: 3
BuildRequires: audit-devel
BuildRequires: bluez-devel
BuildRequires: ConsoleKit-devel
@@ -96,6 +96,7 @@
Patch107: plasma-kickoff-newly-collapsing.diff
Patch108: plasma-panel-resize-hint.diff
Patch109: plasma-wallpaper-description.diff
+Patch110: plasma-new-gpsd.diff
Patch123: kdm-fix-generic-greeter.diff
Patch124: kdm-fix-labelcolors.diff
Patch125: pam-translate.diff
@@ -105,6 +106,9 @@
Patch201: plasma-notifications-kill-timer.diff
Patch208: kdm-themer-wallpaper-sizes.diff
Patch211: disable-python-support.diff
+Patch212: bko270228-shutdown-fix.diff
+Patch213: bko261593-b2a32244-plasma-assert.diff
+Patch214: kwin-multihead.diff
Requires: kde4-kgreeter-plugins = %version
Requires: kdebase4-workspace-liboxygenstyle = %version
%kde4_runtime_requires
@@ -183,6 +187,9 @@
%patch107
%patch108
%patch109
+%if %suse_version > 1140
+%patch110
+%endif
%patch123 -p1
%patch124 -p1
%patch125
@@ -193,6 +200,9 @@
###KDE45: rediff! - kdm code may have added similar functionality
#%patch208
%patch211
+%patch212 -p1
+%patch213 -p1
+%patch214
cp %{SOURCE3} kwin/effects/cube/data/cubecap.png
%build
++++++ python-kdebase4.spec ++++++
--- /var/tmp/diff_new_pack.gG78mu/_old 2011-04-21 13:36:43.000000000 +0200
+++ /var/tmp/diff_new_pack.gG78mu/_new 2011-04-21 13:36:43.000000000 +0200
@@ -27,7 +27,7 @@
Summary: Python bindings for KDE 4 desktop shell
Url: http://www.kde.org/
Version: 4.6.2
-Release: 1
+Release: 2
BuildRequires: NetworkManager-devel bluez-devel libQtWebKit-devel libdbusmenu-qt-devel libkdepimlibs4-devel >= %version libqimageblitz-devel
BuildRequires: libknotificationitem-devel libsmbclient-devel libxklavier-devel python-kde4-devel >= %version
Source0: kdebase-workspace-%version.tar.bz2
++++++ bko261593-b2a32244-plasma-assert.diff ++++++
commit b2a322448e644cdf55b9990c90920ce8c0ffcc7f
Author: Sergio Martins
Date: Thu Apr 7 23:43:17 2011 +0100
Don't segfault in release mode.
No idea why it's 0, but we're going to delete this copy of calendar.cpp soon,
so it's a waste of time to debugging it.
PIM applications don't crash at all regarding this, in plasma the ETM is probably
set incorrectly and has items with unsupported payloads.
BUG: 261593
Index: kdebase-workspace-4.6.2/plasma/generic/dataengines/calendar/akonadi/calendar.cpp
===================================================================
--- kdebase-workspace-4.6.2.orig/plasma/generic/dataengines/calendar/akonadi/calendar.cpp 2011-04-01 12:52:43.000000000 +0200
+++ kdebase-workspace-4.6.2/plasma/generic/dataengines/calendar/akonadi/calendar.cpp 2011-04-18 17:53:23.157827337 +0200
@@ -254,7 +254,10 @@ void Calendar::Private::updateItem( cons
const Akonadi::Item::Id id = item.id();
const KCalCore::Incidence::Ptr incidence = CalendarSupport::incidence( item );
- Q_ASSERT( incidence );
+
+ if ( !incidence ) {
+ return;
+ }
// TODO: remove this debug message in a few months
kDebug() << "id=" << item.id()
++++++ bko270228-shutdown-fix.diff ++++++
Patch-upstream: 28b79d8d04cce4d0a0899cadcc8fe6fd69d38e01
Subject: Fix kdm shutdown command
From: wstephenson@suse.de
--- kdebase-workspace-4.6.2/kdm/config.def~ 2011-04-08 00:29:48.291941154 -0700
+++ kdebase-workspace-4.6.2/kdm/config.def 2011-04-08 00:32:04.738607619 -0700
@@ -38,7 +38,7 @@
# define HALT_CMD "/usr/sbin/shutdown -h now"
# define REBOOT_CMD "/usr/sbin/shutdown -r now"
#elif defined(BSD) || defined(__linux__)
-# define HALT_CMD "/sbin/shutdown -p now"
+# define HALT_CMD "/sbin/shutdown -h -P now"
# define REBOOT_CMD "/sbin/shutdown -r now"
#elif defined(__SVR4)
# define HALT_CMD "/usr/sbin/halt"
++++++ kdebase-workspace-4.6.2.tar.bz2 ++++++
KDE/kdebase4-workspace/kdebase-workspace-4.6.2.tar.bz2 /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase-workspace-4.6.2.tar.bz2 differ: char 11, line 1
++++++ kwin-multihead.diff ++++++
Index: kwin/geometry.cpp
===================================================================
--- kwin/geometry.cpp
+++ kwin/geometry.cpp
@@ -55,6 +55,9 @@
// Workspace
//********************************************
+extern int screen_number;
+extern bool is_multihead;
+
/*!
Resizes the workspace after an XRANDR screen size change
*/
@@ -257,17 +260,32 @@
if( screen == -1 )
screen = activeScreen();
- QRect sarea = (!screenarea.isEmpty()
+ QRect sarea, warea;
+
+ if (is_multihead) {
+ sarea = (!screenarea.isEmpty()
&& screen < screenarea[ desktop ].size()) // screens may be missing during KWin initialization or screen config changes
- ? screenarea[ desktop ][ screen ]
- : Kephal::ScreenUtils::screenGeometry( screen );
- QRect warea = workarea[ desktop ].isNull()
- ? Kephal::ScreenUtils::desktopGeometry()
- : workarea[ desktop ];
+ ? screenarea[ desktop ][ screen_number ]
+ : Kephal::ScreenUtils::screenGeometry(screen_number);
+ warea = workarea[ desktop ].isNull()
+ ? Kephal::ScreenUtils::screenGeometry(screen_number)
+ : workarea[ desktop ];
+ } else {
+ sarea = (!screenarea.isEmpty()
+ && screen < screenarea[ desktop ].size()) // screens may be missing during KWin initialization or screen config changes
+ ? screenarea[ desktop ][ screen ]
+ : Kephal::ScreenUtils::screenGeometry(screen);
+ warea = workarea[ desktop ].isNull()
+ ? Kephal::ScreenUtils::desktopGeometry()
+ : workarea[ desktop ];
+ }
+
switch (opt)
{
case MaximizeArea:
- if (options->xineramaMaximizeEnabled)
+ if (is_multihead)
+ return Kephal::ScreenUtils::screenGeometry(screen_number);
+ else if (options->xineramaMaximizeEnabled)
return sarea;
else
return warea;
@@ -277,26 +295,41 @@
else
return Kephal::ScreenUtils::desktopGeometry();
case FullScreenArea:
- if (options->xineramaFullscreenEnabled)
+ if (is_multihead)
+ return Kephal::ScreenUtils::screenGeometry(screen_number);
+ else if (options->xineramaFullscreenEnabled)
return Kephal::ScreenUtils::screenGeometry( screen );
else
return Kephal::ScreenUtils::desktopGeometry();
case PlacementArea:
- if (options->xineramaPlacementEnabled)
+ if (is_multihead)
+ return sarea;
+ else if (options->xineramaPlacementEnabled)
return sarea;
else
return warea;
case MovementArea:
- if (options->xineramaMovementEnabled)
+ if (is_multihead)
+ return Kephal::ScreenUtils::screenGeometry(screen_number);
+ else if (options->xineramaMovementEnabled)
return Kephal::ScreenUtils::screenGeometry( screen );
else
return Kephal::ScreenUtils::desktopGeometry();
case WorkArea:
+ if (is_multihead)
+ return sarea;
+ else
return warea;
case FullArea:
+ if (is_multihead)
+ return Kephal::ScreenUtils::screenGeometry(screen_number);
+ else
return Kephal::ScreenUtils::desktopGeometry();
case ScreenArea:
- return Kephal::ScreenUtils::screenGeometry( screen );
+ if (is_multihead)
+ return Kephal::ScreenUtils::screenGeometry(screen_number);
+ else
+ return Kephal::ScreenUtils::screenGeometry(screen);
}
abort();
}
Index: kwin/main.cpp
===================================================================
--- kwin/main.cpp
+++ kwin/main.cpp
@@ -74,7 +74,7 @@
Atoms* atoms;
int screen_number = -1;
-
+bool is_multihead = false;
bool initting = false;
/**
@@ -421,55 +421,46 @@
// or command line settings to raster or OpenGL.
QApplication::setGraphicsSystem("native");
- if( !restored )
- { // We only do the multihead fork if we are not restored by the session
- // manager, since the session manager will register multiple kwins,
- // one for each screen...
- QByteArray multiHead = qgetenv( "KDE_MULTIHEAD" );
- if( multiHead.toLower() == "true" )
- {
- Display* dpy = XOpenDisplay( NULL );
- if( !dpy )
- {
- fprintf( stderr, "%s: FATAL ERROR while trying to open display %s\n",
- argv[0], XDisplayName( NULL ));
- exit( 1 );
- }
-
- int number_of_screens = ScreenCount( dpy );
- KWin::screen_number = DefaultScreen( dpy );
- int pos; // Temporarily needed to reconstruct DISPLAY var if multi-head
- QByteArray display_name = XDisplayString( dpy );
- XCloseDisplay( dpy );
- dpy = 0;
-
- if(( pos = display_name.lastIndexOf( '.' )) != -1 )
- display_name.remove( pos, 10 ); // 10 is enough to be sure we removed ".s"
+ Display* dpy = XOpenDisplay(NULL);
+ if (!dpy) {
+ fprintf(stderr, "%s: FATAL ERROR while trying to open display %s\n",
+ argv[0], XDisplayName(NULL));
+ exit(1);
+ }
- QString envir;
- if( number_of_screens != 1 )
- {
- for( int i = 0; i < number_of_screens; i++ )
- {
- // If execution doesn't pass by here, then kwin
- // acts exactly as previously
- if( i != KWin::screen_number && fork() == 0 )
- {
- KWin::screen_number = i;
- // Break here because we are the child process, we don't
- // want to fork() anymore
- break;
- }
- }
- // In the next statement, display_name shouldn't contain a screen
- // number. If it had it, it was removed at the "pos" check
- envir.sprintf( "DISPLAY=%s.%d", display_name.data(), KWin::screen_number );
-
- if( putenv( strdup( envir.toAscii() )))
- {
- fprintf( stderr, "%s: WARNING: unable to set DISPLAY environment variable\n", argv[0] );
- perror("putenv()");
+ int number_of_screens = ScreenCount(dpy);
+
+ // multi head
+ if (number_of_screens != 1) {
+ KWin::is_multihead = true;
+ KWin::screen_number = DefaultScreen(dpy);
+ int pos; // Temporarily needed to reconstruct DISPLAY var if multi-head
+ QByteArray display_name = XDisplayString(dpy);
+ XCloseDisplay(dpy);
+ dpy = 0;
+
+ if ((pos = display_name.lastIndexOf('.')) != -1)
+ display_name.remove(pos, 10); // 10 is enough to be sure we removed ".s"
+
+ QString envir;
+ if (number_of_screens != 1) {
+ for (int i = 0; i < number_of_screens; i++) {
+ // If execution doesn't pass by here, then kwin
+ // acts exactly as previously
+ if (i != KWin::screen_number && fork() == 0) {
+ KWin::screen_number = i;
+ // Break here because we are the child process, we don't
+ // want to fork() anymore
+ break;
}
+ }
+ // In the next statement, display_name shouldn't contain a screen
+ // number. If it had it, it was removed at the "pos" check
+ envir.sprintf("DISPLAY=%s.%d", display_name.data(), KWin::screen_number);
+
+ if (putenv(strdup(envir.toAscii()))) {
+ fprintf(stderr, "%s: WARNING: unable to set DISPLAY environment variable\n", argv[0]);
+ perror("putenv()");
}
}
}
Index: ksmserver/startup.cpp
===================================================================
--- ksmserver/startup.cpp
+++ ksmserver/startup.cpp
@@ -161,10 +161,6 @@ void KSMServer::launchWM( const QList< QStringList >& wmStartCommands )
wmProcess = startApplication( wmStartCommands[ 0 ], QString(), QString(), true );
connect( wmProcess, SIGNAL( error( QProcess::ProcessError )), SLOT( wmProcessChange()));
connect( wmProcess, SIGNAL( finished( int, QProcess::ExitStatus )), SLOT( wmProcessChange()));
- // there can be possibly more wm's (because of forking for multihead),
- // but in such case care only about the process of the first one
- for (int i = 1; i < wmStartCommands.count(); i++)
- startApplication( wmStartCommands[i] );
QTimer::singleShot( 4000, this, SLOT( autoStart0() ) );
}
++++++ plasma-new-gpsd.diff ++++++
--- plasma/generic/dataengines/geolocation/location_gps.cpp.orig 2011-04-19 09:02:29.000000000 +0000
+++ plasma/generic/dataengines/geolocation/location_gps.cpp 2011-04-19 09:09:08.000000000 +0000
@@ -51,7 +51,7 @@
while (!m_abort) {
Plasma::DataEngine::Data d;
- if (gps_poll(m_gpsdata) != -1) {
+ if (gps_read(m_gpsdata) != -1) {
//kDebug() << "poll ok";
if (m_gpsdata->online) {
//kDebug() << "online";
@@ -74,10 +74,10 @@
: GeolocationProvider(parent, args),
m_gpsd(0)
{
- gps_data_t* gpsdata = gps_open("localhost", DEFAULT_GPSD_PORT);
- if (gpsdata) {
+ gps_data_t gpsdata;
+ if (gps_open("localhost", DEFAULT_GPSD_PORT, &gpsdata) == 0) {
kDebug() << "gpsd found.";
- m_gpsd = new Gpsd(gpsdata);
+ m_gpsd = new Gpsd(&gpsdata);
connect(m_gpsd, SIGNAL(dataReady(const Plasma::DataEngine::Data&)),
this, SIGNAL(setData(const Plasma::DataEngine::Data&)));
} else {
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org