Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 258072 Details for
Bug 349617
Failed to emerge kde-base/systemsettings-4.5.5 with USE=kdeenablefinal
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
use #include <fixx11h.h> to clean up the namespace after including x11 headers
kdebase-workspace-4.5.4-cleanup_after_X11_includes-1.diff (text/plain), 2.61 KB, created by
Erik
on 2010-12-26 00:39:59 UTC
(
hide
)
Description:
use #include <fixx11h.h> to clean up the namespace after including x11 headers
Filename:
MIME Type:
Creator:
Erik
Created:
2010-12-26 00:39:59 UTC
Size:
2.61 KB
patch
obsolete
>diff -ru kdebase-workspace-4.5.4/kcontrol/fonts/fonts.cpp.orig kdebase-workspace-4.5.4/kcontrol/fonts/fonts.cpp >--- kdebase-workspace-4.5.4/kcontrol/fonts/fonts.cpp.orig 2010-05-27 19:23:07.000000000 +0200 >+++ kdebase-workspace-4.5.4/kcontrol/fonts/fonts.cpp 2010-12-25 22:25:54.920000108 +0100 >@@ -51,14 +51,10 @@ > #endif > > #include <X11/Xlib.h> >+#include <fixx11h.h> > > #include <KPluginFactory> > >-// X11 headers >-#undef Bool >-#undef Unsorted >-#undef None >- > static const char * const aa_rgb_xpm[]={ > "12 12 3 1", > "a c #0000ff", >diff -ru kdebase-workspace-4.5.4/kcontrol/kdm/background/bgsettings.cpp.orig kdebase-workspace-4.5.4/kcontrol/kdm/background/bgsettings.cpp >--- kdebase-workspace-4.5.4/kcontrol/kdm/background/bgsettings.cpp.orig 2010-05-27 19:23:09.000000000 +0200 >+++ kdebase-workspace-4.5.4/kcontrol/kdm/background/bgsettings.cpp 2010-12-25 22:27:54.012000108 +0100 >@@ -12,9 +12,6 @@ > #include <time.h> > #include <stdlib.h> > #include <unistd.h> >-// Clean up after X.h/Xlib.h >-#undef Bool >-#undef Unsorted > > #include <QDir> > #include <QPixmap> >diff -ru kdebase-workspace-4.5.4/kcontrol/keyboard/x11_helper.cpp.orig kdebase-workspace-4.5.4/kcontrol/keyboard/x11_helper.cpp >--- kdebase-workspace-4.5.4/kcontrol/keyboard/x11_helper.cpp.orig 2010-09-30 23:20:14.000000000 +0200 >+++ kdebase-workspace-4.5.4/kcontrol/keyboard/x11_helper.cpp 2010-12-25 22:26:33.202000109 +0100 >@@ -27,6 +27,7 @@ > #include <X11/Xatom.h> > #include <X11/XKBlib.h> > #include <X11/extensions/XKBrules.h> >+#include <fixx11h.h> > > > // more information about the limit https://bugs.freedesktop.org/show_bug.cgi?id=19501 >diff -ru kdebase-workspace-4.5.4/kcontrol/keyboard/xinput_helper.cpp.orig kdebase-workspace-4.5.4/kcontrol/keyboard/xinput_helper.cpp >--- kdebase-workspace-4.5.4/kcontrol/keyboard/xinput_helper.cpp.orig 2010-09-30 23:20:14.000000000 +0200 >+++ kdebase-workspace-4.5.4/kcontrol/keyboard/xinput_helper.cpp 2010-12-25 22:26:23.342000109 +0100 >@@ -31,6 +31,8 @@ > #include <X11/extensions/XInput.h> > #endif > >+#include <fixx11h.h> >+ > #include "x11_helper.h" > > >diff -ru kdebase-workspace-4.5.4/kcontrol/krdb/krdb.cpp.orig kdebase-workspace-4.5.4/kcontrol/krdb/krdb.cpp >--- kdebase-workspace-4.5.4/kcontrol/krdb/krdb.cpp.orig 2009-11-21 10:44:21.000000000 +0100 >+++ kdebase-workspace-4.5.4/kcontrol/krdb/krdb.cpp 2010-12-25 22:29:49.390000107 +0100 >@@ -21,7 +21,6 @@ > #include <string.h> > #include <unistd.h> > >-#undef Unsorted > #include <QBuffer> > #include <QDir> > #include <QtCore/QSettings> >@@ -51,6 +50,7 @@ > #include "krdb.h" > #ifdef Q_WS_X11 > #include <X11/Xlib.h> >+#include <fixx11h.h> > #include <QX11Info> > #endif > inline const char * gtkEnvVar(int version)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 349617
:
258006
| 258072