- apply upstream patch to fix klauncher crash
- fix kconfig_sync_crash patch
This commit is contained in:
parent
7dc464653b
commit
805b4090eb
|
@ -1,5 +1,6 @@
|
||||||
--- kdelibs/kdecore/kernel/kglobal.cpp 2008/01/04 09:09:11 757128
|
diff -up kdelibs-4.0.3/kdecore/kernel/kglobal.cpp.kconfig_sync_crash kdelibs-4.0.3/kdecore/kernel/kglobal.cpp
|
||||||
+++ kdelibs/kdecore/kernel/kglobal.cpp 2008/04/04 08:48:53 793504
|
--- 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 @@
|
@@ -28,6 +28,12 @@
|
||||||
#include "kglobal.h"
|
#include "kglobal.h"
|
||||||
#include "kglobal_p.h"
|
#include "kglobal_p.h"
|
||||||
|
@ -29,7 +30,7 @@
|
||||||
|
|
||||||
class KGlobalPrivate
|
class KGlobalPrivate
|
||||||
{
|
{
|
||||||
@@ -64,6 +72,10 @@
|
@@ -64,6 +72,10 @@ class KGlobalPrivate
|
||||||
locale(0),
|
locale(0),
|
||||||
charsets(0)
|
charsets(0)
|
||||||
{
|
{
|
||||||
|
@ -40,7 +41,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
inline ~KGlobalPrivate()
|
inline ~KGlobalPrivate()
|
||||||
@@ -151,6 +163,12 @@
|
@@ -151,6 +163,12 @@ KCharsets *KGlobal::charsets()
|
||||||
return d->charsets;
|
return d->charsets;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -53,3 +54,28 @@
|
||||||
KComponentData KGlobal::activeComponent()
|
KComponentData KGlobal::activeComponent()
|
||||||
{
|
{
|
||||||
PRIVATE_DATA;
|
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:
|
||||||
|
|
|
@ -368,6 +368,7 @@ rm -rf %{buildroot}
|
||||||
%changelog
|
%changelog
|
||||||
* Fri Apr 04 2008 Than Ngo <than@redhat.com> - 4.0.3-6
|
* Fri Apr 04 2008 Than Ngo <than@redhat.com> - 4.0.3-6
|
||||||
- apply upstream patch to fix klauncher crash
|
- apply upstream patch to fix klauncher crash
|
||||||
|
- fix kconfig_sync_crash patch
|
||||||
|
|
||||||
* Fri Apr 4 2008 Rex Dieter <rdieter@fedoraproject.org> 4.0.3-5
|
* Fri Apr 4 2008 Rex Dieter <rdieter@fedoraproject.org> 4.0.3-5
|
||||||
- kconfig_sync_crash patch
|
- kconfig_sync_crash patch
|
||||||
|
|
Loading…
Reference in New Issue