| 1 |
markusle 08/05/26 16:22:53 |
| 2 |
|
| 3 |
Added: paraview-3.3_pre20080514-qt4.4.patch |
| 4 |
Removed: paraview-3.3_pre20080514-qt.patch |
| 5 |
Log: |
| 6 |
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. |
| 7 |
(Portage version: 2.1.5.2) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-visualization/paraview/files/paraview-3.3_pre20080514-qt4.4.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/paraview/files/paraview-3.3_pre20080514-qt4.4.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/paraview/files/paraview-3.3_pre20080514-qt4.4.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: paraview-3.3_pre20080514-qt4.4.patch |
| 16 |
=================================================================== |
| 17 |
diff -Naur ParaView3/Applications/Client/CMakeLists.txt ParaView3.new/Applications/Client/CMakeLists.txt |
| 18 |
--- ParaView3/Applications/Client/CMakeLists.txt 2008-04-01 12:47:19.000000000 -0400 |
| 19 |
+++ ParaView3.new/Applications/Client/CMakeLists.txt 2008-05-25 21:13:29.000000000 -0400 |
| 20 |
@@ -516,34 +516,34 @@ |
| 21 |
ENDIF(FFMPEG_${fmpglib}_LIBRARY) |
| 22 |
ENDFOREACH(fmpglib) |
| 23 |
|
| 24 |
-SET (QTLIBLIST QTCORE QTGUI QTNETWORK QTXML QTTEST QTSQL) |
| 25 |
+#SET (QTLIBLIST QTCORE QTGUI QTNETWORK QTXML QTTEST QTSQL) |
| 26 |
# the variable and library names are not the same |
| 27 |
-IF (WIN32) |
| 28 |
- SET (QTLIBLIST ${QTLIBLIST} QTASSISTANTCLIENT) |
| 29 |
-ELSE (WIN32) |
| 30 |
- SET (QTLIBLIST ${QTLIBLIST} QTASSISTANT) |
| 31 |
-ENDIF (WIN32) |
| 32 |
+#IF (WIN32) |
| 33 |
+# SET (QTLIBLIST ${QTLIBLIST} QTASSISTANTCLIENT) |
| 34 |
+#ELSE (WIN32) |
| 35 |
+# SET (QTLIBLIST ${QTLIBLIST} QTASSISTANT) |
| 36 |
+#ENDIF (WIN32) |
| 37 |
|
| 38 |
-IF(NOT Q_WS_MAC) |
| 39 |
- FOREACH(qtlib ${QTLIBLIST}) |
| 40 |
- IF (NOT WIN32) |
| 41 |
+#IF(NOT Q_WS_MAC) |
| 42 |
+# FOREACH(qtlib ${QTLIBLIST}) |
| 43 |
+# IF (NOT WIN32) |
| 44 |
#INSTALL(FILES ${QT_${qtlib}_LIBRARY_RELEASE} DESTINATION ${PV_INSTALL_LIB_DIR_CM24}) |
| 45 |
- GET_FILENAME_COMPONENT(QT_LIB_DIR_tmp ${QT_${qtlib}_LIBRARY_RELEASE} PATH) |
| 46 |
- GET_FILENAME_COMPONENT(QT_LIB_NAME_tmp ${QT_${qtlib}_LIBRARY_RELEASE} NAME) |
| 47 |
- FILE(GLOB QT_LIB_LIST RELATIVE ${QT_LIB_DIR_tmp} "${QT_${qtlib}_LIBRARY_RELEASE}*") |
| 48 |
- INSTALL(CODE " |
| 49 |
-MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR_CM24}/${QT_LIB_NAME_tmp}\") |
| 50 |
-EXECUTE_PROCESS (WORKING_DIRECTORY ${QT_LIB_DIR_tmp} |
| 51 |
- COMMAND tar c ${QT_LIB_LIST} |
| 52 |
- COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR_CM24}) |
| 53 |
- " COMPONENT Runtime) |
| 54 |
- ELSE (NOT WIN32) |
| 55 |
- GET_FILENAME_COMPONENT(QT_DLL_PATH_tmp ${QT_QMAKE_EXECUTABLE} PATH) |
| 56 |
- INSTALL(FILES ${QT_DLL_PATH_tmp}/${qtlib}4.dll DESTINATION ${PV_INSTALL_BIN_DIR_CM24} COMPONENT Runtime) |
| 57 |
- ENDIF (NOT WIN32) |
| 58 |
+ # GET_FILENAME_COMPONENT(QT_LIB_DIR_tmp ${QT_${qtlib}_LIBRARY_RELEASE} PATH) |
| 59 |
+ # GET_FILENAME_COMPONENT(QT_LIB_NAME_tmp ${QT_${qtlib}_LIBRARY_RELEASE} NAME) |
| 60 |
+ #FILE(GLOB QT_LIB_LIST RELATIVE ${QT_LIB_DIR_tmp} "${QT_${qtlib}_LIBRARY_RELEASE}*") |
| 61 |
+ # INSTALL(CODE " |
| 62 |
+ #MESSAGE(STATUS \"Installing \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR_CM24}/${QT_LIB_NAME_tmp}\") |
| 63 |
+ #EXECUTE_PROCESS (WORKING_DIRECTORY ${QT_LIB_DIR_tmp} |
| 64 |
+ # COMMAND tar c ${QT_LIB_LIST} |
| 65 |
+ # COMMAND tar -xC \${CMAKE_INSTALL_PREFIX}/${PV_INSTALL_LIB_DIR_CM24}) |
| 66 |
+ # " COMPONENT Runtime) |
| 67 |
+ # ELSE (NOT WIN32) |
| 68 |
+ # GET_FILENAME_COMPONENT(QT_DLL_PATH_tmp ${QT_QMAKE_EXECUTABLE} PATH) |
| 69 |
+ # INSTALL(FILES ${QT_DLL_PATH_tmp}/${qtlib}4.dll DESTINATION ${PV_INSTALL_BIN_DIR_CM24} COMPONENT Runtime) |
| 70 |
+ # ENDIF (NOT WIN32) |
| 71 |
|
| 72 |
- ENDFOREACH(qtlib) |
| 73 |
-ENDIF(NOT Q_WS_MAC) |
| 74 |
+ # ENDFOREACH(qtlib) |
| 75 |
+ #ENDIF(NOT Q_WS_MAC) |
| 76 |
|
| 77 |
# Hard-coded install rules for anything left to install. These should |
| 78 |
# probably go to a local cmake file. Change to match the build system's |
| 79 |
diff -Naur ParaView3/CMakeLists.txt ParaView3.new/CMakeLists.txt |
| 80 |
--- ParaView3/CMakeLists.txt 2008-04-16 13:06:41.000000000 -0400 |
| 81 |
+++ ParaView3.new/CMakeLists.txt 2008-05-25 21:01:03.000000000 -0400 |
| 82 |
@@ -89,7 +89,7 @@ |
| 83 |
MESSAGE(SEND_ERROR "Qt ${QT_MIN_VERSION} or greater not found. Please check the QT_QMAKE_EXECUTABLE variable.") |
| 84 |
ELSE(NOT QT4_FOUND) |
| 85 |
# don't go greater than supported version |
| 86 |
- STRING(REGEX MATCH "^4\\.3\\.[0-9]+" qt_version_tmp "${QTVERSION}") |
| 87 |
+ STRING(REGEX MATCH "^4\\.[3-4]\\.[0-9]+" qt_version_tmp "${QTVERSION}") |
| 88 |
IF (NOT qt_version_tmp) |
| 89 |
MESSAGE(SEND_ERROR "Qt ${QTVERSION} not supported. Please use Qt 4.3 (you may need to clean your dirtied cache).") |
| 90 |
ENDIF (NOT qt_version_tmp) |
| 91 |
|
| 92 |
|
| 93 |
|
| 94 |
-- |
| 95 |
gentoo-commits@l.g.o mailing list |
Archives