Hello community,

here is the log from the commit of package kdebase4-runtime for openSUSE:11.4
checked in at Sun Feb 27 14:47:25 CET 2011.



--------
--- old-versions/11.4/all/kdebase4-runtime/kdebase4-runtime.changes     
2011-02-17 15:32:19.000000000 +0100
+++ 11.4/kdebase4-runtime/kdebase4-runtime.changes      2011-02-27 
10:46:04.000000000 +0100
@@ -1,0 +2,5 @@
+Sun Feb 27 09:45:40 UTC 2011 - [email protected]
+
+- avoid crash in languages module (bnc#262488)
+
+-------------------------------------------------------------------

calling whatdependson for 11.4-i586


New:
----
  kcontrol-locale-fix.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdebase4-runtime.spec ++++++
--- /var/tmp/diff_new_pack.Sn3mhm/_old  2011-02-27 14:47:18.000000000 +0100
+++ /var/tmp/diff_new_pack.Sn3mhm/_new  2011-02-27 14:47:18.000000000 +0100
@@ -23,7 +23,7 @@
 Summary:        The KDE Runtime Components
 Url:            http://www.kde.org/
 Version:        4.6.0
-Release:        4.<RELEASE2>
+Release:        4.<RELEASE3>
 BuildRequires:  libkde4-devel >= %version
 BuildRequires:  NetworkManager-devel bluez-devel libqimageblitz-devel 
openslp-devel
 BuildRequires:  OpenEXR-devel libsmbclient-devel libsoprano-devel 
libxklavier-devel xine-devel
@@ -56,6 +56,7 @@
 Patch13:        ksuseinstall.diff
 Patch15:        kdesu-symbol-lookup-workaround.diff
 Patch16:        phonon-always-forget.diff
+Patch17:        kcontrol-locale-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       oxygen-icon-theme >= %version
 Requires:       libqt4-x11 >= %( echo `rpm -q --queryformat '%{VERSION}' 
libqt4-x11`)
@@ -164,6 +165,7 @@
 %patch13
 %patch15
 %patch16
+%patch17 -p1
 
 %build
   %cmake_kde4 -d build


++++++ kcontrol-locale-fix.patch ++++++
diff --git a/kcontrol/locale/kcmlocale.cpp b/kcontrol/locale/kcmlocale.cpp
index cf58e4c..4a04f0d 100644
--- a/kcontrol/locale/kcmlocale.cpp
+++ b/kcontrol/locale/kcmlocale.cpp
@@ -2449,7 +2449,11 @@ void KCMLocale::setTimeFormat( const QString &newValue )
 
 QString KCMLocale::dayPeriodText( const QString &dayPeriod )
 {
-    return dayPeriod.split( QChar::fromLatin1(',') ).at( 2 );
+    QStringList split = dayPeriod.split( QChar::fromLatin1(',') );
+    if (split.size() > 2)
+       return split.at( 2 );
+    else
+       return QString::null;
 }
 
 QString KCMLocale::amPeriod( const QString &longName, const QString 
&shortName, const QString &narrowName )


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to