rpms/kdelibs4/F-8 kdelibs-4.1.1-bz#461725-regression.patch, NONE, 1.1 kdelibs-4.1.1-cmake.patch, NONE, 1.1 kdelibs-4.1.1-kdeui-widgets-fixes.patch, 1.1, 1.2 kdelibs4.spec, 1.34, 1.35

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs4/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9559/F-8

Modified Files:
	kdelibs-4.1.1-kdeui-widgets-fixes.patch kdelibs4.spec 
Added Files:
	kdelibs-4.1.1-bz#461725-regression.patch 
	kdelibs-4.1.1-cmake.patch 
Log Message:
Sync from kdelibs/F-9:

* Tue Sep 16 2008 Than Ngo <than at redhat.com> 4.1.1-9
- #461725, revert the patch to fix the regression

* Sat Sep 13 2008 Than Ngo <than at redhat.com> 4.1.1-8
- fix kdelibs-4.1.1-kdeui-widgets-fixes.patch

* Sat Sep 13 2008 Than Ngo <than at redhat.com> 4.1.1-7
- fix install problem with cmake > 2.5

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

--- NEW FILE kdelibs-4.1.1-bz#461725-regression.patch ---
Index: khtml/khtml_part.cpp
===================================================================
--- khtml/khtml_part.cpp	(Revision 852920)
+++ khtml/khtml_part.cpp	(Revision 852919)
@@ -1080,7 +1080,8 @@
   if ( !d->m_frame->m_jscript )
     if (!createJScript(d->m_frame))
       return 0;
-   d->m_frame->m_jscript->setDebugEnabled(d->m_bJScriptDebugEnabled);
+  if (d->m_bJScriptDebugEnabled)
+    d->m_frame->m_jscript->setDebugEnabled(true);
 
   return d->m_frame->m_jscript;
 }
Index: khtml/ecma/debugger/debugwindow.cpp
===================================================================
--- khtml/ecma/debugger/debugwindow.cpp	(Revision 852920)
+++ khtml/ecma/debugger/debugwindow.cpp	(Revision 852919)
@@ -91,12 +91,23 @@
 using namespace KJSDebugger;
 
 DebugWindow* DebugWindow::s_debugger = 0;
+DebugWindow *DebugWindow::createInstance()
+{
+    Q_ASSERT(!s_debugger);
+    s_debugger = new DebugWindow();
+    return s_debugger;
+}
 
+void DebugWindow::destroyInstance()
+{
+    Q_ASSERT(s_debugger);
+    Q_ASSERT(s_debugger->m_activeSessionCtxs.isEmpty());
+    s_debugger->hide();
+    delete s_debugger;
+}
+
 DebugWindow * DebugWindow::window()
 {
-    if (!s_debugger)
-        s_debugger = new DebugWindow();
-
     return s_debugger;
 }
 
@@ -365,8 +376,6 @@
     assert(m_docsForIntrp.isEmpty());
     assert(m_docForSid.isEmpty());
     assert(m_docForIUKey.isEmpty());
-    assert(m_activeSessionCtxs.isEmpty());
-    s_debugger = 0;
 }
 
 void DebugWindow::closeEvent(QCloseEvent* event)
Index: khtml/ecma/debugger/debugwindow.h
===================================================================
--- khtml/ecma/debugger/debugwindow.h	(Revision 852920)
+++ khtml/ecma/debugger/debugwindow.h	(Revision 852919)
@@ -39,7 +39,6 @@
 #include "khtml_pagecache.h"
 #include "khtml_part.h"
 #include "dom/dom_misc.h"
-#include "misc/shared.h"
 
 #include <QStack>
 #include <QVector>
@@ -72,8 +71,7 @@
 *
 * There is only one debug window per program. This can be obtained by calling #instance
 */
