rpms/kdelibs/F-9 kdelibs-4.1.1-kdelibs-4.1.1-kde#170461-khtml-regression.patch, NONE, 1.1 kdelibs.spec, 1.353, 1.354 kdelibs-4.1.1-bz#461725-regression.patch, 1.1, NONE

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdelibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21383

Modified Files:
	kdelibs.spec 
Added Files:
	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 khtm regression
- drop the kdelibs-4.1.1-bz#461725-regression.patch


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/F-9/kdelibs.spec,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -r1.353 -r1.354
--- kdelibs.spec	18 Sep 2008 12:32:58 -0000	1.353
+++ kdelibs.spec	18 Sep 2008 14:33:43 -0000	1.354
@@ -2,7 +2,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.1.1
-Release: 10%{?dist}
+Release: 11%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -80,7 +80,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
@@ -91,6 +90,7 @@
 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} 
@@ -216,7 +216,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
@@ -227,6 +226,7 @@
 %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
 
@@ -387,6 +387,10 @@
 
 
 %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.


--- kdelibs-4.1.1-bz#461725-regression.patch DELETED ---