diff options
| author |   Markus Dittrich <markusle@gentoo.org> | 2008-05-26 16:22:52 +0000 |
|---|---|---|
| committer | Markus Dittrich <markusle@gentoo.org> | 2008-05-26 16:22:52 +0000 |
| commit | e514d6d8a70891299516ddbf577cdd878376c72e (patch) | |
| tree | efa1f141051a3b2f724a1b60262fcf91ef040101 /sci-visualization/paraview/files | |
| parent | stable x86, but 223711 (diff) | |
| download | gentoo-2-e514d6d8a70891299516ddbf577cdd878376c72e.tar.gz gentoo-2-e514d6d8a70891299516ddbf577cdd878376c72e.tar.bz2 gentoo-2-e514d6d8a70891299516ddbf577cdd878376c72e.zip | |
Added support for qt4, fixed bogus /usr/plugin install directory and depend explicitly on eselect-opengl to avoid missing declarations in older glext header files.
(Portage version: 2.1.5.2)
Diffstat (limited to 'sci-visualization/paraview/files')
| -rw-r--r-- | sci-visualization/paraview/files/paraview-3.3_pre20080514-qt4.4.patch (renamed from sci-visualization/paraview/files/paraview-3.3_pre20080514-qt.patch) | 56 |
1 files changed, 33 insertions, 23 deletions
diff --git a/sci-visualization/paraview/files/paraview-3.3_pre20080514-qt.patch b/sci-visualization/paraview/files/paraview-3.3_pre20080514-qt4.4.patch index f9993a0b830e..fcf0591b5ad8 100644 --- a/sci-visualization/paraview/files/paraview-3.3_pre20080514-qt.patch +++ b/sci-visualization/paraview/files/paraview-3.3_pre20080514-qt4.4.patch @@ -1,6 +1,6 @@ diff -Naur ParaView3/Applications/Client/CMakeLists.txt ParaView3.new/Applications/Client/CMakeLists.txt --- ParaView3/Applications/Client/CMakeLists.txt 2008-04-01 12:47:19.000000000 -0400 -+++ ParaView3.new/Applications/Client/CMakeLists.txt 2008-05-15 12:23:11.000000000 -0400 ++++ ParaView3.new/Applications/Client/CMakeLists.txt 2008-05-25 21:13:29.000000000 -0400 @@ -516,34 +516,34 @@ ENDIF(FFMPEG_${fmpglib}_LIBRARY) ENDFOREACH(fmpglib) @@ -22,7 +22,10 @@ diff -Naur ParaView3/Applications/Client/CMakeLists.txt ParaView3.new/Applicatio -IF(NOT Q_WS_MAC) - FOREACH(qtlib ${QTLIBLIST}) - IF (NOT WIN32) -- #INSTALL(FILES ${QT_${qtlib}_LIBRARY_RELEASE} DESTINATION ${PV_INSTALL_LIB_DIR_CM24}) ++#IF(NOT Q_WS_MAC) ++# FOREACH(qtlib ${QTLIBLIST}) ++# IF (NOT WIN32) + #INSTALL(FILES ${QT_${qtlib}_LIBRARY_RELEASE} DESTINATION ${PV_INSTALL_LIB_DIR_CM24}) - 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}*") @@ -36,29 +39,36 @@ diff -Naur ParaView3/Applications/Client/CMakeLists.txt ParaView3.new/Applicatio - 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) - ENDIF (NOT WIN32) -- ++ # 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) ++ # ENDIF (NOT WIN32) + - ENDFOREACH(qtlib) -ENDIF(NOT Q_WS_MAC) -+#IF(NOT Q_WS_MAC) -+# FOREACH(qtlib ${QTLIBLIST}) -+# IF (NOT WIN32) -+# #INSTALL(FILES ${QT_${qtlib}_LIBRARY_RELEASE} DESTINATION ${PV_INSTALL_LIB_DIR_CM24}) -+# 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) -+# ENDIF (NOT WIN32) -+# -+# ENDFOREACH(qtlib) -+#ENDIF(NOT Q_WS_MAC) ++ # ENDFOREACH(qtlib) ++ #ENDIF(NOT Q_WS_MAC) # Hard-coded install rules for anything left to install. These should # probably go to a local cmake file. Change to match the build system's +diff -Naur ParaView3/CMakeLists.txt ParaView3.new/CMakeLists.txt +--- ParaView3/CMakeLists.txt 2008-04-16 13:06:41.000000000 -0400 ++++ ParaView3.new/CMakeLists.txt 2008-05-25 21:01:03.000000000 -0400 +@@ -89,7 +89,7 @@ + MESSAGE(SEND_ERROR "Qt ${QT_MIN_VERSION} or greater not found. Please check the QT_QMAKE_EXECUTABLE variable.") + ELSE(NOT QT4_FOUND) + # don't go greater than supported version +- STRING(REGEX MATCH "^4\\.3\\.[0-9]+" qt_version_tmp "${QTVERSION}") ++ STRING(REGEX MATCH "^4\\.[3-4]\\.[0-9]+" qt_version_tmp "${QTVERSION}") + IF (NOT qt_version_tmp) + MESSAGE(SEND_ERROR "Qt ${QTVERSION} not supported. Please use Qt 4.3 (you may need to clean your dirtied cache).") + ENDIF (NOT qt_version_tmp) |