[oce] 01/02: debian/patches/include-oce-config.patch: New patch

[Denis Barbier]

This is an automated email from the git hooks/post-receive script.

barbier-guest pushed a commit to branch debian
in repository oce.

commit 11ddd764962c77f674c96d530a701555abd699ff
Author: Denis Barbier <bouzim at gmail.com>
Date:   Wed Feb 19 07:26:35 2014 +0100

    debian/patches/include-oce-config.patch: New patch
    
    Fix header files so that programs building against
    OCE do not need to pass -DHAVE_CONFIG_H flag.
---
 debian/patches/include-oce-config.patch | 51 +++++++++++++++++++++++++++++++++
 debian/patches/series                   |  1 +
 2 files changed, 52 insertions(+)

diff --git a/debian/patches/include-oce-config.patch b/debian/patches/include-oce-config.patch
new file mode 100644
index 0000000..91cc983
--- /dev/null
+++ b/debian/patches/include-oce-config.patch
@@ -0,0 +1,51 @@
+Description: Unconditionnally include oce-config.h in header files
+Author: Denis Barbier <bouzim at gmail.com>
+Origin: Upstream
+Forwarded: https://github.com/tpaviot/oce/issues/478
+Last-Update: 2014-02-19
+
+Index: oce/src/OpenGl/OpenGl_GlCore11.hxx
+===================================================================
+--- oce.orig/src/OpenGl/OpenGl_GlCore11.hxx
++++ oce/src/OpenGl/OpenGl_GlCore11.hxx
+@@ -17,9 +17,7 @@
+ #ifndef _OpenGl_GlCore11_H__
+ #define _OpenGl_GlCore11_H__
+ 
+-#ifdef HAVE_CONFIG_H
+-# include <oce-config.h>
+-#endif
++#include <oce-config.h>
+ 
+ // required for correct APIENTRY definition
+ #if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
+Index: oce/src/OpenGl/OpenGl_GlCore12.hxx
+===================================================================
+--- oce.orig/src/OpenGl/OpenGl_GlCore12.hxx
++++ oce/src/OpenGl/OpenGl_GlCore12.hxx
+@@ -17,9 +17,7 @@
+ #ifndef _OpenGl_GlCore12_H__
+ #define _OpenGl_GlCore12_H__
+ 
+-#ifdef HAVE_CONFIG_H
+-# include <oce-config.h>
+-#endif
++#include <oce-config.h>
+ 
+ #include <OpenGl_GlCore11.hxx>
+ 
+Index: oce/src/Standard/Standard_Integer.hxx
+===================================================================
+--- oce.orig/src/Standard/Standard_Integer.hxx
++++ oce/src/Standard/Standard_Integer.hxx
+@@ -23,9 +23,7 @@
+ # include <Standard_values.h>
+ #endif
+ 
+-#ifdef HAVE_CONFIG_H
+-# include <oce-config.h>
+-#endif
++#include <oce-config.h>
+ 
+ #ifdef __BORLANDC__
+ #define OCE_IS_DUPLICATE_UINT32_T
diff --git a/debian/patches/series b/debian/patches/series
index af33e05..9f81d15 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 split-export.patch
 NCollection-align-64bit.patch
 speedup-BRepMesh_test.patch
+include-oce-config.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/oce.git