Hello community,
here is the log from the commit of package kdelibs3
checked in at Thu Oct 12 15:19:38 CEST 2006.
--------
--- KDE/kdelibs3/kdelibs3.changes 2006-10-07 20:05:41.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdelibs3/kdelibs3.changes 2006-10-11 22:48:07.000000000 +0200
@@ -1,0 +2,12 @@
+Wed Oct 11 22:47:10 CEST 2006 - stbinner@suse.de
+
+- update 3_5_BRANCH diff:
+ * fix crash when scheduling job for an invalid URL (#211541)
+ * fix cstyle indenter regression in Kate
+
+-------------------------------------------------------------------
+Tue Oct 10 14:42:44 CEST 2006 - dmueller@suse.de
+
+- update 3_5_BRANCH to fix cups connect timeout (#210260)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdelibs3-devel-doc.spec ++++++
--- /var/tmp/diff_new_pack.QyZWOY/_old 2006-10-12 15:19:17.000000000 +0200
+++ /var/tmp/diff_new_pack.QyZWOY/_new 2006-10-12 15:19:17.000000000 +0200
@@ -18,7 +18,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Additional Package Documentation
Version: 3.5.5
-Release: 3
+Release: 5
%define kdelibs_patch_level b
BuildArch: noarch
Requires: kdelibs3 qt3-devel-doc
++++++ kdelibs3.spec ++++++
--- /var/tmp/diff_new_pack.QyZWOY/_old 2006-10-12 15:19:17.000000000 +0200
+++ /var/tmp/diff_new_pack.QyZWOY/_new 2006-10-12 15:19:17.000000000 +0200
@@ -21,7 +21,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: KDE Base Libraries
Version: 3.5.5
-Release: 3
+Release: 5
Obsoletes: kde3-i18n kups keramik kdelibs3-cups kdelibs3-33addons
Provides: kups keramik kdelibs3-cups kdelibs3-33addons
Provides: kdelibs3_base = 3.3
@@ -740,6 +740,12 @@
/opt/kde3/%_lib/libkwalletclient.so
%changelog -n kdelibs3
+* Wed Oct 11 2006 - stbinner@suse.de
+- update 3_5_BRANCH diff:
+ * fix crash when scheduling job for an invalid URL (#211541)
+ * fix cstyle indenter regression in Kate
+* Tue Oct 10 2006 - dmueller@suse.de
+- update 3_5_BRANCH to fix cups connect timeout (#210260)
* Sat Oct 07 2006 - stbinner@suse.de
- update to the next 3.5.5 release tarball
- fixes a crash in Kate when selecting or undoing
++++++ testkhtml.spec ++++++
--- /var/tmp/diff_new_pack.QyZWOY/_old 2006-10-12 15:19:17.000000000 +0200
+++ /var/tmp/diff_new_pack.QyZWOY/_new 2006-10-12 15:19:17.000000000 +0200
@@ -16,7 +16,7 @@
License: Other License(s), see package, BSD
Group: System/GUI/KDE
Version: 3.5.5
-Release: 3
+Release: 5
Summary: Internal: regression testing for konqueror renderer
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: kdelibs-%{version}.tar.bz2
++++++ 3_5_BRANCH.diff ++++++
--- /var/tmp/diff_new_pack.QyZWOY/_old 2006-10-12 15:19:17.000000000 +0200
+++ /var/tmp/diff_new_pack.QyZWOY/_new 2006-10-12 15:19:17.000000000 +0200
@@ -222,6 +222,43 @@
private:
/**
+--- kate/part/kateautoindent.cpp
++++ kate/part/kateautoindent.cpp
+@@ -714,6 +714,7 @@
+ int parenCount = 0; // Possibly in a multiline for stmt. Used to skip ';' ...
+ bool found = false;
+ bool isSpecial = false;
++ bool potentialAnchorSeen = false;
+
+ //kdDebug(13030) << "calcIndent begin line:" << begin.line() << " col:" << begin.col() << endl;
+
+@@ -733,7 +734,7 @@
+ {
+ QChar tc = textLine->getChar (pos);
+ if ((tc == ';' || tc == ':' || tc == ',') && otherAnchor == -1 && parenCount <= 0)
+- otherAnchor = pos;
++ otherAnchor = pos, potentialAnchorSeen = true;
+ else if (tc == ')')
+ parenCount++;
+ else if (tc == '(')
+@@ -742,7 +743,7 @@
+ openCount--;
+ else if (tc == '{')
+ {
+- openCount++;
++ openCount++, potentialAnchorSeen = true;
+ if (openCount == 1)
+ break;
+ }
+@@ -826,7 +827,7 @@
+ }
+
+ // treat beginning of document as anchor position
+- if (cur.line() == 0 && cur.col() == 0)
++ if (cur.line() == 0 && cur.col() == 0 && potentialAnchorSeen)
+ found = true;
+
+ if (!found)
--- kab/qconfigDB.h
+++ kab/qconfigDB.h
@@ -199,7 +199,7 @@
@@ -473,6 +510,16 @@
*/
void setObject(Arts::PlayObject playObject);
+--- mimetypes/application/x-mplayer2.desktop
++++ mimetypes/application/x-mplayer2.desktop
+@@ -15,6 +15,7 @@
+ Comment[es]=Formator de medios de Microsoft
+ Comment[et]=Microsoft Media
+ Comment[fa]=قالب میکروسافت ورد
++Comment[fi]=Microsoft Media
+ Comment[fr]=Format Microsoft Media
+ Comment[hr]=Microsoft Media oblik
+ Comment[hu]=Microsoft Media-fájl
--- kioslave/file/file.h
+++ kioslave/file/file.h
@@ -48,10 +48,10 @@
@@ -666,6 +713,40 @@
/**
* Finds all details for one file or directory.
+--- kio/kio/job.cpp
++++ kio/kio/job.cpp
+@@ -410,15 +410,6 @@
+ : Job(showProgressInfo), m_slave(0), m_packedArgs(packedArgs),
+ m_url(url), m_command(command), m_totalSize(0)
+ {
+- if (!m_url.isValid())
+- {
+- m_error = ERR_MALFORMED_URL;
+- m_errorText = m_url.url();
+- QTimer::singleShot(0, this, SLOT(slotFinished()) );
+- return;
+- }
+-
+-
+ if (m_url.hasSubURL())
+ {
+ KURL::List list = KURL::split(m_url);
+@@ -430,6 +421,15 @@
+ }
+
+ Scheduler::doJob(this);
++
++ if (!m_url.isValid())
++ {
++ kdDebug() << "ERR_MALFORMED_URL" << endl;
++ m_error = ERR_MALFORMED_URL;
++ m_errorText = m_url.url();
++ QTimer::singleShot(0, this, SLOT(slotFinished()) );
++ return;
++ }
+ }
+
+ void SimpleJob::kill( bool quietly )
--- kio/kio/kservice.cpp
+++ kio/kio/kservice.cpp
@@ -447,19 +447,21 @@
@@ -1120,6 +1201,43 @@
bool disconnectKey( const KKeyServer::Key& )
{ return false; }
};
+--- kdecore/kstandarddirs.cpp
++++ kdecore/kstandarddirs.cpp
+@@ -441,7 +441,7 @@
+ }
+
+ #ifndef NDEBUG
+- if(false && type != "locale")
++ if(false && strcmp(type, "locale"))
+ kdDebug() << "KStdDirs::findResDir(): can't find \"" << filename << "\" in type \"" << type << "\"." << endl;
+ #endif
+
+@@ -690,7 +690,7 @@
+
+ /* If the path contains symlinks, get the real name */
+ if (realpath( QFile::encodeName(dirname).data(), realpath_buffer) != 0) {
+- // succes, use result from realpath
++ // success, use result from realpath
+ int len = strlen(realpath_buffer);
+ realpath_buffer[len] = '/';
+ realpath_buffer[len+1] = 0;
+@@ -708,7 +708,7 @@
+
+ /* If the path contains symlinks, get the real name */
+ if (realpath( QFile::encodeName(filename).data(), realpath_buffer) != 0) {
+- // succes, use result from realpath
++ // success, use result from realpath
+ return QFile::decodeName(realpath_buffer);
+ }
+
+@@ -1287,6 +1287,7 @@
+ kdedirList.append(kdedir);
+ }
+ }
++
+ #ifndef Q_OS_WIN //no default KDEDIR on win32 defined
+ kdedirList.append(KDEDIR);
+ #endif
--- kdecore/kglobalaccel_emb.h
+++ kdecore/kglobalaccel_emb.h
@@ -9,7 +9,7 @@
@@ -1223,6 +1341,55 @@
* @since 3.5.5
*/
static void setCurrentDesktopViewport( int desktop, QPoint viewport );
+--- kdecore/kstartupinfo.cpp
++++ kdecore/kstartupinfo.cpp
+@@ -146,7 +146,7 @@
+ d->wm_module = NULL;
+ connect( &d->msgs, SIGNAL( gotMessage( const QString& )), SLOT( got_message( const QString& )));
+ #endif
+- d->cleanup = new QTimer( this );
++ d->cleanup = new QTimer( this, "cleanup" );
+ connect( d->cleanup, SIGNAL( timeout()), SLOT( startups_cleanup()));
+ }
+
+--- kdecore/kstartupinfo.h
++++ kdecore/kstartupinfo.h
+@@ -175,7 +175,7 @@
+ static bool sendStartup( const KStartupInfoId& id, const KStartupInfoData& data );
+
+ /**
+- * Like sendStartup , uses dpy instead of qt_x11display() for sending the info.
++ * Like sendStartup , uses dpy instead of qt_xdisplay() for sending the info.
+ * @param dpy the display of the application. Note that the name field
+ * in data is required.
+ * @param id the id of the application
+@@ -198,7 +198,7 @@
+ static bool sendChange( const KStartupInfoId& id, const KStartupInfoData& data );
+
+ /**
+- * Like sendChange , uses dpy instead of qt_x11display() for sending the info.
++ * Like sendChange , uses dpy instead of qt_xdisplay() for sending the info.
+ * @param dpy the display of the application.
+ * @param id the id of the application
+ * @param data the application's data
+@@ -215,7 +215,7 @@
+ static bool sendFinish( const KStartupInfoId& id );
+
+ /**
+- * Like sendFinish , uses dpy instead of qt_x11display() for sending the info.
++ * Like sendFinish , uses dpy instead of qt_xdisplay() for sending the info.
+ * @param dpy the display of the application.
+ * @param id the id of the application
+ * @return true if successful, false otherwise
+@@ -232,7 +232,7 @@
+ static bool sendFinish( const KStartupInfoId& id, const KStartupInfoData& data );
+
+ /**
+- * Like sendFinish , uses dpy instead of qt_x11display() for sending the info.
++ * Like sendFinish , uses dpy instead of qt_xdisplay() for sending the info.
+ * @param dpy the display of the application.
+ * @param id the id of the application
+ * @param data the application's data
--- khtml/html/html_formimpl.h
+++ khtml/html/html_formimpl.h
@@ -289,7 +289,7 @@
@@ -1534,6 +1701,26 @@
KDialogBase *dlg = new KDialogBase(static_cast