From c181afbf24b0bd5266547e4b29aeafc7a0f458cc Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Feb 24 2009 19:50:27 +0000 Subject: Add patch to allow build with Qt 4.5 --- diff --git a/paraview-3.4.0-qt.patch b/paraview-3.4.0-qt.patch new file mode 100644 index 0000000..1d74b29 --- /dev/null +++ b/paraview-3.4.0-qt.patch @@ -0,0 +1,16 @@ +--- 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) diff --git a/paraview.spec b/paraview.spec index 24ea7b2..4cc5080 100644 --- a/paraview.spec +++ b/paraview.spec @@ -15,6 +15,8 @@ URL: http://www.paraview.org/ Source0: http://www.paraview.org/files/v%{pv_majmin}/paraview-%{version}.tar.gz Source1: paraview_22x22.png Source2: paraview.xml +#Allow build with Qt 4.5 +Patch1: paraview-3.4.0-qt.patch #Don't try to copy Qt libraries into paraview directory Patch2: paraview-3.3.0-install.patch #Move pqClient.adp into %{_datadir}/paraview @@ -105,6 +107,7 @@ Provides: %{name}-mpi-devel = %{version}-%{release} %prep %setup -q -n ParaView-%{version} +%patch1 -p1 -b .qt %patch2 -p1 -b .install %patch3 -p1 -b .doc %patch4 -p1 -b .assistant-qt4 @@ -324,6 +327,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog * Tue Feb 24 2009 Orion Poplawski - 3.4.0-4 - Rebuild with hdf 1.8.2, gcc 4.4.0 +- Add patch to allow build with Qt 4.5 * Sat Jan 17 2009 Tomas Mraz - 3.4.0-3 - rebuild with new openssl