no-bitmaps-icon

Disable X11/bitmaps/icon.h inclusion (closes: #489127)

Gbp-Pq: Name no-bitmaps-icon.patch

diff --git a/ros/inc/InterfaceGraphic_X11.hxx b/ros/inc/InterfaceGraphic_X11.hxx
index 2c79555098b87b049b54011f6d905812728e866e..dc0446071cf431c1d1cd41848374a598f5253d4a 100644 (file)
--- a/ros/inc/InterfaceGraphic_X11.hxx
+++ b/ros/inc/InterfaceGraphic_X11.hxx
@@ -27,6 +27,7 @@ Facility : CAS-CADE V1
 #  include <X11/Xatom.h>
 #  include <GL/glx.h>
 
+#if 0
 #  if defined (sun) || defined (SUNOS) || defined (__alpha) || defined (DECOSF1) || defined (sgi) || defined (IRIX) || defined (__hpux)|| defined (HPUX) 
 #   ifndef icon_width
 #    include <X11/bitmaps/icon>
@@ -47,6 +48,7 @@ static unsigned char icon_bits[] = {
 #   endif
 
 #  endif /* ULTRIX */
+#endif
 #  define WINDOW     Window
 #  define DISPLAY    Display
 #  define GLCONTEXT  GLXContext

diff --git a/ros/src/InterfaceGraphic/InterfaceGraphic_X11.hxx b/ros/src/InterfaceGraphic/InterfaceGraphic_X11.hxx
index 2c79555098b87b049b54011f6d905812728e866e..dc0446071cf431c1d1cd41848374a598f5253d4a 100644 (file)
--- a/ros/src/InterfaceGraphic/InterfaceGraphic_X11.hxx
+++ b/ros/src/InterfaceGraphic/InterfaceGraphic_X11.hxx
@@ -27,6 +27,7 @@ Facility : CAS-CADE V1
 #  include <X11/Xatom.h>
 #  include <GL/glx.h>
 
+#if 0
 #  if defined (sun) || defined (SUNOS) || defined (__alpha) || defined (DECOSF1) || defined (sgi) || defined (IRIX) || defined (__hpux)|| defined (HPUX) 
 #   ifndef icon_width
 #    include <X11/bitmaps/icon>
@@ -47,6 +48,7 @@ static unsigned char icon_bits[] = {
 #   endif
 
 #  endif /* ULTRIX */
+#endif
 #  define WINDOW     Window
 #  define DISPLAY    Display
 #  define GLCONTEXT  GLXContext