-class DebugWindow : public KXmlGuiWindow, public KJS::Debugger, public KComponentData,
-                    public khtml::Shared<DebugWindow>
+class DebugWindow : public KXmlGuiWindow, public KJS::Debugger, public KComponentData
 {
     Q_OBJECT
 
@@ -81,6 +79,8 @@
     DebugWindow(QWidget *parent = 0);
     virtual ~DebugWindow();
 
+    static DebugWindow *createInstance();
+    static void destroyInstance();
     static DebugWindow *window();
 
     // Returns true if the debugger is active, and has blocked the execution
Index: khtml/ecma/kjs_proxy.cpp
===================================================================
--- khtml/ecma/kjs_proxy.cpp	(Revision 852920)
+++ khtml/ecma/kjs_proxy.cpp	(Revision 852919)
@@ -66,9 +66,9 @@
 
   void initScript();
   void applyUserAgent();
+
 private:
   KJS::ScriptInterpreter* m_script;
-  WTF::RefPtr<DebugWindow> m_debugWindow;
   bool m_debugEnabled;
 #ifndef NDEBUG
   static int s_count;
@@ -141,8 +141,8 @@
 #ifdef KJS_DEBUGGER
     if (inlineCode)
         filename = "(unknown file)";
-    if (m_debugWindow)
-        m_debugWindow->attach(m_script);
+    if (DebugWindow::window())
+        DebugWindow::window()->attach(m_script);
 #else
     Q_UNUSED(baseLine);
 #endif
@@ -202,8 +202,9 @@
   // (we used to delete and re-create it, previously)
     if (m_script) {
 #ifdef KJS_DEBUGGER
-        if (m_debugWindow)
-            m_debugWindow->clearInterpreter(m_script);
+        DebugWindow *debugWin = DebugWindow::window();
+        if (debugWin)
+            debugWin->clearInterpreter(m_script);
 #endif
         m_script->clear();
 
@@ -224,14 +225,6 @@
 	    ;
     JSLock::unlock();
   }
-
-#ifdef KJS_DEBUGGER
-  // Detach from debugging entirely if it's been turned off.
-  if (m_debugWindow && !m_debugEnabled) {
-    m_debugWindow->detach(m_script);
-    m_debugWindow = 0;
-  }
-#endif
 }
 
 DOM::EventListener *KJSProxyImpl::createHTMLEventHandler(QString sourceUrl, QString name, QString code, DOM::NodeImpl *node)
@@ -239,8 +232,8 @@
   initScript();
 
 #ifdef KJS_DEBUGGER
-    if (m_debugWindow)
-        m_debugWindow->attach(m_script);
+    if (DebugWindow::window())
+        DebugWindow::window()->attach(m_script);
 #else
     Q_UNUSED(sourceUrl);
 #endif
