[SCM] OCE packaging branch, debian, updated. debian/0.10-1
Denis Barbier
bouzim at gmail.com
Sun Jun 10 07:36:28 UTC 2012
The following commit has been merged in the debian branch:
commit 9864b9f80023fa17e0a42e33ecf688202523d441
Author: Denis Barbier <bouzim at gmail.com>
Date: Sat Jun 9 12:23:25 2012 +0200
New patch: debian/patches/add-TKQADraw.patch
The TKQADraw module has been introduced in OCCT 6.5.3 but
it had been forgotten in OCE 0.10, it willbe included in
OCE 0.10.1. Add it now in the Debian package.
diff --git a/debian/oce-draw.install b/debian/oce-draw.install
index ed6f438..ccefadc 100644
--- a/debian/oce-draw.install
+++ b/debian/oce-draw.install
@@ -1,10 +1,10 @@
usr/bin/DRAWEXE
usr/share/man/man1/DRAWEXE.1
-# PACKAGES = TKDraw TKTopTest TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW DRAWEXE
+# PACKAGES = TKDraw TKTopTest TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW TKQADraw DRAWEXE
#
# See ros/adm/make/Makefile.am
-# Draw_PKGS = TKDraw TKTopTest TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW DRAWEXE
+# Draw_PKGS = TKDraw TKTopTest TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW TKQADraw DRAWEXE
usr/lib/oce-*/libTKDraw.so*
usr/lib/oce-*/libTKTopTest.so*
usr/lib/oce-*/libTKViewerTest.so*
@@ -12,6 +12,7 @@ usr/lib/oce-*/libTKXSDRAW.so*
usr/lib/oce-*/libTKDCAF.so*
usr/lib/oce-*/libTKXDEDRAW.so*
usr/lib/oce-*/libTKTObjDRAW.so*
+usr/lib/oce-*/libTKQADraw.so*
usr/share/oce-*/src/DrawResources/*.tcl
usr/share/oce-*/src/DrawResources/DrawDefault
@@ -20,7 +21,7 @@ usr/share/oce-*/src/DrawResources/DrawPlugin
usr/share/applications/*
usr/share/pixmaps/*
-# extra_files="inc/DrawRessource.h inc/COMMANDWINDOW.h inc/MAINWINDOW.h inc/init.h inc/ModelDefinitions.hxx"; list="TKDraw TKTopTest TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW DRAWEXE"; for p in $list; do for f in $(sed -e '1,/^SET(TOOLKIT_MODULES/d' -e '/)/,$d' adm/cmake/$p/CMakeLists.txt); do ls -1 $extra_files inc/${f}_* inc/Handle_${f}_* inc/$f.* inc/Handle_$f.* 2>/dev/null | sed -e 's,^inc,usr/include/oce,'; extra_files=""; done; done | LC_ALL=C sort -u
+# extra_files="inc/DrawRessource.h inc/COMMANDWINDOW.h inc/MAINWINDOW.h inc/init.h inc/ModelDefinitions.hxx"; list="TKDraw TKTopTest TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW TKQADraw DRAWEXE"; for p in $list; do for f in $(sed -e '1,/^SET(TOOLKIT_MODULES/d' -e '/)/,$d' adm/cmake/$p/CMakeLists.txt); do ls -1 $extra_files inc/${f}_* inc/Handle_${f}_* inc/$f.* inc/Handle_$f.* 2>/dev/null | sed -e 's,^inc,usr/include/oce,'; extra_files=""; done; done | LC_ALL=C sort -u
# Includes are included only to make dh_install --list-missing quiet
usr/include/oce/BOPTest.hxx
usr/include/oce/BOPTest_DrawableShape.hxx
@@ -76,6 +77,7 @@ usr/include/oce/DNaming_SelectionDriver.hxx
usr/include/oce/DNaming_SphereDriver.hxx
usr/include/oce/DNaming_TransformationDriver.hxx
usr/include/oce/DPrsStd.hxx
+usr/include/oce/DebugTools.h
usr/include/oce/Draw.hxx
usr/include/oce/DrawDim.hxx
usr/include/oce/DrawDim_Angle.hxx
@@ -254,6 +256,18 @@ usr/include/oce/Handle_HLRTest_OutLiner.hxx
usr/include/oce/Handle_HLRTest_Projector.hxx
usr/include/oce/Handle_HLRTest_ShapeData.hxx
usr/include/oce/Handle_MeshTest_DrawableMesh.hxx
+usr/include/oce/Handle_QABugs_MyText.hxx
+usr/include/oce/Handle_QABugs_PresentableObject.hxx
+usr/include/oce/Handle_QADNaming_DataMapNodeOfDataMapOfShapeOfName.hxx
+usr/include/oce/Handle_QADraw_DataMapNodeOfDataMapOfAsciiStringOfAddress.hxx
+usr/include/oce/Handle_QANCollection_DataMapNodeOfDataMapOfRealPnt.hxx
+usr/include/oce/Handle_QANCollection_DoubleMapNodeOfDoubleMapOfRealInteger.hxx
+usr/include/oce/Handle_QANCollection_IndexedDataMapNodeOfIndexedDataMapOfRealPnt.hxx
+usr/include/oce/Handle_QANCollection_ListNodeOfListOfPnt.hxx
+usr/include/oce/Handle_QANCollection_QueueNodeOfQueueOfPnt.hxx
+usr/include/oce/Handle_QANCollection_SListNodeOfSListOfPnt.hxx
+usr/include/oce/Handle_QANCollection_StackNodeOfStackOfPnt.hxx
+usr/include/oce/Handle_QANewModTopOpe_ReShaper.hxx
usr/include/oce/Handle_TestTopOpeDraw_DrawableC2D.hxx
usr/include/oce/Handle_TestTopOpeDraw_DrawableC3D.hxx
usr/include/oce/Handle_TestTopOpeDraw_DrawableMesure.hxx
@@ -280,6 +294,79 @@ usr/include/oce/MeshTest.hxx
usr/include/oce/MeshTest_CheckTopology.hxx
usr/include/oce/MeshTest_DrawableMesh.hxx
usr/include/oce/ModelDefinitions.hxx
+usr/include/oce/QABugs.hxx
+usr/include/oce/QABugs_MyText.hxx
+usr/include/oce/QABugs_PresentableObject.hxx
+usr/include/oce/QADNaming.hxx
+usr/include/oce/QADNaming_DataMapIteratorOfDataMapOfShapeOfName.hxx
+usr/include/oce/QADNaming_DataMapNodeOfDataMapOfShapeOfName.hxx
+usr/include/oce/QADNaming_DataMapOfShapeOfName.hxx
+usr/include/oce/QADraw.hxx
+usr/include/oce/QADraw_DataMapIteratorOfDataMapOfAsciiStringOfAddress.hxx
+usr/include/oce/QADraw_DataMapNodeOfDataMapOfAsciiStringOfAddress.hxx
+usr/include/oce/QADraw_DataMapOfAsciiStringOfAddress.hxx
+usr/include/oce/QANCollection.hxx
+usr/include/oce/QANCollection_Common.hxx
+usr/include/oce/QANCollection_Common2.hxx
+usr/include/oce/QANCollection_Common3.hxx
+usr/include/oce/QANCollection_DataMapIteratorOfDataMapOfRealPnt.hxx
+usr/include/oce/QANCollection_DataMapNodeOfDataMapOfRealPnt.hxx
+usr/include/oce/QANCollection_DataMapOfRealPnt.hxx
+usr/include/oce/QANCollection_DoubleMapIteratorOfDoubleMapOfRealInteger.hxx
+usr/include/oce/QANCollection_DoubleMapNodeOfDoubleMapOfRealInteger.hxx
+usr/include/oce/QANCollection_DoubleMapOfRealInteger.hxx
+usr/include/oce/QANCollection_FuncArrays.hxx
+usr/include/oce/QANCollection_FuncLists.hxx
+usr/include/oce/QANCollection_FuncMaps.hxx
+usr/include/oce/QANCollection_FuncTest.hxx
+usr/include/oce/QANCollection_IndexedDataMapNodeOfIndexedDataMapOfRealPnt.hxx
+usr/include/oce/QANCollection_IndexedDataMapOfRealPnt.hxx
+usr/include/oce/QANCollection_ListIteratorOfListOfPnt.hxx
+usr/include/oce/QANCollection_ListNodeOfListOfPnt.hxx
+usr/include/oce/QANCollection_ListOfPnt.hxx
+usr/include/oce/QANCollection_PerfArrays.hxx
+usr/include/oce/QANCollection_PerfLists.hxx
+usr/include/oce/QANCollection_PerfMaps.hxx
+usr/include/oce/QANCollection_PerfSparseArray.hxx
+usr/include/oce/QANCollection_PerfTest.hxx
+usr/include/oce/QANCollection_QueueNodeOfQueueOfPnt.hxx
+usr/include/oce/QANCollection_QueueOfPnt.hxx
+usr/include/oce/QANCollection_SListNodeOfSListOfPnt.hxx
+usr/include/oce/QANCollection_SListOfPnt.hxx
+usr/include/oce/QANCollection_StackIteratorOfStackOfPnt.hxx
+usr/include/oce/QANCollection_StackNodeOfStackOfPnt.hxx
+usr/include/oce/QANCollection_StackOfPnt.hxx
+usr/include/oce/QANewBRepNaming.hxx
+usr/include/oce/QANewBRepNaming_BooleanOperation.hxx
+usr/include/oce/QANewBRepNaming_BooleanOperationFeat.hxx
+usr/include/oce/QANewBRepNaming_Box.hxx
+usr/include/oce/QANewBRepNaming_Chamfer.hxx
+usr/include/oce/QANewBRepNaming_Common.hxx
+usr/include/oce/QANewBRepNaming_Cut.hxx
+usr/include/oce/QANewBRepNaming_Cylinder.hxx
+usr/include/oce/QANewBRepNaming_Fillet.hxx
+usr/include/oce/QANewBRepNaming_Fuse.hxx
+usr/include/oce/QANewBRepNaming_Gluing.hxx
+usr/include/oce/QANewBRepNaming_ImportShape.hxx
+usr/include/oce/QANewBRepNaming_Intersection.hxx
+usr/include/oce/QANewBRepNaming_Limitation.hxx
+usr/include/oce/QANewBRepNaming_Loader.hxx
+usr/include/oce/QANewBRepNaming_LoaderParent.hxx
+usr/include/oce/QANewBRepNaming_Prism.hxx
+usr/include/oce/QANewBRepNaming_Revol.hxx
+usr/include/oce/QANewBRepNaming_Sphere.hxx
+usr/include/oce/QANewBRepNaming_TopNaming.hxx
+usr/include/oce/QANewBRepNaming_TopNaming.lxx
+usr/include/oce/QANewBRepNaming_TypeOfPrimitive3D.hxx
+usr/include/oce/QANewModTopOpe.hxx
+usr/include/oce/QANewModTopOpe_CommonPtr.hxx
+usr/include/oce/QANewModTopOpe_CutPtr.hxx
+usr/include/oce/QANewModTopOpe_Glue.hxx
+usr/include/oce/QANewModTopOpe_Intersection.hxx
+usr/include/oce/QANewModTopOpe_Limitation.hxx
+usr/include/oce/QANewModTopOpe_ModeOfLimitation.hxx
+usr/include/oce/QANewModTopOpe_ReShaper.hxx
+usr/include/oce/QANewModTopOpe_Tools.hxx
usr/include/oce/SWDRAW.hxx
usr/include/oce/SWDRAW_ShapeAnalysis.hxx
usr/include/oce/SWDRAW_ShapeBuild.hxx
diff --git a/debian/patches/add-TKQADraw.patch b/debian/patches/add-TKQADraw.patch
new file mode 100644
index 0000000..5b9d9bf
--- /dev/null
+++ b/debian/patches/add-TKQADraw.patch
@@ -0,0 +1,183 @@
+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
new file mode 100644
index 0000000..1a4bf30
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+add-TKQADraw.patch
--
OCE packaging
More information about the debian-science-commits
mailing list