[SCM] OCE packaging branch, debian, updated. debian/0.11-1
Denis Barbier
bouzim at gmail.com
Thu Dec 13 19:16:58 UTC 2012
The following commit has been merged in the debian branch:
commit 4661e9d9e701bd178686345b9e03e4c05079d800
Author: Denis Barbier <bouzim at gmail.com>
Date: Wed Dec 12 01:20:18 2012 +0100
Drop debian/patches/add-TKQADraw.patch, it is no more needed
diff --git a/debian/patches/add-TKQADraw.patch b/debian/patches/add-TKQADraw.patch
deleted file mode 100644
index 5b9d9bf..0000000
--- a/debian/patches/add-TKQADraw.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-Description: Wrap the new TKQADraw module introduced in OCCT 6.5.3
-Author: Denis Barbier <bouzim at gmail.com>
-Origin: Upstream
-Last-Update: 2012-06-09
-
-From b653c9c4a8d96b6f53a771507d24e54893e00e16 Mon Sep 17 00:00:00 2001
-From: Denis Barbier <bouzim at gmail.com>
-Date: Fri, 8 Jun 2012 15:06:47 +0200
-Subject: [PATCH] Wrap the new TKQADraw module introduced in OCCT 6.5.3
-
-Prepend OCE_ to HAVE_IOSTREAM and HAVE_FSTREAM macros.
----
- CMakeLists.txt | 7 +-----
- adm/cmake/TKQADraw/CMakeLists.txt | 47 ++++++++++++++++++++++++++++++++++++
- adm/cmake/TKQADraw/Precompiled.cpp | 1 +
- adm/cmake/TKQADraw/Precompiled.h | 1 +
- src/QABugs/QABugs_3.cxx | 12 ++++-----
- 5 files changed, 56 insertions(+), 12 deletions(-)
- create mode 100644 adm/cmake/TKQADraw/CMakeLists.txt
- create mode 100644 adm/cmake/TKQADraw/Precompiled.cpp
- create mode 100644 adm/cmake/TKQADraw/Precompiled.h
-
-Index: oce/CMakeLists.txt
-===================================================================
---- oce.orig/CMakeLists.txt
-+++ oce/CMakeLists.txt
-@@ -977,14 +977,9 @@ IF(${PROJECT_NAME}_DATAEXCHANGE)
- PROCESS_MODULE( "Data Exchange" "TKSTL;TKXSBase;TKSTEPBase;TKIGES;TKSTEPAttr;TKSTEP209;TKSTEP" "TKVRML;TKXCAF;TKXCAFSchema;TKXmlXCAF;TKBinXCAF;TKXDEIGES;TKXDESTEP" )
- ENDIF(${PROJECT_NAME}_DATAEXCHANGE)
-
--# Draw
--IF(${PROJECT_NAME}_DRAW)
-- PROCESS_MODULE( "Draw" "" "TKDraw;TKTopTest;TKViewerTest;TKXSDRAW;TKDCAF;TKXDEDRAW;TKTObjDRAW" )
--ENDIF(${PROJECT_NAME}_DRAW)
--
- # DRAWEXE application
- IF(${PROJECT_NAME}_DRAW)
-- PROCESS_MODULE( "Draw" "" DRAWEXE )
-+ PROCESS_MODULE( "Draw" "" "TKDraw;TKTopTest;TKViewerTest;TKXSDRAW;TKDCAF;TKXDEDRAW;TKTObjDRAW;TKQADraw;DRAWEXE" )
- ENDIF(${PROJECT_NAME}_DRAW)
-
- CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/ProjectConfig.cmake.in
-Index: oce/adm/cmake/TKQADraw/CMakeLists.txt
-===================================================================
---- /dev/null
-+++ oce/adm/cmake/TKQADraw/CMakeLists.txt
-@@ -0,0 +1,47 @@
-+SET(TOOLKIT TKQADraw)
-+
-+SET(TOOLKIT_MODULES
-+ DebugTools
-+ QABugs
-+ QADNaming
-+ QADraw
-+ QANCollection
-+ QANewBRepNaming
-+ QANewModTopOpe
-+)
-+SET(TOOLKIT_DEPENDS
-+ TKernel
-+ TKG3d
-+ TKMath
-+ TKBRep
-+ TKTopAlgo
-+ TKG2d
-+ TKGeomBase
-+ TKGeomAlgo
-+ TKPrim
-+ TKCDF
-+ TKShHealing
-+ TKBool
-+ TKLCAF
-+ TKOffset
-+ TKFeat
-+ TKXSBase
-+ TKCAF
-+ TKV3d
-+ TKIGES
-+ TKService
-+ TKDraw
-+ TKViewerTest
-+)
-+SET(TOOLKIT_INCLUDE_DIRECTORIES ${TCL_INCLUDE_PATH})
-+SET(TOOLKIT_LIBS ${TCL_LIBRARY} ${CSF_gdi32_LIB} ${CSF_advapi32_LIB} ${CSF_user32_LIB})
-+
-+IF(NOT WIN32)
-+ SET(TOOLKIT_INCLUDE_DIRECTORIES ${TOOLKIT_INCLUDE_DIRECTORIES} ${X11_X11_INCLUDE_PATH} ${TK_INCLUDE_PATH})
-+ SET(TOOLKIT_LIBS ${TOOLKIT_LIBS} ${TK_LIBRARY} ${X11_X11_LIB})
-+ENDIF(NOT WIN32)
-+
-+SET(TOOLKIT_IS_PRIVATE TRUE)
-+
-+INCLUDE(../BuildToolkit.cmake)
-+
-Index: oce/adm/cmake/TKQADraw/Precompiled.cpp
-===================================================================
---- /dev/null
-+++ oce/adm/cmake/TKQADraw/Precompiled.cpp
-@@ -0,0 +1 @@
-+#include "Precompiled.h"
-\ No newline at end of file
-Index: oce/adm/cmake/TKQADraw/Precompiled.h
-===================================================================
---- /dev/null
-+++ oce/adm/cmake/TKQADraw/Precompiled.h
-@@ -0,0 +1 @@
-+#pragma once
-Index: oce/src/QABugs/QABugs_3.cxx
-===================================================================
---- oce.orig/src/QABugs/QABugs_3.cxx
-+++ oce/src/QABugs/QABugs_3.cxx
-@@ -18,10 +18,10 @@
- // and conditions governing the rights and limitations under the License.
-
-
--#include <QABugs.hxx>
- #ifdef HAVE_CONFIG_H
- #include <oce-config.h>
- #endif
-+#include <QABugs.hxx>
- #include<Draw_Interpretor.hxx>
- #include<TopLoc_Location.hxx>
- #include<TopoDS_Face.hxx>
-@@ -287,15 +287,15 @@ void stringerror(int state)
- //#else
- //#include <strstream.h>
- //#endif
--#ifdef HAVE_IOSTREAM
-+#ifdef OCE_HAVE_IOSTREAM
- #include <iostream>
- #include <sstream>
- using namespace std;
--#elif defined (HAVE_IOSTREAM_H)
-+#elif defined (OCE_HAVE_IOSTREAM_H)
- #include <iostream.h>
- #include <strstream.h>
- #else
--#error "check oce-config.h file or compilation options: either HAVE_IOSTREAM or HAVE_IOSTREAM_H should be defined"
-+#error "check oce-config.h file or compilation options: either OCE_HAVE_IOSTREAM or OCE_HAVE_IOSTREAM_H should be defined"
- #endif
- static int UKI61075(Draw_Interpretor& /*di*/, Standard_Integer /*argc*/, const char ** /*argv*/) {
- double da,db;
-@@ -1405,9 +1405,9 @@ static Standard_Integer BUC60856(Draw_In
-
- #if ! defined(WNT)
- //#include <fstream.h>
--#ifdef HAVE_FSTREAM
-+#ifdef OCE_HAVE_FSTREAM
- # include <fstream>
--#elif defined (HAVE_FSTREAM_H)
-+#elif defined (OCE_HAVE_FSTREAM_H)
- # include <fstream.h>
- #endif
- //#include <Standard_Stream.hxx>
-Index: oce/src/QABugs/QABugs_11.cxx
-===================================================================
---- oce.orig/src/QABugs/QABugs_11.cxx
-+++ oce/src/QABugs/QABugs_11.cxx
-@@ -931,19 +931,19 @@ Standard_Integer OCC299bug (Draw_Interpr
- //
- switch (aState) {
- case TopAbs_IN:
-- sprintf(sbf, sIN.ToCString());
-+ sprintf(sbf, "%s", sIN.ToCString());
- break;
- case TopAbs_OUT:
-- sprintf(sbf, sOUT.ToCString());
-+ sprintf(sbf, "%s", sOUT.ToCString());
- break;
- case TopAbs_ON:
-- sprintf(sbf, sON.ToCString());
-+ sprintf(sbf, "%s", sON.ToCString());
- break;
- case TopAbs_UNKNOWN:
-- sprintf(sbf, sUNKNOWN.ToCString());
-+ sprintf(sbf, "%s", sUNKNOWN.ToCString());
- break;
- default:
-- sprintf(sbf, sUNKNOWN.ToCString());
-+ sprintf(sbf, "%s", sUNKNOWN.ToCString());
- break;
- }
- di<<sbf;
diff --git a/debian/patches/series b/debian/patches/series
index 173a70e..1122866 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-add-TKQADraw.patch
split-export.patch
--
OCE packaging
More information about the debian-science-commits
mailing list