[med-svn] r4819 - trunk/packages/dicom3tools/trunk/debian/patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2010-05-23 12:47:54 +0000 (Sun, 23 May 2010)
New Revision: 4819

Added:
   trunk/packages/dicom3tools/trunk/debian/patches/ourdisp_xinclude.patch
Modified:
   trunk/packages/dicom3tools/trunk/debian/patches/series
Log:
Fix X11 extension compilation

Added: trunk/packages/dicom3tools/trunk/debian/patches/ourdisp_xinclude.patch
===================================================================
--- trunk/packages/dicom3tools/trunk/debian/patches/ourdisp_xinclude.patch	                        (rev 0)
+++ trunk/packages/dicom3tools/trunk/debian/patches/ourdisp_xinclude.patch	2010-05-23 12:47:54 UTC (rev 4819)
@@ -0,0 +1,13 @@
+For some reason the include path contains -I/usr/include/X11, but C++ files
+needs -I/usr/include
+
+--- dicom3tools-1.0~20081122.orig/config/Project.p-tmpl.orig	2010-05-23 14:45:13.000000000 +0200
++++ dicom3tools-1.0~20081122/config/Project.p-tmpl	2010-05-23 14:46:16.000000000 +0200
+@@ -134,6 +134,7 @@
+  PROJECTLIBOURDISPEXTRAINCLUDES = -I$(PROJECTINCLUDEDIR)/$(PROJECTGENERICINCLUDEDIRNAME) \
+                                   -I$(PROJECTINCLUDEDIR)/$(PROJECTLOCALEINCLUDEDIRNAME) \
+                                   -I$(PROJECTINCLUDEDIR)/$(PROJECTOURDISPINCLUDEDIRNAME) \
++                                  SystemIncludeOption \
+                                   SystemIncludeOption/**/$(X11INCLUDEPATH)
+ 
+ PROJECTLIBDCONVERTEXTRAINCLUDES = -I$(PROJECTINCLUDEDIR)/$(PROJECTGENERICINCLUDEDIRNAME) \


Property changes on: trunk/packages/dicom3tools/trunk/debian/patches/ourdisp_xinclude.patch
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Modified: trunk/packages/dicom3tools/trunk/debian/patches/series
===================================================================
--- trunk/packages/dicom3tools/trunk/debian/patches/series	2010-05-23 11:50:52 UTC (rev 4818)
+++ trunk/packages/dicom3tools/trunk/debian/patches/series	2010-05-23 12:47:54 UTC (rev 4819)
@@ -5,3 +5,4 @@
 jpegdump.man.patch
 bmpdump.man.patch
 pvrg_naming.patch
+ourdisp_xinclude.patch