rpms/kdelibs4/F-8 kdelibs-4.1.0-kde#167826.patch, NONE, 1.1 kdelibs4.spec, 1.24, 1.25 kdelibs-4.0.98-parallel_devel.patch, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs4/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30212

Modified Files:
	kdelibs4.spec 
Added Files:
	kdelibs-4.1.0-kde#167826.patch 
Removed Files:
	kdelibs-4.0.98-parallel_devel.patch 
Log Message:
* Fri Aug 01 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.0-4
- -devel: Requires: phonon-devel >= 4.2 (helps multilib upgrades)
- konq processes never terminate (kde#167826, rh#457526)


kdelibs-4.1.0-kde#167826.patch:

--- NEW FILE kdelibs-4.1.0-kde#167826.patch ---
--- branches/KDE/4.1/kdelibs/kdecore/kernel/kglobal.cpp	2008/08/01 00:12:03	840376
+++ branches/KDE/4.1/kdelibs/kdecore/kernel/kglobal.cpp	2008/08/01 00:14:54	840377
@@ -251,11 +251,14 @@
 
 /**
  * This counter indicates when to quit the application.
- * It starts at 1, is decremented in KMainWindow when the last window is closed, but
- * is incremented by operations that should outlive the last window closed
- * (e.g. a file copy for a file manager, or 'compacting folders on exit' for a mail client).
+ * It starts at 0, is incremented by KMainWindow, systray icons, running jobs, etc.
+ * and decremented again when those things are destroyed.
+ * This mechanism allows dialogs and jobs to outlive the last window closed
+ * e.g. a file copy for a file manager, or 'compacting folders on exit' for a mail client,
+ * the job progress widget with "keep open" checked, etc.
  */
-static int s_refCount = 1;
+static int s_refCount = 0;
+static bool s_allowQuit = false;
 
 void KGlobal::ref()
 {
@@ -267,9 +270,14 @@
 {
     --s_refCount;
     //kDebug() << "KGlobal::deref() : refCount = " << s_refCount;
-    if (s_refCount <= 0) {
+    if (s_refCount <= 0 && s_allowQuit) {
         QCoreApplication::instance()->quit();
     }
 }
 
+void KGlobal::setAllowQuit(bool allowQuit)
+{
+    s_allowQuit = allowQuit;
+}
+
 #undef PRIVATE_DATA
--- branches/KDE/4.1/kdelibs/kdeui/widgets/kmainwindow.cpp	2008/08/01 00:12:03	840376
+++ branches/KDE/4.1/kdelibs/kdeui/widgets/kmainwindow.cpp	2008/08/01 00:14:54	840377
@@ -226,6 +226,11 @@
 {
     KGlobal::ref();
 
+    // We set allow quit to true, so when the refcounting reaches 0 the application instance will
+    // be exited. This has a similar purpose than setQuitOnLastWindowClosed (from
+    // QApplication), but it honors (de)refing from KGlobal.
+    KGlobal::setAllowQuit(true);
+
     q = _q;
 
     q->setAnimated(KGlobalSettings::graphicEffectsLevel() & KGlobalSettings::SimpleAnimationEffects);


Index: kdelibs4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-8/kdelibs4.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- kdelibs4.spec	31 Jul 2008 01:13:21 -0000	1.24
+++ kdelibs4.spec	1 Aug 2008 13:10:54 -0000	1.25
@@ -2,7 +2,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.1.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -81,7 +81,10 @@
 # (and its followup) (#455130)
 Patch19: kdelibs-4.0.98-revert-kinit-regression.patch
 
-# upstream patches
+## upstream patches
+# konq processes never terminate, 
+# http://bugs.kde.org/167825 , http://bugzilla.redhat.com/457526
+Patch100: kdelibs-4.1.0-kde#167826.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 Requires: qt4 >= %{_qt4_version} 
@@ -117,7 +120,7 @@
 BuildRequires: pcre-devel
 # work around circular dependency from phonon-devel pulling in phonon-backend-xine
 BuildRequires: phonon-backend-gstreamer
-BuildRequires: phonon-devel
+BuildRequires: phonon-devel >= 4.2
 BuildRequires: shared-mime-info
 BuildRequires: soprano-devel >= 2.1
 BuildRequires: strigi-devel >= 0.5.7
@@ -156,7 +159,7 @@
 Requires: automoc
 Requires: qt4-devel
 Requires: openssl-devel
-Requires: phonon-devel
+Requires: phonon-devel >= 4.2
 Requires: strigi-devel
 Requires: bzip2-devel gamin-devel libacl-devel zlib-devel
 %{?x_deps:Requires: %{x_deps}}
@@ -206,7 +209,9 @@
 %patch18 -p1 -b .kstandarddirs
 %patch19 -p0 -b .kinit-regression
 
-# upstream patches
+## upstream patches
+%patch100 -p4 -b .kde#167826
+
 
 %build
 
@@ -367,6 +372,10 @@
 
 
 %changelog
+* Fri Aug 01 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.0-4
+- -devel: Requires: phonon-devel >= 4.2 (helps multilib upgrades)
+- konq processes never terminate (kde#167826, rh#457526)
+
 * Wed Jul 30 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.0-3
 - (Build)Requires: soprano(-devel) >= 2.1 (#456827)
 


--- kdelibs-4.0.98-parallel_devel.patch DELETED ---