forked from pool/paraview
Accepting request 403965 from home:mathletic:branches:science
update to paraview 5.1.0 It claims to need CMake 3.5, but this ParaView also works with CMake 3.0, as they did not change that much. OBS-URL: https://build.opensuse.org/request/show/403965 OBS-URL: https://build.opensuse.org/package/show/science/paraview?expand=0&rev=40
This commit is contained in:
Matthias Mailänder
Git OBS Bridge
parent
e0811efca6
commit
16d37c57c3
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:caddec83ec284162a2cbc46877b0e5a9d2cca59fb4ab0ea35b0948d2492950bb
|
||||
size 59469448
|
||||
3
ParaView-v5.1.0.tar.gz
Normal file
3
ParaView-v5.1.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1ce345e9c5533c2854ad7e89cf4f90992bafee23707ae9f85d12b38405169f2a
|
||||
size 51613148
|
||||
@ -1,28 +1,20 @@
|
||||
Index: ParaView-v4.2.0-source/CMake/branded_paraview_main.cxx.in
|
||||
===================================================================
|
||||
--- ParaView-v4.2.0-source.orig/CMake/branded_paraview_main.cxx.in
|
||||
+++ ParaView-v4.2.0-source/CMake/branded_paraview_main.cxx.in
|
||||
@@ -48,7 +48,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
|
||||
#endif
|
||||
|
||||
#ifdef Q_WS_X11
|
||||
-#include <QPlastiqueStyle>
|
||||
+#include <QStyle>
|
||||
#endif
|
||||
|
||||
#include <stdlib.h>
|
||||
@@ -72,12 +72,12 @@ static bool checkenv(const char* vname)
|
||||
--- ParaView-v5.1.0_old/CMake/branded_paraview_main.cxx.in 2016-06-18 11:39:09.000000000 -0400
|
||||
+++ ParaView-v5.1.0/CMake/branded_paraview_main.cxx.in 2016-06-21 08:01:39.384393053 -0400
|
||||
@@ -72,15 +72,15 @@
|
||||
|
||||
int main(int argc, char* argv[])
|
||||
{
|
||||
-#ifdef Q_WS_X11
|
||||
+// #ifdef Q_WS_X11
|
||||
-#if defined(Q_WS_X11) || defined(Q_OS_LINUX)
|
||||
+// #if defined(Q_WS_X11) || defined(Q_OS_LINUX)
|
||||
// Using motif style gives us test failures (and its ugly).
|
||||
// Using cleanlooks style gives us errors when using valgrind (Trolltech's bug #179200)
|
||||
// let's just use plastique for now
|
||||
- QApplication::setStyle(new QPlastiqueStyle);
|
||||
|
||||
// "plastique" is only available on Qt4, but this works just fine with Qt5 too. Qt5 just uses the
|
||||
// default style when QStyleFactory::create("plastique") return nullptr.
|
||||
- QApplication::setStyle(QStyleFactory::create("plastique"));
|
||||
-#endif
|
||||
+ // QApplication::setStyle(new QPlastiqueStyle);
|
||||
+// QApplication::setStyle(QStyleFactory::create("plastique"));
|
||||
+// #endif
|
||||
|
||||
// When playing tests, disable all effects.
|
||||
|
||||
@ -1,3 +1,18 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 21 11:45:20 UTC 2016 - foss@grueninger.de
|
||||
|
||||
- update to version 5.1.0
|
||||
+ add OSPRay ray tracing renderer
|
||||
+ interpolating point clouds
|
||||
+ generic arrays
|
||||
+ x-ray view
|
||||
+ resampling to image
|
||||
+ List of changes at
|
||||
http://www.paraview.org/Bug/changelog_page.php?version_id=122
|
||||
- adjust patch paraview-default-qtstyle.patch
|
||||
- add require-only-cmake-3_0.patch to lower required CMake verstion
|
||||
to 3.0
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 30 08:40:36 UTC 2016 - foss@grueninger.de
|
||||
|
||||
|
||||
@ -16,15 +16,15 @@
|
||||
#
|
||||
|
||||
|
||||
%define major_ver 5.0
|
||||
%define major_ver 5.1
|
||||
Name: paraview
|
||||
Version: 5.0.1
|
||||
Version: 5.1.0
|
||||
Release: 0
|
||||
Summary: Data analysis and visualization application
|
||||
License: BSD-3-Clause
|
||||
Group: Productivity/Scientific/Physics
|
||||
Url: http://www.paraview.org
|
||||
Source0: http://www.paraview.org/files/v%{major_ver}/ParaView-v%{version}-source.tar.gz
|
||||
Source0: http://www.paraview.org/files/v%{major_ver}/ParaView-v%{version}.tar.gz
|
||||
Source1: %{name}-rpmlintrc
|
||||
# PATCH-FIX-OPENSUSE paraview-default-qtstyle.patch badshah400@gmail.com -- Make paraview inherit default qt gui look and feel, instead of using the Plastique theme
|
||||
Patch0: paraview-default-qtstyle.patch
|
||||
@ -32,9 +32,10 @@ Patch0: paraview-default-qtstyle.patch
|
||||
Patch1: paraview-desktop-entry-fix.patch
|
||||
# PATCH-FIX-UPSTREAM paraview-fix-file-contains-date-time.patch badshah400@gmail.com -- Remove reference to __DATE__ and __TIME__ from source
|
||||
Patch2: paraview-fix-file-contains-date-time.patch
|
||||
Patch3: require-only-cmake-3_0.patch
|
||||
BuildRequires: Mesa-devel
|
||||
BuildRequires: boost-devel
|
||||
BuildRequires: cmake >= 2.8.8
|
||||
BuildRequires: cmake >= 3.0
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: gnuplot
|
||||
@ -110,10 +111,11 @@ This package provides the SciberQuestToolKit plugin for paraview.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n ParaView-v%{version}-source
|
||||
%setup -q -n ParaView-v%{version}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
|
||||
%build
|
||||
# Prepare for gcc 4.9.0: work around gcc 4.9.0 regression
|
||||
|
||||
11
require-only-cmake-3_0.patch
Normal file
11
require-only-cmake-3_0.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- ParaView-v5.1.0_old/CMakeLists.txt 2016-06-18 11:39:09.000000000 -0400
|
||||
+++ ParaView-v5.1.0/CMakeLists.txt 2016-06-21 04:42:25.261364363 -0400
|
||||
@@ -28,7 +28,7 @@
|
||||
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
#
|
||||
#==========================================================================
|
||||
-cmake_minimum_required(VERSION 3.5)
|
||||
+cmake_minimum_required(VERSION 3.0)
|
||||
|
||||
project(ParaView)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user