rpms/kdelibs/devel kdelibs-4.0.3-kconfig_sync_crash.patch, 1.2, 1.3 kdelibs.spec, 1.305, 1.306

[Than Ngo (than)]

Author: than

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32193

Modified Files:
	kdelibs-4.0.3-kconfig_sync_crash.patch kdelibs.spec 
Log Message:
- apply upstream patch to fix klauncher crash
- fix kconfig_sync_crash patch


kdelibs-4.0.3-kconfig_sync_crash.patch:

Index: kdelibs-4.0.3-kconfig_sync_crash.patch
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs-4.0.3-kconfig_sync_crash.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdelibs-4.0.3-kconfig_sync_crash.patch	4 Apr 2008 12:33:41 -0000	1.2
+++ kdelibs-4.0.3-kconfig_sync_crash.patch	4 Apr 2008 13:23:32 -0000	1.3
@@ -1,5 +1,6 @@
---- kdelibs/kdecore/kernel/kglobal.cpp	2008/01/04 09:09:11	757128
-+++ kdelibs/kdecore/kernel/kglobal.cpp	2008/04/04 08:48:53	793504
+diff -up kdelibs-4.0.3/kdecore/kernel/kglobal.cpp.kconfig_sync_crash kdelibs-4.0.3/kdecore/kernel/kglobal.cpp
+--- kdelibs-4.0.3/kdecore/kernel/kglobal.cpp.kconfig_sync_crash	2008-03-27 21:27:35.000000000 +0100
++++ kdelibs-4.0.3/kdecore/kernel/kglobal.cpp	2008-04-04 14:49:03.000000000 +0200
 @@ -28,6 +28,12 @@
  #include "kglobal.h"
  #include "kglobal_p.h"
@@ -29,7 +30,7 @@
  
  class KGlobalPrivate
  {
-@@ -64,6 +72,10 @@
+@@ -64,6 +72,10 @@ class KGlobalPrivate
              locale(0),
              charsets(0)
          {
@@ -40,7 +41,7 @@
          }
  
          inline ~KGlobalPrivate()
-@@ -151,6 +163,12 @@
+@@ -151,6 +163,12 @@ KCharsets *KGlobal::charsets()
      return d->charsets;
  }
  
@@ -53,3 +54,28 @@
  KComponentData KGlobal::activeComponent()
  {
      PRIVATE_DATA;
+diff -up kdelibs-4.0.3/kdecore/kernel/kglobal.h.kconfig_sync_crash kdelibs-4.0.3/kdecore/kernel/kglobal.h
+--- kdelibs-4.0.3/kdecore/kernel/kglobal.h.kconfig_sync_crash	2008-04-04 15:16:45.000000000 +0200
++++ kdelibs-4.0.3/kdecore/kernel/kglobal.h	2008-04-04 15:19:49.000000000 +0200
+@@ -21,7 +21,7 @@
+ 
+ #include <kdecore_export.h>
+ #include <QtCore/QAtomicPointer>
+-
++#include <sys/types.h>
+ //
+ // WARNING!!
+ // This code uses undocumented Qt API
+@@ -354,6 +354,12 @@ namespace KGlobal
+     KDECORE_EXPORT KCharsets *charsets();
+ 
+     /**
++     * Returns the umask of the process.
++     * @return the umask of the process
++     */
++    KDECORE_EXPORT mode_t umask();
++
++    /**
+      * Creates a static QString.
+      *
+      * To be used inside functions(!) like:


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -r1.305 -r1.306
--- kdelibs.spec	4 Apr 2008 12:33:41 -0000	1.305
+++ kdelibs.spec	4 Apr 2008 13:23:32 -0000	1.306
@@ -368,6 +368,7 @@
 %changelog
 * Fri Apr 04 2008 Than Ngo <than at redhat.com> -  4.0.3-6
 - apply upstream patch to fix klauncher crash
+- fix kconfig_sync_crash patch
 
 * Fri Apr  4 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.3-5
 - kconfig_sync_crash patch