Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22460
Modified Files: paraview.patch Log Message: update to 3.4 and assume maintainership Index: paraview.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/paraview.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- paraview.patch 18 Mar 2007 17:33:42 -0000 1.1 +++ paraview.patch 5 May 2009 01:37:08 -0000 1.2 @@ -1,17 +1,72 @@ ---- ParaView-2.6.0/CMake/ParaViewCommon.cmake~ 2006-10-24 17:12:48.000000000 +0200 -+++ ParaView-2.6.0/CMake/ParaViewCommon.cmake 2007-03-18 17:52:55.000000000 +0100 -@@ -66,12 +66,12 @@ - INCLUDE(${VTK_CMAKE_DIR}/vtkSelectSharedLibraries.cmake) +--- ParaView3.3.0-20080717/Applications/Client/CMakeLists.txt.install 2008-07-17 13:22:39.000000000 -0600 ++++ ParaView3.3.0-20080717/Applications/Client/CMakeLists.txt 2008-07-18 16:05:03.000000000 -0600 +@@ -552,12 +552,6 @@ + GET_FILENAME_COMPONENT(QT_LIB_DIR_tmp ${QT_${qtlib}_LIBRARY_RELEASE} PATH) + GET_FILENAME_COMPONENT(QT_LIB_NAME_tmp ${QT_${qtlib}_LIBRARY_RELEASE} NAME) + FILE(GLOB QT_LIB_LIST RELATIVE ${QT_LIB_DIR_tmp} "${QT_${qtlib}_LIBRARY_RELEASE}*") +- INSTALL(CODE " +-MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR_CM24}/${QT_LIB_NAME_tmp}\") +-EXECUTE_PROCESS (WORKING_DIRECTORY ${QT_LIB_DIR_tmp} +- COMMAND tar c ${QT_LIB_LIST} +- COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR_CM24}) +- " COMPONENT Runtime) + ELSE (NOT WIN32) + GET_FILENAME_COMPONENT(QT_DLL_PATH_tmp ${QT_QMAKE_EXECUTABLE} PATH) + INSTALL(FILES ${QT_DLL_PATH_tmp}/${qtlib}4.dll DESTINATION ${PV_INSTALL_BIN_DIR_CM24} COMPONENT Runtime) +--- ParaView3.2.1/Applications/Client/MainWindow.cxx.assistant-qt4 2007-11-07 13:52:05.000000000 -0700 ++++ ParaView3.2.1/Applications/Client/MainWindow.cxx 2007-12-03 14:30:44.000000000 -0700 +@@ -896,7 +896,7 @@ + QString assistantExe; + QString profileFile; - # Disable the install targets if using the rpath feature. --IF(NOT WIN32) -+IF(NOT WIN32 AND NOT APPLE) - IF(VTK_USE_RPATH) - SET(PV_INSTALL_NO_DEVELOPMENT 1) - SET(PV_INSTALL_NO_RUNTIME 1) - ENDIF(VTK_USE_RPATH) --ENDIF(NOT WIN32) -+ENDIF(NOT WIN32 AND NOT APPLE) +- const char* assistantName = "assistant"; ++ const char* assistantName = "assistant-qt4"; + #if defined(Q_WS_WIN) + const char* binDir = "\\"; + const char* binDir1 = "\\..\\"; +--- ParaView3.3.0-20080715/Utilities/Xdmf2/libsrc/XdmfArray.h.gcc43 2008-06-26 14:52:35.000000000 -0600 ++++ ParaView3.3.0-20080715/Utilities/Xdmf2/libsrc/XdmfArray.h 2008-07-16 12:03:40.000000000 -0600 +@@ -26,6 +26,7 @@ + #define __XdmfArray_h - # ParaView needs static Tcl/Tk if not using shared libraries. - IF(NOT BUILD_SHARED_LIBS) + #include "XdmfDataDesc.h" ++#include <cstdlib> + + #define XDMF_LONGEST_LENGTH (XdmfInt64)~0 + #define XDMF_ARRAY_TAG_LENGTH 80 +--- ParaView3.3.0-20080715/Utilities/Xdmf2/libsrc/XdmfDataDesc.h.gcc43 2008-03-04 14:54:42.000000000 -0700 ++++ ParaView3.3.0-20080715/Utilities/Xdmf2/libsrc/XdmfDataDesc.h 2008-07-16 12:03:40.000000000 -0600 +@@ -27,6 +27,7 @@ + + #include "XdmfObject.h" + #include "XdmfHDFSupport.h" ++#include <cstring> + + #define XDMF_SELECTALL 0 + #define XDMF_HYPERSLAB 1 +--- ParaView3.3.0-20080715/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx.gcc43 2008-07-15 17:22:46.000000000 -0600 ++++ ParaView3.3.0-20080715/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx 2008-07-16 12:03:40.000000000 -0600 +@@ -34,6 +34,7 @@ + #include "XdmfDsmComm.h" + #include "assert.h" + #include "hdf5.h" ++#include <cstring> + + #include <stdlib.h> + +--- ParaView-3.4.0/CMakeLists.txt.qt 2008-09-12 07:33:51.000000000 -0600 ++++ ParaView-3.4.0/CMakeLists.txt 2009-02-24 12:48:19.000000000 -0700 +@@ -91,12 +91,7 @@ + # don't go greater than supported version + STRING(REGEX MATCH "^4\\.3\\.[0-9]+" qt_version_tmp "${QTVERSION}") + IF (NOT qt_version_tmp) +- STRING(REGEX MATCH "^4\\.4\\.[0-9]+" qt_version4_4_tmp "${QTVERSION}") +- IF (NOT qt_version4_4_tmp) +- MESSAGE(SEND_ERROR "Qt ${QTVERSION} not supported. Please use Qt 4.3 (you may need to clean your dirtied cache).") +- ELSE (NOT qt_version4_4_tmp) +- MESSAGE("WARNING: You are using Qt ${QTVERSION}. Officially supported version is Qt 4.3") +- ENDIF (NOT qt_version4_4_tmp) ++ MESSAGE("WARNING: You are using Qt ${QTVERSION}. Officially supported version is Qt 4.3") + ENDIF (NOT qt_version_tmp) + # enforce Carbon in VTK for Qt/Mac + IF(Q_WS_MAC) ------------------------------------------------------------------------------ The NEW KODAK i700 Series Scanners deliver under ANY circumstances! Your production scanning environment may not be a perfect world - but thanks to Kodak, there's a perfect scanner to get the job done! With the NEW KODAK i700 Series Scanner you'll get full speed at 300 dpi even with all image processing features enabled. http://p.sf.net/sfu/kodak-com _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs