rpms/kdelibs/devel kdelibs-4.1.1-kde#858795-mimeassoc.patch, NONE, 1.1 kdelibs-4.1.1-kde#860005-emoticons.patch, NONE, 1.1 kdelibs-4.1.1-kde#860095-khtml-scroll-crash.patch, NONE, 1.1 kdelibs-4.1.1-kdelibs-4.1.1-kde#170461-khtml-regression.patch, NONE, 1.1 kdelibs.spec, 1.377, 1.378 kdelibs-4.1.1-bz#461725-regression.patch, 1.1, NONE
Than Ngo
than at fedoraproject.org
Thu Sep 18 14:40:10 UTC 2008
Author: than
Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22405
Modified Files:
kdelibs.spec
Added Files:
kdelibs-4.1.1-kde#858795-mimeassoc.patch
kdelibs-4.1.1-kde#860005-emoticons.patch
kdelibs-4.1.1-kde#860095-khtml-scroll-crash.patch
kdelibs-4.1.1-kdelibs-4.1.1-kde#170461-khtml-regression.patch
Removed Files:
kdelibs-4.1.1-bz#461725-regression.patch
Log Message:
- apply upstream patch to fix the regression
- drop the kdelibs-4.1.1-bz#461725-regression.patch
kdelibs-4.1.1-kde#858795-mimeassoc.patch:
--- NEW FILE kdelibs-4.1.1-kde#858795-mimeassoc.patch ---
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;
}
kdelibs-4.1.1-kde#860005-emoticons.patch:
--- NEW FILE kdelibs-4.1.1-kde#860005-emoticons.patch ---
Index: kutils/kemoticons/kemoticonstheme.cpp
===================================================================
--- kutils/kemoticons/kemoticonstheme.cpp (revision 860004)
+++ kutils/kemoticons/kemoticonstheme.cpp (revision 860005)
@@ -161,6 +161,9 @@
QString KEmoticonsTheme::parseEmoticons(const QString &text, ParseMode mode, const QStringList &exclude) const
{
QList<Token> tokens = tokenize(text, mode | SkipHTML);
+ if (tokens.isEmpty() && !text.isEmpty())
+ return text;
+
QString result;
foreach(const Token &token , tokens) {
kdelibs-4.1.1-kde#860095-khtml-scroll-crash.patch:
--- NEW FILE kdelibs-4.1.1-kde#860095-khtml-scroll-crash.patch ---
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()
kdelibs-4.1.1-kdelibs-4.1.1-kde#170461-khtml-regression.patch:
--- NEW FILE kdelibs-4.1.1-kdelibs-4.1.1-kde#170461-khtml-regression.patch ---
Index: khtml/ecma/kjs_proxy.h
===================================================================
--- khtml/ecma/kjs_proxy.h (Revision 854182)
+++ khtml/ecma/kjs_proxy.h (Revision 854183)
@@ -62,6 +62,7 @@
virtual KJS::Interpreter *interpreter() = 0;
virtual void setDebugEnabled(bool enabled) = 0;
+ virtual bool debugEnabled() const = 0;
virtual void showDebugWindow(bool show=true) = 0;
virtual bool paused() const = 0;
virtual void dataReceived() = 0;
Index: khtml/ecma/kjs_events.cpp
===================================================================
--- khtml/ecma/kjs_events.cpp (Revision 854182)
+++ khtml/ecma/kjs_events.cpp (Revision 854183)
@@ -62,18 +62,18 @@
void JSEventListener::handleEvent(DOM::Event &evt)
{
-#ifdef KJS_DEBUGGER
- //### This is the wrong place to do this --- we need
- // a more global/general stategy to prevent unwanted event loop recursion issues.
- if (DebugWindow::window() && DebugWindow::window()->inSession())
- return;
-#endif
KHTMLPart *part = qobject_cast<KHTMLPart*>(static_cast<Window*>(win.get())->part());
KJSProxy *proxy = 0L;
if (part)
proxy = part->jScript();
if (proxy && listener && listener->implementsCall()) {
+#ifdef KJS_DEBUGGER
+ //### This is the wrong place to do this --- we need
+ // a more global/general stategy to prevent unwanted event loop recursion issues.
+ if (proxy->debugEnabled() && DebugWindow::window()->inSession())
+ return;
+#endif
ref();
KJS::ScriptInterpreter *interpreter = static_cast<KJS::ScriptInterpreter *>(proxy->interpreter());
Index: khtml/ecma/kjs_proxy.cpp
===================================================================
--- khtml/ecma/kjs_proxy.cpp (Revision 854182)
+++ khtml/ecma/kjs_proxy.cpp (Revision 854183)
@@ -60,6 +60,7 @@
virtual KJS::Interpreter *interpreter();
virtual void setDebugEnabled(bool enabled);
+ virtual bool debugEnabled() const;
virtual void showDebugWindow(bool show=true);
virtual bool paused() const;
virtual void dataReceived();
@@ -279,6 +280,15 @@
#endif
}
+bool KJSProxyImpl::debugEnabled() const
+{
+#ifdef KJS_DEBUGGER
+ return m_debugEnabled;
+#else
+ return false;
+#endif
+}
+
void KJSProxyImpl::showDebugWindow(bool /*show*/)
{
#ifdef KJS_DEBUGGER
Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.377
retrieving revision 1.378
diff -u -r1.377 -r1.378
--- kdelibs.spec 17 Sep 2008 09:45:29 -0000 1.377
+++ kdelibs.spec 18 Sep 2008 14:39:40 -0000 1.378
@@ -2,7 +2,7 @@
Summary: K Desktop Environment 4 - Libraries
Version: 4.1.1
-Release: 9%{?dist}
+Release: 11%{?dist}
%if 0%{?fedora} > 8
Name: kdelibs
@@ -78,7 +78,6 @@
# fix running commands in kglobalconfig before KComponentData init (#455130)
Patch19: kdelibs-4.1.0-#455130.patch
Patch20: kdelibs-4.1.1-cmake.patch
-Patch21: kdelibs-4.1.1-bz#461725-regression.patch
## upstream patches
Patch100: kdelibs-4.1.1-kde#169447-khtml-regression.patch
@@ -86,6 +85,10 @@
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
+Patch107: kdelibs-4.1.1-kde#860005-emoticons.patch
+Patch108: kdelibs-4.1.1-kdelibs-4.1.1-kde#170461-khtml-regression.patch
BuildRequires: qt4-devel >= 4.4.0
Requires: qt4 >= %{_qt4_version}
@@ -210,7 +213,6 @@
%patch18 -p1 -b .kstandarddirs
%patch19 -p1 -b .#455130
%patch20 -p1 -b .cmake
-%patch21 -p0 -b .bz#461725-regression
## upstream patches
%patch100 -p0 -b .kde#169447-khtml-regression
@@ -218,6 +220,10 @@
%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
+%patch107 -p0 -b .kde#860005-emoticons
+%patch108 -p0 -b .kde#170461-khtml-regression
%build
@@ -378,6 +384,18 @@
%changelog
+* Thu Sep 18 2008 Than Ngo <than at redhat.com> 4.1.1-11
+- apply upstream patch to fix the regression
+- drop the kdelibs-4.1.1-bz#461725-regression.patch
+
+* Thu Sep 18 2008 Lukáš Tinkl <ltinkl at redhat.com> 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)
+- Don't eat text when the emoticons were not installed. This fixes
+ mail text not being displayed in KMail when kdebase-runtime wasn't
+ installed.
+
* Wed Sep 17 2008 Than Ngo <than at redhat.com> 4.1.1-9
- #461725, revert the patch to fix the regression
--- kdelibs-4.1.1-bz#461725-regression.patch DELETED ---
More information about the fedora-extras-commits
mailing list