[kdebase-workspace] gcc47 fix
Rex Dieter
rdieter at fedoraproject.org
Tue Jan 3 21:11:21 UTC 2012
commit 2faf36c4b2e21a52fad1932e3780ca5b494c8ae3
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Tue Jan 3 15:11:12 2012 -0600
gcc47 fix
kde-workspace-4.7.95-gcc47.patch | 11 +++++++++++
kdebase-workspace.spec | 5 +++++
2 files changed, 16 insertions(+), 0 deletions(-)
---
diff --git a/kde-workspace-4.7.95-gcc47.patch b/kde-workspace-4.7.95-gcc47.patch
new file mode 100644
index 0000000..7be5dd4
--- /dev/null
+++ b/kde-workspace-4.7.95-gcc47.patch
@@ -0,0 +1,11 @@
+diff -up kde-workspace-4.7.95/ksplash/ksplashqml/main.cpp.gcc47 kde-workspace-4.7.95/ksplash/ksplashqml/main.cpp
+--- kde-workspace-4.7.95/ksplash/ksplashqml/main.cpp.gcc47 2011-12-20 18:40:36.000000000 -0600
++++ kde-workspace-4.7.95/ksplash/ksplashqml/main.cpp 2012-01-03 15:09:37.254323288 -0600
+@@ -20,6 +20,7 @@
+ #include "SplashApp.h"
+
+ #include <iostream>
++#include <unistd.h>
+ #include <X11/Xlib.h>
+
+ int main(int argc, char **argv)
diff --git a/kdebase-workspace.spec b/kdebase-workspace.spec
index bba4803..4bc6dfb 100644
--- a/kdebase-workspace.spec
+++ b/kdebase-workspace.spec
@@ -80,6 +80,9 @@ Patch52: kde-workspace-4.7.80-bz#732830-login.patch
# http://bugs.kde.org/242065
Patch53: kde-workspace-4.7.95-kdm_xauth.patch
+# gcc47 fixes (missing headers mostly)
+Patch54: kde-workspace-4.7.95-gcc47.patch
+
## upstream patches
# omit MALLOC_CHECK_ from startkde
Patch100: kde-workspace-4.7.95-no_malloc_check.patch
@@ -394,6 +397,7 @@ Requires: akonadi
%patch50 -p1 -b .kde#171685
%patch52 -p1 -b .bz#732830-login
%patch53 -p1 -b .kdm_xauth
+%patch54 -p1 -b .gcc47
# upstream patches
%patch100 -p1 -b .no_malloc_check
@@ -920,6 +924,7 @@ fi
%changelog
* Tue Jan 03 2012 Rex Dieter <rdieter at fedoraproject.org> 4.7.95-3
- kdm overwrites ~/.Xauthority with wrong SELinux context on logout (#567914,kde#242065)
+- gcc47 fixes
* Thu Dec 29 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.95-2
- startkde: omit MALLOC_CHECK_ debug'ery
More information about the scm-commits
mailing list