Hello community, here is the log from the commit of package kdelibs4 checked in at Fri May 16 22:55:45 CEST 2008. -------- --- KDE/kdelibs4/kdelibs4.changes 2008-05-09 18:24:52.000000000 +0200 +++ kdelibs4/kdelibs4.changes 2008-05-15 20:08:48.000000000 +0200 @@ -1,0 +2,10 @@ +Thu May 15 20:07:30 CEST 2008 - dmueller@suse.de + +- fix off-by-one in progress calculation (bnc#382809) + +------------------------------------------------------------------- +Wed May 14 16:40:59 CEST 2008 - llunak@suse.cz + +- support for KDE3 hotplug actions (bnc#378338) + +------------------------------------------------------------------- New: ---- hotplug-kde3.diff kde4rc windeco-color.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4.spec ++++++ --- /var/tmp/diff_new_pack.kH6613/_old 2008-05-16 22:51:59.000000000 +0200 +++ /var/tmp/diff_new_pack.kH6613/_new 2008-05-16 22:51:59.000000000 +0200 @@ -26,7 +26,7 @@ Summary: KDE Base Libraries Url: http://www.kde.org Version: 4.0.4 -Release: 3 +Release: 6 %define rversion 4.0.4 Requires: libqt4-x11 >= %( echo `rpm -q --queryformat '%{VERSION}' libqt4-x11`) Requires: libstrigi0 >= %( echo `rpm -q --queryformat '%{VERSION}' strigi-devel`) @@ -39,6 +39,7 @@ Source1: _upstream Source2: hidden.desktop Source3: ycp.xml +Source4: kde4rc Patch0: 4_0_BRANCH.diff Patch1: kde3-applications.diff Patch2: default-useragent.diff @@ -50,6 +51,8 @@ Patch11: add-suse-translations.diff Patch12: kdesu-settings.diff Patch13: kdelibs4pim.diff +Patch14: hotplug-kde3.diff +Patch15: windeco-color.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -78,6 +81,8 @@ %patch11 %patch12 %patch13 +%patch14 +%patch15 # # define KDE version exactly # @@ -122,6 +127,7 @@ install -m 0644 %SOURCE2 $RPM_BUILD_ROOT/usr/share/autostart/panel.desktop install -m 0644 %SOURCE2 $RPM_BUILD_ROOT/usr/share/autostart/kdesktop.desktop install -m 0644 %SOURCE3 $RPM_BUILD_ROOT//usr/share/kde4/apps/katepart/syntax/ycp.xml + install -m 0644 %SOURCE4 $RPM_BUILD_ROOT/etc/ %kde_post_install %post -p /sbin/ldconfig @@ -214,6 +220,7 @@ %dir /usr/share/kde4/servicetypes %config %_kde_config_dir/kdebug.areas %config %_kde_config_dir/kdebugrc +%config /etc/kde4rc %package -n libkdecore4-devel License: LGPL v2.1 or later @@ -359,6 +366,10 @@ /usr/share/autostart/kdesktop.desktop %changelog +* Thu May 15 2008 dmueller@suse.de +- fix off-by-one in progress calculation (bnc#382809) +* Wed May 14 2008 llunak@suse.cz +- support for KDE3 hotplug actions (bnc#378338) * Fri May 09 2008 dmueller@suse.de - 4_0_BRANCH.diff update: * fixes crash handler not always being installed ++++++ 4_0_BRANCH.diff ++++++ --- /var/tmp/diff_new_pack.kH6613/_old 2008-05-16 22:51:59.000000000 +0200 +++ /var/tmp/diff_new_pack.kH6613/_new 2008-05-16 22:51:59.000000000 +0200 @@ -3,7 +3,7 @@ --- BRANCH_STATUS +++ BRANCH_STATUS @@ -0,0 +1,2 @@ -+current HEAD: 805831 ++current HEAD: 808104 +svn di between //tags/KDE/4.0.4/kdelibs and //branches/KDE/4.0/kdelibs --- khtml/khtmladaptorpart.desktop +++ khtml/khtmladaptorpart.desktop @@ -15,6 +15,35 @@ Name[se]=KHTML-viiddádusheiveheaddji Name[sl]=Prilagodilnik razširitve KHTML Name[sr]=Адаптор проширења за КХТМЛ +--- khtml/misc/idstring.cpp ++++ khtml/misc/idstring.cpp +@@ -81,12 +81,15 @@ + assert(id == m_mappings.size()); + assert(!m_mappingLookup.contains(name)); + m_mappings.append(Mapping(name)); ++ m_mappings[m_mappings.size() - 1].refCount = 1; // Pin it. + m_mappingLookup[name] = id; + } + + void IDTableBase::addHiddenMapping(unsigned id, const DOMString& name) + { ++ assert(id == m_mappings.size()); + m_mappings.append(Mapping(name)); ++ m_mappings[m_mappings.size() - 1].refCount = 1; // Pin it. + } + + } +--- khtml/misc/idstring.h ++++ khtml/misc/idstring.h +@@ -98,7 +98,7 @@ + Mapping(): refCount(0) + {} + +- Mapping(const DOMString& _name): name(_name) ++ Mapping(const DOMString& _name): refCount(0), name(_name) + {} + }; + protected: --- khtml/rendering/render_replaced.cpp +++ khtml/rendering/render_replaced.cpp @@ -211,12 +211,27 @@ @@ -299,6 +328,20 @@ Comment[se]=Bija sisa dálá dáhtona ja áiggi Comment[sl]=Vstavi trenuten čas in datum Comment[sr]=Уметни тренутно време и датум +--- phonon/libkaudiodevicelist/audiodevice.cpp ++++ phonon/libkaudiodevicelist/audiodevice.cpp +@@ -137,6 +137,11 @@ + Solid::Device parent = audioDevice.parent(); + if (parent.isValid()) { + d->uniqueId = d->uniqueIdentifierFromDevice(parent); ++ // newer HAL versions add one more parent in between to find the actual hardware info ++ if (d->uniqueId.isEmpty() && parent.parent().isValid()) { ++ parent = parent.parent(); ++ d->uniqueId = d->uniqueIdentifierFromDevice(parent); ++ } + if (!d->uniqueId.isEmpty()) { + switch (audioHw->deviceType()) { + case Solid::AudioInterface::AudioInput: --- phonon/platform_kde/phonon.notifyrc +++ phonon/platform_kde/phonon.notifyrc @@ -38,6 +38,7 @@ @@ -533,6 +576,35 @@ Name[se]=KDE-heivehusmodula Name[sl]=Modul za nastavljanje KDE Name[sr]=КДЕ модул за подешавање +--- kdeui/kernel/kstyle.cpp ++++ kdeui/kernel/kstyle.cpp +@@ -1203,7 +1203,7 @@ + + //We layout as if LTR, relying on visualRect to fix it up + double progress = pbOpt->progress - pbOpt->minimum; +- int steps = pbOpt->maximum - pbOpt->minimum + 1; ++ int steps = qMax(pbOpt->maximum - pbOpt->minimum, 1); + bool busyIndicator = (pbOpt->minimum == 0 && pbOpt->maximum == 0); + + //Do we have to draw anything? +@@ -1218,7 +1218,7 @@ + widthFrac = progress / steps; + + //And now the pixel width +- int width = qMin(r.width(), (int)(widthFrac * r.width())); ++ int width = qMin(r.width(), (int)(widthFrac * double(r.width()))); + + if (busyIndicator) + { +@@ -1288,7 +1288,7 @@ + //Now, we need to figure out the geometry of the indicator. + QRect progressRect; + double progress = pbOpt->progress - pbOpt->minimum; +- int steps = pbOpt->maximum - pbOpt->minimum + 1; ++ int steps = qMax(pbOpt->maximum - pbOpt->minimum, 1); + bool busyIndicator = (steps <= 1); + + int width; --- kdeui/kernel/kapplication.cpp +++ kdeui/kernel/kapplication.cpp @@ -733,7 +733,9 @@ @@ -676,6 +748,21 @@ Comment[se]=Gieđahala SSL, sertifikáhtaid ja eará krypterenheivehusaid Comment[sl]=Nastavljanje SSL, upravljanje s potrdili in ostale nastavitve šifriranja Comment[sr]=Подешавање ССЛ‑а, управљање сертификатима, и друге криптографске поставке +--- kdecore/services/kservice.cpp ++++ kdecore/services/kservice.cpp +@@ -229,12 +229,6 @@ + } + + QString dbusStartupType = desktopGroup.readEntry("X-DBUS-StartupType").toLower(); +- //Compatibility +- if( dbusStartupType.isEmpty() && desktopGroup.hasKey("X-DCOP-ServiceType")) +- { +- dbusStartupType = desktopGroup.readEntry("X-DCOP-ServiceType").toLower(); +- entryMap.remove("X-DCOP-ServiceType"); +- } + entryMap.remove("X-DBUS-StartupType"); + if (dbusStartupType == "unique") + m_DBUSStartusType = KService::DBusUnique; --- kdecore/sonnet/sonnetspeller.desktop +++ kdecore/sonnet/sonnetspeller.desktop @@ -42,6 +42,7 @@ ++++++ hotplug-kde3.diff ++++++ Subject: Hotplug support for KDE3 applications From: Lubos Lunak Feature: bnc#378338 Patch-upstream: never Relates: kdebase4-runtime/hotplug-kde3.diff, kdebase4-workspace/hotplug-kde3.diff --- ./kdecore/services/kservice.cpp.sav 2008-05-13 13:49:58.000000000 +0200 +++ ./kdecore/services/kservice.cpp 2008-05-14 11:44:14.000000000 +0200 @@ -95,6 +95,8 @@ void KServicePrivate::init( const KDeskt m_bValid = false; return;*/ m_strType = "Application"; + if( entryPath.contains( "/konqueror/servicemenus" )) + m_strType = "Service"; // workaround for bnc#378338, KDE3 entries there miss Type= } else if ( m_strType != "Application" && m_strType != "Service" ) { kWarning(7012) << "The desktop entry file " << entryPath ++++++ windeco-color.diff ++++++ Index: kdeui/kernel/kglobalsettings.cpp =================================================================== --- kdeui/kernel/kglobalsettings.cpp (revision 808006) +++ kdeui/kernel/kglobalsettings.cpp (working copy) @@ -273,7 +273,7 @@ return qt_colorref2qrgb(GetSysColor(COLOR_ACTIVECAPTION)); #else KConfigGroup g( KGlobal::config(), "WM" ); - return g.readEntry( "activeBackground", QColor(96, 148, 207)); + return g.readEntry( "activeBackground", QColor(106, 153, 213)); #endif } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org