[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-devel
Subject:    [PATCH] compile fix for kdebase/kxkb
From:       Christian Loose <christian.loose () hamburg ! de>
Date:       2002-06-13 2:42:19
[Download RAW message or body]

Hello,

I have KDE CVS HEAD of yesterday and XFree86 v4.0.2 running.
Unfortunately compilation breaks during rules.cpp and extension.cpp (error log 
attached for rules.cpp) in kdebase/kxkb.

The attached patch fixes compilation of rules.cpp and extension.cpp for me.

bye

Christian
["kxkb.patch" (text/x-diff)]

Index: extension.cpp
===================================================================
RCS file: /home/kdecvs/kde/kdebase/kxkb/extension.cpp,v
retrieving revision 1.11
diff -u -r1.11 extension.cpp
--- extension.cpp	11 Jun 2002 00:38:25 -0000	1.11
+++ extension.cpp	13 Jun 2002 02:08:24 -0000
@@ -14,11 +14,12 @@
 
 #include <X11/Xatom.h>
 #include <X11/Xos.h>
+#include <X11/Xlib.h>
 #include <X11/XKBlib.h>
 #include <X11/extensions/XKBfile.h>
 #include <X11/extensions/XKBgeom.h>
 #include <X11/extensions/XKM.h>
-#include <X11/X.h>
+// #include <X11/X.h>
 
 #include "extension.h"
 
Index: rules.cpp
===================================================================
RCS file: /home/kdecvs/kde/kdebase/kxkb/rules.cpp,v
retrieving revision 1.17
diff -u -r1.17 rules.cpp
--- rules.cpp	7 Jun 2002 10:45:12 -0000	1.17
+++ rules.cpp	13 Jun 2002 02:08:25 -0000
@@ -11,8 +11,9 @@
 
 // #include <X11/Xatom.h>
 // #include <X11/Xos.h>
+#include <X11/Xlib.h>
 #include <X11/XKBlib.h>
-#include <X11/X.h>
+// #include <X11/X.h>
 #include <X11/extensions/XKBrules.h>
 
 #include "rules.h"

["errorlog.tgz" (application/x-tgz)]
>> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<

[prev in list] [next in list] [prev in thread] [next in thread]