Author: hobbes1069 Update of /cvs/nonfree/rpms/smesh/F-15 In directory se02.es.rpmfusion.net:/tmp/cvs-serv3367 Modified Files: sources Added Files: smesh-cmake_fixes.patch smesh.patch smesh.spec Log Message: * Thu Jan 19 2012 Richard Shaw <hobbes1069(a)gmail.com&gt; - 5.1.2.2-2.svn54 - Minor updates to spec file. smesh-cmake_fixes.patch: CMakeLists.txt | 34 ++++++ doc/src/Doxyfile | 254 ---------------------------------------------------- doc/src/Doxyfile.in | 254 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 285 insertions(+), 257 deletions(-) --- NEW FILE smesh-cmake_fixes.patch --- diff -Naur smesh-5.1.2.2.orig/CMakeLists.txt smesh-5.1.2.2/CMakeLists.txt --- smesh-5.1.2.2.orig/CMakeLists.txt 2010-01-25 09:01:13.000000000 -0600 +++ smesh-5.1.2.2/CMakeLists.txt 2011-12-27 11:51:18.818641905 -0600 @@ -8,7 +8,9 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -SET(CMAKE_BUILD_TYPE "Release") # By default, build in release mode +IF(NOT CMAKE_BUILD_TYPE) + SET(CMAKE_BUILD_TYPE "Release") # By default, build in release mode +ENDIF() SET(BUILD_SHARED_LIBS ON) SET(LIBRARY_OUTPUT_PATH cmake-build) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) @@ -79,6 +81,21 @@ ENDIF(WIN32) ENDIF(UNIX) +# +# Build doxygen API documentation # +# + +FIND_PACKAGE(Doxygen) +if(DOXYGEN_FOUND) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/doc/src/Doxyfile.in + ${CMAKE_CURRENT_SOURCE_DIR}/doc/src/Doxyfile @ONLY) + add_custom_target(doc ${DOXYGEN_EXECUTABLE} + ${CMAKE_CURRENT_SOURCE_DIR}/doc/src/Doxyfile + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/doc/src + COMMENT "Generating API documentation with Doxygen" VERBATIM + ) +endif(DOXYGEN_FOUND) + ######### # SMDS # ######### @@ -153,12 +170,23 @@ SET(INSTALL_PATH_NAME SMESH-${SMESH_VERSION_MAJOR}.${SMESH_VERSION_MINOR}.${SMESH_VERSION_PATCH}.${SMESH_VERSION_TWEAK}) IF(UNIX) + # Setup install paths + IF(NOT LIB_INSTALL_DIR) + SET(LIB_INSTALL_DIR /usr/local/lib${LIB_SUFFIX}) + ENDIF() + IF(NOT INCLUDE_INSTALL_DIR) + SET(INCLUDE_INSTALL_DIR /usr/local/include) + ENDIF() + # Set soname version + SET_TARGET_PROPERTIES(SMDS Driver DriverSTL DriverDAT DriverUNV + SMESHDS SMESH StdMeshers + PROPERTIES SOVERSION ${SMESH_VERSION_MAJOR}.${SMESH_VERSION_MINOR}) # Libraries are installed by default in /usr/local/lib/SMESH-5.1.2.7 INSTALL(TARGETS SMDS Driver DriverSTL DriverDAT DriverUNV SMESHDS SMESH StdMeshers - DESTINATION /usr/local/lib/${INSTALL_PATH_NAME}) + DESTINATION ${LIB_INSTALL_DIR}) # Headers are installed by default in /usr/local/include/SMESH-5.1.2.7 INSTALL(DIRECTORY inc/ - DESTINATION /usr/local/include/${INSTALL_PATH_NAME} + DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h*") ENDIF(UNIX) diff -Naur smesh-5.1.2.2.orig/doc/src/Doxyfile smesh-5.1.2.2/doc/src/Doxyfile --- smesh-5.1.2.2.orig/doc/src/Doxyfile 2008-11-26 01:34:11.000000000 -0600 +++ smesh-5.1.2.2/doc/src/Doxyfile 1969-12-31 18:00:00.000000000 -0600 @@ -1,254 +0,0 @@ -# Doxyfile 1.5.7.1 - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- -DOXYFILE_ENCODING = UTF-8 -PROJECT_NAME = "SALOME - SMESH" -PROJECT_NUMBER = -OUTPUT_DIRECTORY = ../ -CREATE_SUBDIRS = NO -OUTPUT_LANGUAGE = English -BRIEF_MEMBER_DESC = YES -REPEAT_BRIEF = YES -ABBREVIATE_BRIEF = -ALWAYS_DETAILED_SEC = YES -INLINE_INHERITED_MEMB = YES -FULL_PATH_NAMES = NO -STRIP_FROM_PATH = -STRIP_FROM_INC_PATH = -SHORT_NAMES = NO -JAVADOC_AUTOBRIEF = YES -QT_AUTOBRIEF = NO -MULTILINE_CPP_IS_BRIEF = YES -INHERIT_DOCS = YES -SEPARATE_MEMBER_PAGES = NO -TAB_SIZE = 5 -ALIASES = -OPTIMIZE_OUTPUT_FOR_C = YES -OPTIMIZE_OUTPUT_JAVA = YES -OPTIMIZE_FOR_FORTRAN = NO -OPTIMIZE_OUTPUT_VHDL = NO -BUILTIN_STL_SUPPORT = YES -CPP_CLI_SUPPORT = NO -SIP_SUPPORT = NO -IDL_PROPERTY_SUPPORT = YES -DISTRIBUTE_GROUP_DOC = NO -SUBGROUPING = YES -TYPEDEF_HIDES_STRUCT = NO -SYMBOL_CACHE_SIZE = 0 -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- -EXTRACT_ALL = YES -EXTRACT_PRIVATE = YES -EXTRACT_STATIC = YES -EXTRACT_LOCAL_CLASSES = YES -EXTRACT_LOCAL_METHODS = NO -EXTRACT_ANON_NSPACES = NO -HIDE_UNDOC_MEMBERS = NO -HIDE_UNDOC_CLASSES = NO -HIDE_FRIEND_COMPOUNDS = NO -HIDE_IN_BODY_DOCS = NO -INTERNAL_DOCS = YES -CASE_SENSE_NAMES = YES -HIDE_SCOPE_NAMES = NO -SHOW_INCLUDE_FILES = YES -INLINE_INFO = YES -SORT_MEMBER_DOCS = NO -SORT_BRIEF_DOCS = NO -SORT_GROUP_NAMES = NO -SORT_BY_SCOPE_NAME = NO -GENERATE_TODOLIST = YES -GENERATE_TESTLIST = YES -GENERATE_BUGLIST = YES -GENERATE_DEPRECATEDLIST= YES -ENABLED_SECTIONS = -MAX_INITIALIZER_LINES = 25 -SHOW_USED_FILES = NO -SHOW_DIRECTORIES = NO -SHOW_FILES = YES -SHOW_NAMESPACES = NO -FILE_VERSION_FILTER = -LAYOUT_FILE = -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- -QUIET = NO -WARNINGS = YES -WARN_IF_UNDOCUMENTED = YES -WARN_IF_DOC_ERROR = YES -WARN_NO_PARAMDOC = NO -WARN_FORMAT = "$file:$line: $text" -WARN_LOGFILE = log.txt -#--------------------------------------------------------------------------- -# configuration options related to the input files -#--------------------------------------------------------------------------- -INPUT = ../../inc -INPUT_ENCODING = UTF-8 -FILE_PATTERNS = *.hxx \ - *.h -RECURSIVE = YES -EXCLUDE = -EXCLUDE_SYMLINKS = NO -EXCLUDE_PATTERNS = -EXCLUDE_SYMBOLS = -EXAMPLE_PATH = -EXAMPLE_PATTERNS = -EXAMPLE_RECURSIVE = NO -IMAGE_PATH = -INPUT_FILTER = -FILTER_PATTERNS = -FILTER_SOURCE_FILES = YES -#--------------------------------------------------------------------------- -# configuration options related to source browsing -#--------------------------------------------------------------------------- -SOURCE_BROWSER = YES -INLINE_SOURCES = NO -STRIP_CODE_COMMENTS = YES -REFERENCED_BY_RELATION = YES -REFERENCES_RELATION = YES -REFERENCES_LINK_SOURCE = YES -USE_HTAGS = NO -VERBATIM_HEADERS = YES -#--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- -ALPHABETICAL_INDEX = YES -COLS_IN_ALPHA_INDEX = 3 -IGNORE_PREFIX = -#--------------------------------------------------------------------------- -# configuration options related to the HTML output -#--------------------------------------------------------------------------- -GENERATE_HTML = YES -HTML_OUTPUT = html -HTML_FILE_EXTENSION = .html -HTML_HEADER = -HTML_FOOTER = -HTML_STYLESHEET = doxygen.css -HTML_ALIGN_MEMBERS = YES -HTML_DYNAMIC_SECTIONS = NO -GENERATE_DOCSET = NO -DOCSET_FEEDNAME = "Doxygen generated docs" -DOCSET_BUNDLE_ID = org.doxygen.Project -GENERATE_HTMLHELP = NO -CHM_FILE = -HHC_LOCATION = -GENERATE_CHI = NO -CHM_INDEX_ENCODING = -BINARY_TOC = YES -TOC_EXPAND = YES -GENERATE_QHP = NO -QCH_FILE = -QHP_NAMESPACE = org.doxygen.Project -QHP_VIRTUAL_FOLDER = doc -QHG_LOCATION = -DISABLE_INDEX = NO -ENUM_VALUES_PER_LINE = 4 -GENERATE_TREEVIEW = ALL -TREEVIEW_WIDTH = 250 -FORMULA_FONTSIZE = 10 -#--------------------------------------------------------------------------- -# configuration options related to the LaTeX output -#--------------------------------------------------------------------------- -GENERATE_LATEX = NO -LATEX_OUTPUT = latex -LATEX_CMD_NAME = latex -MAKEINDEX_CMD_NAME = makeindex -COMPACT_LATEX = NO -PAPER_TYPE = a4wide -EXTRA_PACKAGES = -LATEX_HEADER = -PDF_HYPERLINKS = NO -USE_PDFLATEX = NO -LATEX_BATCHMODE = NO -LATEX_HIDE_INDICES = NO -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- -GENERATE_RTF = NO -RTF_OUTPUT = rtf -COMPACT_RTF = NO -RTF_HYPERLINKS = NO -RTF_STYLESHEET_FILE = -RTF_EXTENSIONS_FILE = -#--------------------------------------------------------------------------- -# configuration options related to the man page output -#--------------------------------------------------------------------------- -GENERATE_MAN = NO -MAN_OUTPUT = man -MAN_EXTENSION = .3 -MAN_LINKS = NO -#--------------------------------------------------------------------------- -# configuration options related to the XML output -#--------------------------------------------------------------------------- -GENERATE_XML = NO -XML_OUTPUT = xml -XML_SCHEMA = -XML_DTD = -XML_PROGRAMLISTING = YES -#--------------------------------------------------------------------------- -# configuration options for the AutoGen Definitions output -#--------------------------------------------------------------------------- -GENERATE_AUTOGEN_DEF = NO -#--------------------------------------------------------------------------- -# configuration options related to the Perl module output -#--------------------------------------------------------------------------- -GENERATE_PERLMOD = NO -PERLMOD_LATEX = NO -PERLMOD_PRETTY = YES -PERLMOD_MAKEVAR_PREFIX = -#--------------------------------------------------------------------------- -# Configuration options related to the preprocessor -#--------------------------------------------------------------------------- -ENABLE_PREPROCESSING = YES -MACRO_EXPANSION = YES -EXPAND_ONLY_PREDEF = NO -SEARCH_INCLUDES = YES -INCLUDE_PATH = $(CASROOT)/inc -INCLUDE_FILE_PATTERNS = -PREDEFINED = -EXPAND_AS_DEFINED = -SKIP_FUNCTION_MACROS = NO -#--------------------------------------------------------------------------- -# Configuration::additions related to external references -#--------------------------------------------------------------------------- -TAGFILES = -GENERATE_TAGFILE = -ALLEXTERNALS = NO -EXTERNAL_GROUPS = YES -PERL_PATH = /usr/bin/perl -#--------------------------------------------------------------------------- -# Configuration options related to the dot tool -#--------------------------------------------------------------------------- -CLASS_DIAGRAMS = YES -MSCGEN_PATH = -HIDE_UNDOC_RELATIONS = NO -HAVE_DOT = YES -DOT_FONTNAME = FreeSans -DOT_FONTSIZE = 10 -DOT_FONTPATH = -CLASS_GRAPH = YES -COLLABORATION_GRAPH = YES -GROUP_GRAPHS = YES -UML_LOOK = NO -TEMPLATE_RELATIONS = YES -INCLUDE_GRAPH = YES -INCLUDED_BY_GRAPH = YES -CALL_GRAPH = YES -CALLER_GRAPH = YES -GRAPHICAL_HIERARCHY = YES -DIRECTORY_GRAPH = YES -DOT_IMAGE_FORMAT = jpg -DOT_PATH = -DOTFILE_DIRS = -DOT_GRAPH_MAX_NODES = 50 -MAX_DOT_GRAPH_DEPTH = 0 -DOT_TRANSPARENT = NO -DOT_MULTI_TARGETS = NO -GENERATE_LEGEND = NO -DOT_CLEANUP = YES -#--------------------------------------------------------------------------- -# Configuration::additions related to the search engine -#--------------------------------------------------------------------------- -SEARCHENGINE = YES diff -Naur smesh-5.1.2.2.orig/doc/src/Doxyfile.in smesh-5.1.2.2/doc/src/Doxyfile.in --- smesh-5.1.2.2.orig/doc/src/Doxyfile.in 1969-12-31 18:00:00.000000000 -0600 +++ smesh-5.1.2.2/doc/src/Doxyfile.in 2011-12-27 11:51:18.773643400 -0600 @@ -0,0 +1,254 @@ +# Doxyfile 1.5.7.1 + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- +DOXYFILE_ENCODING = UTF-8 +PROJECT_NAME = "SALOME - SMESH" +PROJECT_NUMBER = +OUTPUT_DIRECTORY = ../ +CREATE_SUBDIRS = NO +OUTPUT_LANGUAGE = English +BRIEF_MEMBER_DESC = YES +REPEAT_BRIEF = YES +ABBREVIATE_BRIEF = +ALWAYS_DETAILED_SEC = YES +INLINE_INHERITED_MEMB = YES +FULL_PATH_NAMES = NO +STRIP_FROM_PATH = +STRIP_FROM_INC_PATH = +SHORT_NAMES = NO +JAVADOC_AUTOBRIEF = YES +QT_AUTOBRIEF = NO +MULTILINE_CPP_IS_BRIEF = YES +INHERIT_DOCS = YES +SEPARATE_MEMBER_PAGES = NO +TAB_SIZE = 5 +ALIASES = +OPTIMIZE_OUTPUT_FOR_C = YES +OPTIMIZE_OUTPUT_JAVA = YES +OPTIMIZE_FOR_FORTRAN = NO +OPTIMIZE_OUTPUT_VHDL = NO +BUILTIN_STL_SUPPORT = YES +CPP_CLI_SUPPORT = NO +SIP_SUPPORT = NO +IDL_PROPERTY_SUPPORT = YES +DISTRIBUTE_GROUP_DOC = NO +SUBGROUPING = YES +TYPEDEF_HIDES_STRUCT = NO +SYMBOL_CACHE_SIZE = 0 +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- +EXTRACT_ALL = YES +EXTRACT_PRIVATE = YES +EXTRACT_STATIC = YES +EXTRACT_LOCAL_CLASSES = YES +EXTRACT_LOCAL_METHODS = NO +EXTRACT_ANON_NSPACES = NO +HIDE_UNDOC_MEMBERS = NO +HIDE_UNDOC_CLASSES = NO +HIDE_FRIEND_COMPOUNDS = NO +HIDE_IN_BODY_DOCS = NO +INTERNAL_DOCS = YES +CASE_SENSE_NAMES = YES +HIDE_SCOPE_NAMES = NO +SHOW_INCLUDE_FILES = YES +INLINE_INFO = YES +SORT_MEMBER_DOCS = NO +SORT_BRIEF_DOCS = NO +SORT_GROUP_NAMES = NO +SORT_BY_SCOPE_NAME = NO +GENERATE_TODOLIST = YES +GENERATE_TESTLIST = YES +GENERATE_BUGLIST = YES +GENERATE_DEPRECATEDLIST= YES +ENABLED_SECTIONS = +MAX_INITIALIZER_LINES = 25 +SHOW_USED_FILES = NO +SHOW_DIRECTORIES = NO +SHOW_FILES = YES +SHOW_NAMESPACES = NO +FILE_VERSION_FILTER = +LAYOUT_FILE = +#--------------------------------------------------------------------------- +# configuration options related to warning and progress messages +#--------------------------------------------------------------------------- +QUIET = NO +WARNINGS = YES +WARN_IF_UNDOCUMENTED = YES +WARN_IF_DOC_ERROR = YES +WARN_NO_PARAMDOC = NO +WARN_FORMAT = "$file:$line: $text" +WARN_LOGFILE = log.txt +#--------------------------------------------------------------------------- +# configuration options related to the input files +#--------------------------------------------------------------------------- +INPUT = @CMAKE_CURRENT_SOURCE_DIR@/inc +INPUT_ENCODING = UTF-8 +FILE_PATTERNS = *.hxx \ + *.h +RECURSIVE = YES +EXCLUDE = +EXCLUDE_SYMLINKS = NO +EXCLUDE_PATTERNS = +EXCLUDE_SYMBOLS = +EXAMPLE_PATH = +EXAMPLE_PATTERNS = +EXAMPLE_RECURSIVE = NO +IMAGE_PATH = +INPUT_FILTER = +FILTER_PATTERNS = +FILTER_SOURCE_FILES = YES +#--------------------------------------------------------------------------- +# configuration options related to source browsing +#--------------------------------------------------------------------------- +SOURCE_BROWSER = YES +INLINE_SOURCES = NO +STRIP_CODE_COMMENTS = YES +REFERENCED_BY_RELATION = YES +REFERENCES_RELATION = YES +REFERENCES_LINK_SOURCE = YES +USE_HTAGS = NO +VERBATIM_HEADERS = YES +#--------------------------------------------------------------------------- +# configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- +ALPHABETICAL_INDEX = YES +COLS_IN_ALPHA_INDEX = 3 +IGNORE_PREFIX = +#--------------------------------------------------------------------------- +# configuration options related to the HTML output +#--------------------------------------------------------------------------- +GENERATE_HTML = YES +HTML_OUTPUT = html +HTML_FILE_EXTENSION = .html +HTML_HEADER = +HTML_FOOTER = +HTML_STYLESHEET = doxygen.css +HTML_ALIGN_MEMBERS = YES +HTML_DYNAMIC_SECTIONS = NO +GENERATE_DOCSET = NO +DOCSET_FEEDNAME = "Doxygen generated docs" +DOCSET_BUNDLE_ID = org.doxygen.Project +GENERATE_HTMLHELP = NO +CHM_FILE = +HHC_LOCATION = +GENERATE_CHI = NO +CHM_INDEX_ENCODING = +BINARY_TOC = YES +TOC_EXPAND = YES +GENERATE_QHP = NO +QCH_FILE = +QHP_NAMESPACE = org.doxygen.Project +QHP_VIRTUAL_FOLDER = doc +QHG_LOCATION = +DISABLE_INDEX = NO +ENUM_VALUES_PER_LINE = 4 +GENERATE_TREEVIEW = ALL +TREEVIEW_WIDTH = 250 +FORMULA_FONTSIZE = 10 +#--------------------------------------------------------------------------- +# configuration options related to the LaTeX output +#--------------------------------------------------------------------------- +GENERATE_LATEX = NO +LATEX_OUTPUT = latex +LATEX_CMD_NAME = latex +MAKEINDEX_CMD_NAME = makeindex +COMPACT_LATEX = NO +PAPER_TYPE = a4wide +EXTRA_PACKAGES = +LATEX_HEADER = +PDF_HYPERLINKS = NO +USE_PDFLATEX = NO +LATEX_BATCHMODE = NO +LATEX_HIDE_INDICES = NO +#--------------------------------------------------------------------------- +# configuration options related to the RTF output +#--------------------------------------------------------------------------- +GENERATE_RTF = NO +RTF_OUTPUT = rtf +COMPACT_RTF = NO +RTF_HYPERLINKS = NO +RTF_STYLESHEET_FILE = +RTF_EXTENSIONS_FILE = +#--------------------------------------------------------------------------- +# configuration options related to the man page output +#--------------------------------------------------------------------------- +GENERATE_MAN = NO +MAN_OUTPUT = man +MAN_EXTENSION = .3 +MAN_LINKS = NO +#--------------------------------------------------------------------------- +# configuration options related to the XML output +#--------------------------------------------------------------------------- +GENERATE_XML = NO +XML_OUTPUT = xml +XML_SCHEMA = +XML_DTD = +XML_PROGRAMLISTING = YES +#--------------------------------------------------------------------------- +# configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- +GENERATE_AUTOGEN_DEF = NO +#--------------------------------------------------------------------------- +# configuration options related to the Perl module output +#--------------------------------------------------------------------------- +GENERATE_PERLMOD = NO +PERLMOD_LATEX = NO +PERLMOD_PRETTY = YES +PERLMOD_MAKEVAR_PREFIX = +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- +ENABLE_PREPROCESSING = YES +MACRO_EXPANSION = YES +EXPAND_ONLY_PREDEF = NO +SEARCH_INCLUDES = YES +INCLUDE_PATH = $(CASROOT)/inc +INCLUDE_FILE_PATTERNS = +PREDEFINED = +EXPAND_AS_DEFINED = +SKIP_FUNCTION_MACROS = NO +#--------------------------------------------------------------------------- +# Configuration::additions related to external references +#--------------------------------------------------------------------------- +TAGFILES = +GENERATE_TAGFILE = +ALLEXTERNALS = NO +EXTERNAL_GROUPS = YES +PERL_PATH = /usr/bin/perl +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- +CLASS_DIAGRAMS = YES +MSCGEN_PATH = +HIDE_UNDOC_RELATIONS = NO +HAVE_DOT = YES +DOT_FONTNAME = FreeSans +DOT_FONTSIZE = 10 +DOT_FONTPATH = +CLASS_GRAPH = YES +COLLABORATION_GRAPH = YES +GROUP_GRAPHS = YES +UML_LOOK = NO +TEMPLATE_RELATIONS = YES +INCLUDE_GRAPH = YES +INCLUDED_BY_GRAPH = YES +CALL_GRAPH = YES +CALLER_GRAPH = YES +GRAPHICAL_HIERARCHY = YES +DIRECTORY_GRAPH = YES +DOT_IMAGE_FORMAT = jpg +DOT_PATH = +DOTFILE_DIRS = +DOT_GRAPH_MAX_NODES = 50 +MAX_DOT_GRAPH_DEPTH = 0 +DOT_TRANSPARENT = NO +DOT_MULTI_TARGETS = NO +GENERATE_LEGEND = NO +DOT_CLEANUP = YES +#--------------------------------------------------------------------------- +# Configuration::additions related to the search engine +#--------------------------------------------------------------------------- +SEARCHENGINE = YES smesh.patch: inc/SMESHDS_DataMapOfShape.hxx | 2 +- inc/SMESH_IndexedMap.hxx | 4 ++-- src/MEFISTO2/aptrte.cpp | 9 +++++++++ src/SMESH/SMESH_MeshEditor.cpp | 6 ++++++ src/SMESH/SMESH_Pattern.cpp | 6 ++++++ src/SMESHDS/SMESHDS_Mesh.cpp | 8 ++++---- 6 files changed, 28 insertions(+), 7 deletions(-) --- NEW FILE smesh.patch --- diff -Naur smesh-5.1.2.2/inc/SMESHDS_DataMapOfShape.hxx salomesmesh/inc/SMESHDS_DataMapOfShape.hxx --- smesh-5.1.2.2/inc/SMESHDS_DataMapOfShape.hxx 2011-09-27 03:33:02.000000000 -0500 +++ salomesmesh/inc/SMESHDS_DataMapOfShape.hxx 2011-12-20 13:31:11.887317557 -0600 @@ -32,7 +32,7 @@ * This method needed for instance NCollection_DataMap with TopoDS_Shape as key */ -inline Standard_Boolean SMESH_IsEqual(const TopoDS_Shape& S1, +inline Standard_Boolean IsEqual(const TopoDS_Shape& S1, const TopoDS_Shape& S2) { return S1.IsSame(S2); diff -Naur smesh-5.1.2.2/inc/SMESH_IndexedMap.hxx salomesmesh/inc/SMESH_IndexedMap.hxx --- smesh-5.1.2.2/inc/SMESH_IndexedMap.hxx 2011-09-27 03:33:02.000000000 -0500 +++ salomesmesh/inc/SMESH_IndexedMap.hxx 2011-12-20 13:31:11.819319791 -0600 @@ -226,7 +226,7 @@ pNode = (IndexedMapNode *) myData1[iK1]; while (pNode) { - if (SMESH_IsEqual (pNode->Key1(), theKey1)) + if (IsEqual (pNode->Key1(), theKey1)) return pNode->Key2(); pNode = (IndexedMapNode *) pNode->Next(); } @@ -249,7 +249,7 @@ pNode1 = (IndexedMapNode *) myData1[iK1]; while (pNode1) { - if (SMESH_IsEqual(pNode1->Key1(), theKey1)) + if (IsEqual(pNode1->Key1(), theKey1)) return Standard_True; pNode1 = (IndexedMapNode *) pNode1->Next(); } diff -Naur smesh-5.1.2.2/src/MEFISTO2/aptrte.cpp salomesmesh/src/MEFISTO2/aptrte.cpp --- smesh-5.1.2.2/src/MEFISTO2/aptrte.cpp 2009-12-17 02:32:26.000000000 -0600 +++ salomesmesh/src/MEFISTO2/aptrte.cpp 2011-12-20 13:31:11.641325642 -0600 @@ -847,3 +847,12 @@ MESSAGE(" "); return; } + +// Weird workaround needed to solve problem with libf2c +#if defined(__GNUC__) +extern "C" { +int MAIN__( ) +{ return 0;} +} +#endif + diff -Naur smesh-5.1.2.2/src/SMESH/SMESH_MeshEditor.cpp salomesmesh/src/SMESH/SMESH_MeshEditor.cpp --- smesh-5.1.2.2/src/SMESH/SMESH_MeshEditor.cpp 2011-03-09 12:47:47.000000000 -0600 +++ salomesmesh/src/SMESH/SMESH_MeshEditor.cpp 2011-12-20 13:31:11.755321896 -0600 @@ -56,6 +56,7 @@ #include <Geom_Curve.hxx> #include <Geom_Surface.hxx> #include <Precision.hxx> +#include <Standard_Version.hxx> #include <TColStd_ListOfInteger.hxx> #include <TopAbs_State.hxx> #include <TopExp.hxx> @@ -2205,8 +2206,13 @@ if ( projector.IsDone() ) { double u, v, minVal = DBL_MAX; for ( int i = projector.NbExt(); i > 0; i-- ) +#if OCC_VERSION_HEX >= 0x060500 if ( projector.SquareDistance( i ) < minVal ) { minVal = projector.SquareDistance( i ); +#else + if ( projector.Value( i ) < minVal ) { + minVal = projector.Value( i ); +#endif projector.Point( i ).Parameter( u, v ); } result.SetCoord( u, v ); diff -Naur smesh-5.1.2.2/src/SMESH/SMESH_Pattern.cpp salomesmesh/src/SMESH/SMESH_Pattern.cpp --- smesh-5.1.2.2/src/SMESH/SMESH_Pattern.cpp 2011-03-09 12:47:47.000000000 -0600 +++ salomesmesh/src/SMESH/SMESH_Pattern.cpp 2011-12-20 13:31:11.766321534 -0600 @@ -39,6 +39,7 @@ #include <GeomAdaptor_Surface.hxx> #include <Geom_Curve.hxx> #include <Geom_Surface.hxx> +#include <Standard_Version.hxx> #include <TopAbs_ShapeEnum.hxx> #include <TopExp.hxx> #include <TopExp_Explorer.hxx> @@ -436,8 +437,13 @@ } double u, v, minVal = DBL_MAX; for ( int i = theProjectorPS.NbExt(); i > 0; i-- ) +#if OCC_VERSION_HEX >= 0x060500 if ( theProjectorPS.SquareDistance( i ) < minVal ) { minVal = theProjectorPS.SquareDistance( i ); +#else + if ( theProjectorPS.Value( i ) < minVal ) { + minVal = theProjectorPS.Value( i ); +#endif theProjectorPS.Point( i ).Parameter( u, v ); } return gp_XY( u, v ); diff -Naur smesh-5.1.2.2/src/SMESHDS/SMESHDS_Mesh.cpp salomesmesh/src/SMESHDS/SMESHDS_Mesh.cpp --- smesh-5.1.2.2/src/SMESHDS/SMESHDS_Mesh.cpp 2011-09-27 03:33:02.000000000 -0500 +++ salomesmesh/src/SMESHDS/SMESHDS_Mesh.cpp 2011-12-20 13:31:11.619326365 -0600 @@ -42,10 +42,10 @@ using namespace std; -Standard_Boolean IsEqual( const TopoDS_Shape& S1, const TopoDS_Shape& S2 ) -{ - return S1.IsSame( S2 ); -} +/*Standard_Boolean IsEqual( const TopoDS_Shape& S1, const TopoDS_Shape& S2 ) + { + return S1.IsSame( S2 ); + }*/ //======================================================================= //function : Create --- NEW FILE smesh.spec --- Name: smesh Version: 5.1.2.2 Release: 2.svn54%{?dist} Summary: OpenCascade based MESH framework # This library is LGPLv2+ but links against the non-free library OCE. License: GPLv2 with exception URL: https://sourceforge.net/projects/salomesmesh # Source is svn checkout since the last release is too old: # https://salomesmesh.svn.sourceforge.net/svnroot/salomesmesh/trunk Source0: smesh-5.1.2.2-svn54.tar.gz # Patch emailed upstream to Fotios Sioutis <sfotis(a)gmail.com&gt; # on 12/21/11. Patch0: smesh.patch Patch1: smesh-cmake_fixes.patch BuildRequires: cmake doxygen BuildRequires: OCE-devel BuildRequires: boost-devel BuildRequires: gcc-gfortran BuildRequires: f2c BuildRequires: dos2unix %description A complete OpenCascade based MESH framework. %package doc Summary: Development documentation for %{name} Requires: %{name} = %{version}-%{release} BuildArch: noarch %description doc Development documentation for %{name}. %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} %description devel Development files and headers for %{name}. %prep %setup -q -c %{name}-%{version} %patch0 -p1 %patch1 -p1 -b .cmakefix dos2unix -k LICENCE.lgpl.txt %build rm -rf build && mkdir build && pushd build LDFLAGS='-Wl,--as-needed'; export LDFLAGS %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DOCC_INCLUDE_PATH=%{_includedir}/oce \ .. make %{?_smp_mflags} # Build documentation make doc popd # Remove install script since we don't need it. rm -f doc/html/installdox %install pushd build make install DESTDIR=%{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %doc LICENCE.lgpl.txt %{_libdir}/*.so.* %files doc %doc doc/html %files devel %{_includedir}/* %{_libdir}/*.so %changelog * Thu Jan 19 2012 Richard Shaw <hobbes1069(a)gmail.com&gt; - 5.1.2.2-2.svn54 - Minor updates to spec file. * Tue Dec 20 2011 Richard Shaw <hobbes1069(a)gmail.com&gt; - 5.1.2.2-1.svn54 - Initial release. Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/smesh/F-15/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 24 Jan 2012 22:13:06 -0000 1.1 +++ sources 27 Jan 2012 20:09:54 -0000 1.2 @@ -0,0 +1 @@ +00ed8a488d1ddeb05d1777430094df80 smesh-5.1.2.2-svn54.tar.gz