Hello community,
here is the log from the commit of package kdelibs3
checked in at Fri Oct 27 19:03:09 CEST 2006.
--------
--- KDE/kdelibs3/kdelibs3.changes 2006-10-20 14:06:13.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdelibs3/kdelibs3.changes 2006-10-27 09:25:21.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Oct 27 09:24:47 CEST 2006 - coolo@suse.de
+
+- update 3_5_BRANCH diff:
+ * fix severe kde bug 127662, which made working with KDE so much
+ less fun
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdelibs3-devel-doc.spec ++++++
--- /var/tmp/diff_new_pack.nXc3Py/_old 2006-10-27 18:57:09.000000000 +0200
+++ /var/tmp/diff_new_pack.nXc3Py/_new 2006-10-27 18:57:09.000000000 +0200
@@ -13,12 +13,12 @@
Name: kdelibs3-devel-doc
BuildRequires: OpenEXR-devel aspell-devel cups-devel db-devel doxygen graphviz kdelibs3-devel krb5-devel libjasper libsndfile mDNSResponder-devel openldap2-devel qt3-devel-doc utempter xorg-x11-fonts-100dpi xorg-x11-fonts-75dpi xorg-x11-fonts-scalable
Url: http://www.kde.org
-License: Other License(s), see package
+License: GNU General Public License (GPL) - all versions
Group: Documentation/HTML
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Additional Package Documentation
Version: 3.5.5
-Release: 13
+Release: 19
%define kdelibs_patch_level b
BuildArch: noarch
Requires: kdelibs3 qt3-devel-doc
++++++ kdelibs3.spec ++++++
--- /var/tmp/diff_new_pack.nXc3Py/_old 2006-10-27 18:57:10.000000000 +0200
+++ /var/tmp/diff_new_pack.nXc3Py/_new 2006-10-27 18:57:10.000000000 +0200
@@ -16,12 +16,12 @@
BuildRequires: libdrm-devel
%endif
URL: http://www.kde.org
-License: Other License(s), see package
+License: BSD License and BSD-like, Other License(s), see package
Group: System/GUI/KDE
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: KDE Base Libraries
Version: 3.5.5
-Release: 13
+Release: 19
Obsoletes: kde3-i18n kups keramik kdelibs3-cups kdelibs3-33addons
Provides: kups keramik kdelibs3-cups kdelibs3-33addons
Provides: kdelibs3_base = 3.3
@@ -742,6 +742,10 @@
/opt/kde3/%_lib/libkwalletclient.so
%changelog -n kdelibs3
+* Fri Oct 27 2006 - coolo@suse.de
+- update 3_5_BRANCH diff:
+ * fix severe kde bug 127662, which made working with KDE so much
+ less fun
* Fri Oct 20 2006 - stbinner@suse.de
- don't show progress when stating kio_beagle for beagle status
* Thu Oct 19 2006 - dmueller@suse.de
++++++ testkhtml.spec ++++++
--- /var/tmp/diff_new_pack.nXc3Py/_old 2006-10-27 18:57:10.000000000 +0200
+++ /var/tmp/diff_new_pack.nXc3Py/_new 2006-10-27 18:57:10.000000000 +0200
@@ -13,10 +13,10 @@
Name: testkhtml
BuildRequires: cups-devel db-devel doxygen graphviz kdelibs3-devel khtmltests krb5-devel libjasper libusb openldap2-devel xorg-x11 xorg-x11-Xvfb xorg-x11-fonts-100dpi xorg-x11-fonts-75dpi xorg-x11-fonts-cyrillic xorg-x11-fonts-scalable
URL: http://www.kde.org
-License: Other License(s), see package
+License: BSD License and BSD-like, Other License(s), see package
Group: System/GUI/KDE
Version: 3.5.5
-Release: 13
+Release: 20
Summary: Internal: regression testing for konqueror renderer
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: kdelibs-%{version}.tar.bz2
++++++ 3_5_BRANCH.diff ++++++
++++ 10027 lines (skipped)
++++ between KDE/kdelibs3/3_5_BRANCH.diff
++++ and /mounts/work_src_done/STABLE/kdelibs3/3_5_BRANCH.diff
++++++ kdemm.diff ++++++
--- /var/tmp/diff_new_pack.nXc3Py/_old 2006-10-27 18:57:13.000000000 +0200
+++ /var/tmp/diff_new_pack.nXc3Py/_new 2006-10-27 18:57:13.000000000 +0200
@@ -1,7 +1,18 @@
+--- kdemm/channel.h 2006/07/09 19:18:54 1.53
++++ kdemm/channel.h 2006/07/09 19:23:50
+@@ -83,7 +83,7 @@
+ * You can not instantiate channels yourself, use the Factory to
+ * create them.
+ */
+- Channel( const QString & name, const QString & type, Direction direction,
++ Channel( const QString & channelName, const QString & type, Direction direction,
+ QObject * parent = 0, const char * name = 0 );
+
+ private:
Index: arts/knotify/knotify.cpp
===================================================================
---- arts/knotify/knotify.cpp (.../svn+ssh://coolo@svn.kde.org/home/kde/branches/KDE/3.4/kdelibs/arts/knotify) (Revision 437515)
-+++ arts/knotify/knotify.cpp (.../arts/knotify) (Arbeitskopie)
+--- arts/knotify/knotify.cpp (Revision 599452)
++++ arts/knotify/knotify.cpp (Arbeitskopie)
@@ -5,6 +5,7 @@
2000 Matthias Ettrich (ettrich@kde.org)
2000 Waldo Bastian
@@ -10,20 +21,24 @@
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-@@ -26,12 +27,6 @@
+@@ -26,16 +27,6 @@
#include
#include
+-#include
+-#ifndef WITHOUT_ARTS
-// aRts headers
-#include
-#include
-#include
+-#include
-#include
+-#endif
-
// QT headers
#include
#include
-@@ -59,6 +54,7 @@
+@@ -66,6 +57,7 @@
#include
#include
#include
@@ -31,12 +46,15 @@
#include "knotify.h"
#include "knotify.moc"
-@@ -73,15 +69,12 @@
+@@ -80,15 +72,10 @@
QString externalPlayer;
KProcess *externalPlayerProc;
+-#ifndef WITHOUT_ARTS
- QPtrListKDE::PlayObject playObjects;
- QMapKDE::PlayObject*,int playObjectEventMap;
+- KAudioManagerPlay *audioManager;
+-#endif
int externalPlayerEventId;
bool useExternal;
@@ -44,11 +62,8 @@
+ bool useKDEMM;
int volume;
QTimer *playTimer;
-- KAudioManagerPlay *audioManager;
bool inStartup;
- QString startupEvents;
- };
-@@ -95,12 +88,13 @@
+@@ -106,12 +93,13 @@
KDE_EXPORT int kdemain(int argc, char **argv)
{
KAboutData aboutdata("knotify", I18N_NOOP("KNotify"),
@@ -63,7 +78,7 @@
KCmdLineArgs::init( argc, argv, &aboutdata );
KUniqueApplication::addCmdLineOptions();
-@@ -115,127 +109,26 @@
+@@ -126,139 +114,26 @@
KUniqueApplication app;
app.disableSessionManagement();
@@ -76,6 +91,7 @@
- // We try to prevent this by tracking our startup and offer options to
- // abort this.
-
+-#ifndef WITHOUT_ARTS
- KConfigGroup config( KGlobal::config(), "StartProgress" );
- KConfig artsKCMConfig( "kcmartsrc" );
- artsKCMConfig.setGroup( "Arts" );
@@ -161,14 +177,23 @@
- config.writeEntry( "KNotify Init", true );
- config.sync();
-
+-#else
+-
+- // start notify service, without aRts
+- KNotify *notify = new KNotify( false );
+-
+-#endif
+-
app.dcopClient()->setDefaultObject( "Notify" );
app.dcopClient()->setDaemonMode( true );
// kdDebug() << "knotify starting" << endl;
int ret = app.exec();
- delete notify;
+-#ifndef WITHOUT_ARTS
- delete soundServer;
- delete dispatcher;
+-#endif
return ret;
}
}// end extern "C"
@@ -182,32 +207,34 @@
d->globalConfig = new KConfig("knotify.eventsrc", true, false);
d->externalPlayerProc = 0;
- d->useArts = useArts;
+- d->inStartup = true;
+-#ifndef WITHOUT_ARTS
- d->playObjects.setAutoDelete(true);
- d->audioManager = 0;
-- d->inStartup = true;
- if( useArts )
- {
- connect( soundServer, SIGNAL( restartedServer() ), this, SLOT( restartedArtsd() ) );
- restartedArtsd(); //started allready need to initialize d->audioManager
- }
+-#endif
+ d->useKDEMM = useKDEMM;
d->volume = 100;
-@@ -248,12 +141,9 @@
- {
+@@ -272,12 +147,9 @@
reconfigure();
+ #ifndef WITHOUT_ARTS
- d->playObjects.clear();
-
delete d->globalEvents;
delete d->globalConfig;
delete d->externalPlayerProc;
- delete d->audioManager;
+ #endif
delete d;
}
-
-@@ -268,7 +158,7 @@
+@@ -293,7 +165,7 @@
// try to locate a suitable player if none is configured
if ( d->externalPlayer.isEmpty() ) {
QStringList players;
@@ -216,7 +243,7 @@
QStringList::Iterator it = players.begin();
while ( d->externalPlayer.isEmpty() && it != players.end() ) {
d->externalPlayer = KStandardDirs::findExe( *it );
-@@ -417,7 +307,6 @@
+@@ -442,7 +314,6 @@
bool KNotify::notifyBySound( const QString &sound, const QString &appname, int eventId )
{
if (sound.isEmpty()) {
@@ -224,7 +251,7 @@
return false;
}
-@@ -431,9 +320,8 @@
+@@ -456,9 +327,8 @@
if ( soundFile.isEmpty() )
soundFile = locate( "sound", sound );
}
@@ -235,7 +262,7 @@
return false;
}
-@@ -441,74 +329,17 @@
+@@ -466,75 +336,17 @@
// kdDebug() << "KNotify::notifyBySound - trying to play file " << soundFile << endl;
if (!external) {
@@ -249,6 +276,7 @@
return false;
}
+-#ifndef WITHOUT_ARTS
- // play sound finally
- while( d->playObjects.count()>5 )
- abortFirstPlayObject();
@@ -307,13 +335,13 @@
- }
- if ( !d->playTimer->isActive() )
- d->playTimer->start( 1000 );
--
+-#endif
- return true;
-
} else if(!d->externalPlayer.isEmpty()) {
// use an external player to play the sound
KProcess *proc = d->externalPlayerProc;
-@@ -520,7 +351,6 @@
+@@ -546,7 +358,6 @@
}
if (proc->isRunning())
{
@@ -321,7 +349,7 @@
return false; // Skip
}
proc->clearArguments();
-@@ -530,7 +360,6 @@
+@@ -556,7 +367,6 @@
return true;
}
@@ -329,12 +357,13 @@
return false;
}
-@@ -659,64 +488,6 @@
+@@ -685,69 +495,6 @@
d->volume = volume;
}
-void KNotify::playTimeout()
-{
+-#ifndef WITHOUT_ARTS
- for ( QPtrListIterator< KDE::PlayObject > it(d->playObjects); *it;)
- {
- QPtrListIterator< KDE::PlayObject > current = it;
@@ -352,16 +381,18 @@
- }
- if ( !d->playObjects.count() )
- d->playTimer->stop();
+-#endif
-}
-
-bool KNotify::isPlaying( const QString& soundFile ) const
-{
+-#ifndef WITHOUT_ARTS
- for ( QPtrListIterator< KDE::PlayObject > it(d->playObjects); *it; ++it)
- {
- if ( (*it)->mediaName() == soundFile )
- return true;
- }
--
+-#endif
- return false;
-}
-
@@ -373,6 +404,7 @@
-
-void KNotify::abortFirstPlayObject()
-{
+-#ifndef WITHOUT_ARTS
- QMapKDE::PlayObject*,int::Iterator it = d->playObjectEventMap.find( d->playObjects.getFirst() );
- if ( it != d->playObjectEventMap.end() )
- {
@@ -380,6 +412,7 @@
- d->playObjectEventMap.remove( it );
- }
- d->playObjects.removeFirst();
+-#endif
-}
-
-void KNotify::soundFinished( int eventId, PlayingFinishedStatus reason )
@@ -394,16 +427,18 @@
WId KNotify::checkWinId( const QString &appName, WId senderWinId )
{
if ( senderWinId == 0 )
-@@ -748,14 +519,6 @@
+@@ -779,16 +526,6 @@
return senderWinId;
}
-void KNotify::restartedArtsd()
-{
+-#ifndef WITHOUT_ARTS
- delete d->audioManager;
- d->audioManager = new KAudioManagerPlay( soundServer );
- d->audioManager->setTitle( i18n( "KDE System Notifications" ) );
- d->audioManager->setAutoRestoreID( "KNotify Aman Play" );
+-#endif
-}
-
void KNotify::sessionReady()
@@ -411,9 +446,9 @@
if( d->inStartup && !d->startupEvents.isEmpty())
Index: arts/knotify/Makefile.am
===================================================================
---- arts/knotify/Makefile.am (.../svn+ssh://coolo@svn.kde.org/home/kde/branches/KDE/3.4/kdelibs/arts/knotify) (Revision 437515)
-+++ arts/knotify/Makefile.am (.../arts/knotify) (Arbeitskopie)
-@@ -3,10 +3,13 @@
+--- arts/knotify/Makefile.am (Revision 599452)
++++ arts/knotify/Makefile.am (Arbeitskopie)
+@@ -3,12 +3,13 @@
####### Files
@@ -424,24 +459,18 @@
+kdeinit_LTLIBRARIES = knotify.la
knotify_la_SOURCES = knotify.cpp knotify.skel
+-if include_ARTS
-knotify_la_LIBADD = -lsoundserver_idl -lqtmcop $(LIB_KDEUI) $(top_builddir)/arts/kde/libartskde.la
+-endif
+knotify_la_LIBADD = $(LIB_KDEUI) $(top_builddir)/kdemm/libkdemm.la
knotify_la_LDFLAGS = $(all_libraries) -module -avoid-version
knotify_la_METASOURCES = AUTO
Index: arts/knotify/knotify.h
===================================================================
---- arts/knotify/knotify.h (.../svn+ssh://coolo@svn.kde.org/home/kde/branches/KDE/3.4/kdelibs/arts/knotify) (Revision 437515)
-+++ arts/knotify/knotify.h (.../arts/knotify) (Arbeitskopie)
-@@ -23,7 +23,6 @@
- #include
- #include
- #include
--#include
-
- class KNotifyPrivate;
- class KProcess;
-@@ -76,19 +75,15 @@
+--- arts/knotify/knotify.h (Revision 599452)
++++ arts/knotify/knotify.h (Arbeitskopie)
+@@ -75,19 +75,15 @@
bool notifyByStderr(const QString &text);
bool notifyByPassivePopup(const QString &text, const QString &appName,
WId winId );
@@ -466,7 +495,7 @@
WId checkWinId( const QString& appName, WId senderWinId );
/**
-@@ -96,11 +91,6 @@
+@@ -95,11 +91,6 @@
**/
bool isGlobal(const QString &eventname);
@@ -478,14 +507,13 @@
private:
KNotifyPrivate* d;
void loadConfig();
---- kdemm/channel.h 2006/07/09 19:18:54 1.53
-+++ kdemm/channel.h 2006/07/09 19:23:50
-@@ -83,7 +83,7 @@
- * You can not instantiate channels yourself, use the Factory to
- * create them.
- */
-- Channel( const QString & name, const QString & type, Direction direction,
-+ Channel( const QString & channelName, const QString & type, Direction direction,
- QObject * parent = 0, const char * name = 0 );
+--- arts/knotify/knotify.cpp.orig 2006-10-27 10:29:29.000000000 +0200
++++ arts/knotify/knotify.cpp 2006-10-27 10:29:36.000000000 +0200
+@@ -32,6 +32,7 @@
+ #include
+ #include
+ #include
++#include
- private:
+ // KDE headers
+ #include
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org