@@ -269,21 +262,30 @@
 {
 #ifdef KJS_DEBUGGER
   m_debugEnabled = enabled;
-
-  // Note that we attach to the debugger only before
-  // running a script. Detaches/disabling are done between
-  // documents, at clear. Both are done so the debugger
-  // see the entire session
-  if (enabled)
-    m_debugWindow = DebugWindow::window();
+  //if (m_script)
+  //    m_script->setDebuggingEnabled(enabled);
+  // NOTE: this is consistent across all KJSProxyImpl instances, as we only
+  // ever have 1 debug window
+    if (!enabled && DebugWindow::window())
+    {
+        DebugWindow::destroyInstance();
+    }
+    else if (enabled && !DebugWindow::window())
+    {
+        DebugWindow::createInstance();
+        initScript();
+        DebugWindow::window()->attach(m_script);
+    }
+#else
+    Q_UNUSED(enabled);
 #endif
 }
 
 void KJSProxyImpl::showDebugWindow(bool /*show*/)
 {
 #ifdef KJS_DEBUGGER
-    if (m_debugWindow)
-        m_debugWindow->show();
+    if (DebugWindow::window())
+        DebugWindow::window()->show();
 #else
     //Q_UNUSED(show);
 #endif

kdelibs-4.1.1-cmake.patch:

--- NEW FILE kdelibs-4.1.1-cmake.patch ---
diff -up kdelibs-4.1.1/cmake/modules/FindKDE4Internal.cmake.orig kdelibs-4.1.1/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-4.1.1/cmake/modules/FindKDE4Internal.cmake.orig	2008-09-12 23:54:36.000000000 +0200
+++ kdelibs-4.1.1/cmake/modules/FindKDE4Internal.cmake	2008-09-13 00:02:50.000000000 +0200
@@ -745,6 +745,7 @@ endif(WIN32)
 # CMake generators if no build type is set.
 if (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
    set(CMAKE_BUILD_TYPE RelWithDebInfo)
+   set(CMAKE_CONFIGURATION_TYPES ${CMAKE_BUILD_TYPE})
 endif (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
 
 
@@ -953,10 +954,6 @@ endif(MSVC)
 
 
 if (CMAKE_COMPILER_IS_GNUCXX)
-   if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.5)
-      set (CMAKE_CONFIGURATION_TYPES ${CMAKE_CONFIGURATION_TYPES} "Debugfull")
-   endif("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.5)
-
    set (KDE4_ENABLE_EXCEPTIONS -fexceptions)
    # Select flags.
    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
@@ -1063,11 +1060,6 @@ endif (CMAKE_COMPILER_IS_GNUCXX)
 
 
 if (CMAKE_C_COMPILER MATCHES "icc")
-
-   if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.5)
-      set (CMAKE_CONFIGURATION_TYPES ${CMAKE_CONFIGURATION_TYPES} "Debugfull")
-   endif("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.5)
-
    set (KDE4_ENABLE_EXCEPTIONS -fexceptions)
    # Select flags.
    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")

kdelibs-4.1.1-kdeui-widgets-fixes.patch:

Index: kdelibs-4.1.1-kdeui-widgets-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-8/kdelibs-4.1.1-kdeui-widgets-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdelibs-4.1.1-kdeui-widgets-fixes.patch	12 Sep 2008 20:35:41 -0000	1.1
+++ kdelibs-4.1.1-kdeui-widgets-fixes.patch	16 Sep 2008 21:51:15 -0000	1.2
@@ -71,10 +71,11 @@
 +      d->mMenu->addAction(d->mWhatsThisAction);
        need_separator = true;
      }
+
 Index: kdeui/widgets/ktabwidget.cpp
 ===================================================================
---- kdeui/widgets/ktabwidget.cpp	(revision 858490)
-+++ kdeui/widgets/ktabwidget.cpp	(revision 858491)
+--- kdeui/widgets/ktabwidget.cpp	(Revision 858490)
++++ kdeui/widgets/ktabwidget.cpp	(Revision 858491)
 @@ -281,14 +281,22 @@
  
  QString KTabWidget::tabText( int index ) const
@@ -107,8 +108,8 @@
  void KTabWidget::setTabText( int index, const QString &text )
 Index: kdeui/widgets/ktabwidget.h
 ===================================================================
---- kdeui/widgets/ktabwidget.h	(revision 858490)
-+++ kdeui/widgets/ktabwidget.h	(revision 858491)
+--- kdeui/widgets/ktabwidget.h	(Revision 858490)
++++ kdeui/widgets/ktabwidget.h	(Revision 858491)
 @@ -187,7 +187,7 @@
       * Removes the widget, reimplemented for
       * internal reasons (keeping labels in sync).


Index: kdelibs4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-8/kdelibs4.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- kdelibs4.spec	12 Sep 2008 20:35:41 -0000	1.34
+++ kdelibs4.spec	16 Sep 2008 21:51:15 -0000	1.35
@@ -2,7 +2,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.1.1
-Release: 6%{?dist}
+Release: 9%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -79,6 +79,8 @@
 Patch18: kdelibs-4.1.0-kstandarddirs.patch
 # 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
@@ -210,6 +212,8 @@
 %patch14 -p1 -b .libexecdir
 %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
@@ -377,6 +381,15 @@
 
 
 %changelog
+* Tue Sep 16 2008 Than Ngo <than at redhat.com> 4.1.1-9
+- #461725, revert the patch to fix the regression
+
+* Sat Sep 13 2008 Than Ngo <than at redhat.com> 4.1.1-8
+- fix kdelibs-4.1.1-kdeui-widgets-fixes.patch
+
+* Sat Sep 13 2008 Than Ngo <than at redhat.com> 4.1.1-7
+- fix install problem with cmake > 2.5
+
 * Mon Sep 08 2008 Lukáš Tinkl <ltinkl at redhat.com> 4.1.1-6
 - fix crashes in plugin selector
 - fix problems in various kdeui widgets