diff --git a/kdelibs-4.1.1-kde#858795-mimeassoc.patch b/kdelibs-4.1.1-kde#858795-mimeassoc.patch new file mode 100644 index 0000000..4b6cd32 --- /dev/null +++ b/kdelibs-4.1.1-kde#858795-mimeassoc.patch @@ -0,0 +1,13 @@ +Index: kded/kmimeassociations.cpp +=================================================================== +--- kded/kmimeassociations.cpp (revision 858794) ++++ kded/kmimeassociations.cpp (revision 858795) +@@ -62,7 +62,7 @@ + const QString mimeappsFile = mimeappsIter.previous(); + kDebug(7021) << "Parsing" << mimeappsFile; + parseMimeAppsList(mimeappsFile, basePreference); +- basePreference -= 50; ++ basePreference += 50; + } + return true; + } diff --git a/kdelibs-4.1.1-kde#860095-khtml-scroll-crash.patch b/kdelibs-4.1.1-kde#860095-khtml-scroll-crash.patch new file mode 100644 index 0000000..b61cbad --- /dev/null +++ b/kdelibs-4.1.1-kde#860095-khtml-scroll-crash.patch @@ -0,0 +1,24 @@ +Index: khtml/rendering/render_layer.cpp +=================================================================== +--- khtml/rendering/render_layer.cpp (revision 860094) ++++ khtml/rendering/render_layer.cpp (revision 860095) +@@ -715,9 +715,6 @@ + for (RenderLayer* child = firstChild(); child; child = child->nextSibling()) + child->updateLayerPositions(rootLayer); + +- // Fire the scroll DOM event. +- m_object->element()->dispatchHTMLEvent(EventImpl::SCROLL_EVENT, true, false); +- + // Just schedule a full repaint of our object. + if (repaint) + m_object->repaint(RealtimePriority); +@@ -728,6 +725,9 @@ + if (m_vBar) + m_vBar->setValue(m_scrollY); + } ++ ++ // Fire the scroll DOM event. Do this the very last thing, since the handler may kill us. ++ m_object->element()->dispatchHTMLEvent(EventImpl::SCROLL_EVENT, true, false); + } + + void RenderLayer::updateScrollPositionFromScrollbars() diff --git a/kdelibs.spec b/kdelibs.spec index 32a021f..d7008de 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -2,7 +2,7 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.1.1 -Release: 9%{?dist} +Release: 10%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -88,6 +88,8 @@ Patch101: kdelibs-4.1.1-kde#856379-cookiejar.patch Patch102: kdelibs-4.1.1-kde#856403-urlnav.patch Patch103: kdelibs-4.1.1-kutils-fixes.patch Patch104: kdelibs-4.1.1-kdeui-widgets-fixes.patch +Patch105: kdelibs-4.1.1-kde#858795-mimeassoc.patch +Patch106: kdelibs-4.1.1-kde#860095-khtml-scroll-crash.patch BuildRequires: qt4-devel >= 4.4.0 Requires: qt4 >= %{_qt4_version} @@ -221,6 +223,8 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage %patch102 -p0 -b .kde#856403-urlnav %patch103 -p0 -b .kutils-fixes %patch104 -p0 -b .kdeui-widgets-fixes +%patch105 -p0 -b .kde#858795-mimeassoc +%patch106 -p0 -b .kde#860095-khtml-scroll-crash %build @@ -381,6 +385,11 @@ rm -rf %{buildroot} %changelog +* Thu Sep 18 2008 Lukáš Tinkl 4.1.1-10 +- Fix file association bug, the global mimeapps.list file had priority + over the local one. +- khtml scroll crash fix (kdebug:170880) + * Tue Sep 16 2008 Than Ngo 4.1.1-9 - #461725, revert the patch to fix the regression