[Lsb-messages] /var/www/bzr/lsb/devel/build_env r2144: Hand-hack X11/Intrinsic.h to fix one header order problem.

Jeff Licquia licquia at linuxfoundation.org
Tue Aug 27 01:35:40 UTC 2013


------------------------------------------------------------
revno: 2144
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: build_env
timestamp: Mon 2013-08-26 21:35:40 -0400
message:
  Hand-hack X11/Intrinsic.h to fix one header order problem.
modified:
  headers/HACKS
  headers/X11/Intrinsic.h
  package/Makefile
-------------- next part --------------
=== modified file 'headers/HACKS'
--- a/headers/HACKS	2013-08-19 19:01:12 +0000
+++ b/headers/HACKS	2013-08-27 01:35:40 +0000
@@ -1,2 +1,3 @@
 cups/cups.h
+X11/Intrinsic.h
 X11/ShellP.h

=== modified file 'headers/X11/Intrinsic.h'
--- a/headers/X11/Intrinsic.h	2013-08-27 01:34:32 +0000
+++ b/headers/X11/Intrinsic.h	2013-08-27 01:35:40 +0000
@@ -116,10 +116,12 @@
 #if __LSB_VERSION__ >= 12
     typedef struct _WidgetClassRec *WidgetClass;
 
+/* HACK: move these down
 #include <X11/Shell.h>
 #include <X11/Composite.h>
 #include <X11/Object.h>
 #include <X11/Core.h>
+*/
 #endif				/* __LSB_VERSION__ >= 1.2 */
 
 
@@ -127,6 +129,13 @@
 #if __LSB_VERSION__ >= 12
     typedef struct _TranslationData *XtTranslations;
 
+/* HACK: relocated from just above */
+#include <X11/Shell.h>
+#include <X11/Composite.h>
+#include <X11/Object.h>
+#include <X11/Core.h>
+/* End of HACK */
+
 #include <X11/IntrinsicP.h>
 #include <X11/TranslateI.h>
 #endif				/* __LSB_VERSION__ >= 1.2 */

=== modified file 'package/Makefile'
--- a/package/Makefile	2013-08-24 16:14:13 +0000
+++ b/package/Makefile	2013-08-27 01:35:40 +0000
@@ -42,7 +42,7 @@
 # Should have leading "."
 # a big number (80-99) is leading up to the next minor spec
 # build_env is version-independent so can wait till late to bump this
-SUB_VERSION=.38
+SUB_VERSION=.39
 
 # We define this here instead of directly in the spec file as
 # we need to be able to work out what the produced rpm files will be called



More information about the lsb-messages mailing list