Hello community,
here is the log from the commit of package kdemultimedia4 for openSUSE:Factory
checked in at Tue Sep 1 22:31:28 CEST 2009.
--------
--- KDE/kdemultimedia4/kdemultimedia4.changes 2009-08-26 16:09:59.000000000 +0200
+++ kdemultimedia4/kdemultimedia4.changes 2009-08-28 13:58:39.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Aug 28 13:58:34 CEST 2009 - dmueller@suse.de
+
+- update to 4.3.1
+ * see http://kde.org/announcements/changelogs/changelog4_3_0to4_3_1.php for details
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
kdemultimedia-4.3.0.tar.bz2
New:
----
kdemultimedia-4.3.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdemultimedia4.spec ++++++
--- /var/tmp/diff_new_pack.7S5GtM/_old 2009-09-01 22:31:13.000000000 +0200
+++ /var/tmp/diff_new_pack.7S5GtM/_new 2009-09-01 22:31:13.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdemultimedia4 (Version 4.3.0)
+# spec file for package kdemultimedia4 (Version 4.3.1)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -31,8 +31,8 @@
Group: System/GUI/KDE
Summary: kdemultimedia base package
Url: http://www.kde.org
-Version: 4.3.0
-Release: 4
+Version: 4.3.1
+Release: 1
Source0: kdemultimedia-%version.tar.bz2
Patch0: 4_3_BRANCH.diff
Patch1: kmix-autostart.diff
@@ -208,7 +208,7 @@
%files -n kscd -f filelists/kscd
%defattr(-,root,root)
%doc COPYING COPYING.DOC README
-%dir /usr/share/kde4/apps/profiles
+%dir %_kde4_appsdir/profiles
%package -n kio_audiocd
License: GPL v2 or later
@@ -328,10 +328,10 @@
%files -f filelists/exclude
%defattr(-,root,root)
%doc COPYING COPYING.DOC README
-/usr/bin/mplayerthumbsconfig
-/usr/%_lib/kde4/videopreview.so
-/usr/share/kde4/apps/videothumbnail
-/usr/share/kde4/config.kcfg/mplayerthumbs.kcfg
-/usr/share/kde4/services/videopreview.desktop
+%_kde4_bindir/mplayerthumbsconfig
+%_kde4_modulesdir/videopreview.so
+%_kde4_appsdir/videothumbnail
+%_kde4_sharedir/config.kcfg/mplayerthumbs.kcfg
+%_kde4_servicesdir/videopreview.desktop
%changelog
++++++ kdemultimedia-4.3.0.tar.bz2 -> kdemultimedia-4.3.1.tar.bz2 ++++++
Files old/kdemultimedia-4.3.0/doc/dragonplayer/index.cache.bz2 and new/kdemultimedia-4.3.1/doc/dragonplayer/index.cache.bz2 differ
Files old/kdemultimedia-4.3.0/doc/juk/index.cache.bz2 and new/kdemultimedia-4.3.1/doc/juk/index.cache.bz2 differ
Files old/kdemultimedia-4.3.0/doc/kioslave/audiocd/index.cache.bz2 and new/kdemultimedia-4.3.1/doc/kioslave/audiocd/index.cache.bz2 differ
Files old/kdemultimedia-4.3.0/doc/kmix/index.cache.bz2 and new/kdemultimedia-4.3.1/doc/kmix/index.cache.bz2 differ
Files old/kdemultimedia-4.3.0/doc/kscd/index.cache.bz2 and new/kdemultimedia-4.3.1/doc/kscd/index.cache.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.0/dragonplayer/src/app/mainWindow.h new/kdemultimedia-4.3.1/dragonplayer/src/app/mainWindow.h
--- old/kdemultimedia-4.3.0/dragonplayer/src/app/mainWindow.h 2009-05-27 21:55:01.000000000 +0200
+++ new/kdemultimedia-4.3.1/dragonplayer/src/app/mainWindow.h 2009-08-27 10:19:11.000000000 +0200
@@ -127,6 +127,7 @@
QPointer<PlayDialog> m_playDialog;
KNotificationRestrictions *m_stopScreenSaver;
+ int m_screensaverDisableCookie;
int m_stopSleepCookie;
bool m_toolbarIsHidden;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.0/dragonplayer/src/app/stateChange.cpp new/kdemultimedia-4.3.1/dragonplayer/src/app/stateChange.cpp
--- old/kdemultimedia-4.3.0/dragonplayer/src/app/stateChange.cpp 2009-05-27 21:55:01.000000000 +0200
+++ new/kdemultimedia-4.3.1/dragonplayer/src/app/stateChange.cpp 2009-08-27 10:19:11.000000000 +0200
@@ -30,6 +30,8 @@
#include <QContextMenuEvent>
#include <QToolButton>
+#include <QDBusInterface>
+#include <QDBusReply>
#include
@@ -119,21 +121,27 @@
/// turn off screensaver
if( state == Phonon::PlayingState )
{
- m_stopSleepCookie = Solid::PowerManagement::beginSuppressingSleep("DragonPlayer: watching a film");
- if( !m_stopScreenSaver )
- {
- debug() << "screensaver off";
- m_stopScreenSaver = new KNotificationRestrictions( KNotificationRestrictions::NonCriticalServices, this );
- }
- else
- warning() << "m_stopScreenSaver not null";
+ m_stopSleepCookie = Solid::PowerManagement::beginSuppressingSleep("DragonPlayer: watching a film");
+
+ QDBusInterface screensaver("org.freedesktop.ScreenSaver", "/ScreenSaver", "org.freedesktop.ScreenSaver");
+ QDBusReply<int> screensaverRc = screensaver.call("Inhibit","dragonplayer","Watching a film");
+ if (screensaverRc.isValid())
+ {
+ m_screensaverDisableCookie = screensaverRc.value();
+ }
}
else if( Phonon::StoppedState || !TheStream::hasMedia() )
{
- Solid::PowerManagement::stopSuppressingSleep(m_stopSleepCookie);
- delete m_stopScreenSaver;
- m_stopScreenSaver = 0;
- debug() << "screensaver on";
+ //stop supressing sleep
+ Solid::PowerManagement::stopSuppressingSleep(m_stopSleepCookie);
+
+ //stop disabling screensaver
+ if (m_screensaverDisableCookie != 0)
+ {
+ QDBusInterface screensaver("org.freedesktop.ScreenSaver", "/ScreenSaver", "org.freedesktop.ScreenSaver");
+ screensaver.call("Uninhibit",m_screensaverDisableCookie);
+ m_screensaverDisableCookie = 0;
+ }
}
updateTitleBarText();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.0/kioslave/audiocd/kcmaudiocd/audiocd.desktop new/kdemultimedia-4.3.1/kioslave/audiocd/kcmaudiocd/audiocd.desktop
--- old/kdemultimedia-4.3.0/kioslave/audiocd/kcmaudiocd/audiocd.desktop 2009-06-09 18:09:32.000000000 +0200
+++ new/kdemultimedia-4.3.1/kioslave/audiocd/kcmaudiocd/audiocd.desktop 2009-08-27 10:19:11.000000000 +0200
@@ -82,7 +82,7 @@
Comment[ca]=Configuració de l'esclau d'E/S pels CD àudio
Comment[cs]=Nastavení IO klienta pro zvuková CD
Comment[cy]=Gosodiad Gwas IO ar gyfer CDau Sain
-Comment[da]=Lyd-cd IO-slave-indstilling
+Comment[da]=Indstilling af IO-slave til lyd-cd'er
Comment[de]=Einrichtung des Ein-/Ausgabemoduls für Audio-CDs
Comment[el]=Ρύθμιση Audiocd IO Slave
Comment[eo]=Agordo de la son-KD-a IO-sklavo
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.0/libkcddb/test/asyncmusicbrainztest.cpp new/kdemultimedia-4.3.1/libkcddb/test/asyncmusicbrainztest.cpp
--- old/kdemultimedia-4.3.0/libkcddb/test/asyncmusicbrainztest.cpp 2008-01-05 01:02:06.000000000 +0100
+++ new/kdemultimedia-4.3.1/libkcddb/test/asyncmusicbrainztest.cpp 2009-08-27 10:19:11.000000000 +0200
@@ -22,11 +22,16 @@
#include "asyncmusicbrainztest.h"
#include "libkcddb/cache.h"
#include "libkcddb/lookup.h"
+#include "config-musicbrainz.h"
void AsyncMusicBrainzTest::testLookup()
{
using namespace KCDDB;
+#ifndef HAVE_MUSICBRAINZ
+ QSKIP("This test requires libmusicbrainz", SkipAll);
+#endif
+
client_ = new Client;
client_->config().setCacheLookupEnabled(false);
client_->config().setFreedbLookupEnabled(false);
@@ -68,7 +73,7 @@
QCOMPARE(m_info.numberOfTracks(),17);
QCOMPARE(m_info.get(Artist).toString(),QString("Various Artists"));
- QCOMPARE(m_info.get(Title).toString(),QString::fromUtf8("Definitivt 50 Spänn 10"));
+ QCOMPARE(m_info.get(Title).toString(),QString::fromUtf8("Definitivt 50 spänn 10"));
// genre and year not really supported for musicbrainz
QCOMPARE(m_info.get(Genre).toString(),QString());
QCOMPARE(m_info.get(Year).toInt(),0);
@@ -105,7 +110,7 @@
QCOMPARE(m_info.track(13).get(Artist).toString(),QString::fromUtf8("SBD"));
QCOMPARE(m_info.track(14).get(Artist).toString(),QString::fromUtf8("Skumdum"));
QCOMPARE(m_info.track(15).get(Artist).toString(),QString::fromUtf8("Text"));
- QCOMPARE(m_info.track(16).get(Artist).toString(),QString::fromUtf8("Ohlson har semester production"));
+ QCOMPARE(m_info.track(16).get(Artist).toString(),QString::fromUtf8("Ohlson Har Semester Production"));
// comments not supported in a simple way
for (int j=0; j < 17; j++)
QCOMPARE(m_info.track(j).get(Comment).toString(),QString());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.0/libkcddb/test/musicbrainztest.cpp new/kdemultimedia-4.3.1/libkcddb/test/musicbrainztest.cpp
--- old/kdemultimedia-4.3.0/libkcddb/test/musicbrainztest.cpp 2008-01-05 01:02:06.000000000 +0100
+++ new/kdemultimedia-4.3.1/libkcddb/test/musicbrainztest.cpp 2009-08-27 10:19:11.000000000 +0200
@@ -22,12 +22,17 @@
#include "libkcddb/client.h"
#include "libkcddb/cache.h"
#include "libkcddb/lookup.h"
+#include "config-musicbrainz.h"
void MusicBrainzTest::testLookup()
{
using namespace KCDDB;
+#ifndef HAVE_MUSICBRAINZ
+ QSKIP("This test requires libmusicbrainz", SkipAll);
+#endif
+
Client c;
c.config().setCacheLookupEnabled(false);
c.config().setFreedbLookupEnabled(false);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.0/libkcompactdisc/wmlib/include/wm_config.h new/kdemultimedia-4.3.1/libkcompactdisc/wmlib/include/wm_config.h
--- old/kdemultimedia-4.3.0/libkcompactdisc/wmlib/include/wm_config.h 2009-02-04 19:21:17.000000000 +0100
+++ new/kdemultimedia-4.3.1/libkcompactdisc/wmlib/include/wm_config.h 2009-08-27 10:19:11.000000000 +0200
@@ -106,9 +106,9 @@
*** ****** ** ** ****** ****** ** ****** ** * **********
*** ****** ** ** ** ** **** *** ***********
******************************************************************/
-#if defined(__FreeBSD__) || defined(__FreeBSD) || defined(__DragonFly__)
+#if defined(__FreeBSD__) || defined(__FreeBSD) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
-#if (defined(__FreeBSD_version) && __FreeBSD_version >= 500100) || defined(__DragonFly__)
+#if (defined(__FreeBSD_version) && __FreeBSD_version >= 500100) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
#define DEFAULT_CD_DEVICE "/dev/acd0"
#else
#define DEFAULT_CD_DEVICE "/dev/acd0c"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.0/libkcompactdisc/wmlib/plat_freebsd.c new/kdemultimedia-4.3.1/libkcompactdisc/wmlib/plat_freebsd.c
--- old/kdemultimedia-4.3.0/libkcompactdisc/wmlib/plat_freebsd.c 2008-01-05 01:02:05.000000000 +0100
+++ new/kdemultimedia-4.3.1/libkcompactdisc/wmlib/plat_freebsd.c 2009-08-27 10:19:11.000000000 +0200
@@ -26,7 +26,8 @@
*
*/
-#if defined(__FreeBSD__) || defined(__FreeBSD) || defined(__NetBSD__) || defined (__NetBSD)
+#if defined(__FreeBSD__) || defined(__FreeBSD) || defined(__NetBSD__) || defined (__NetBSD) || defined(__FreeBSD_kernel__)
+
#include
#include
@@ -70,7 +71,7 @@
# define LEFT_PORT 0
# define RIGHT_PORT 1
-# if __FreeBSD_version < 300000
+# if (__FreeBSD_version < 300000) && (__FreeBSD_kernel_version < 300000)
# include
# endif
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org