Accepting request 330981 from home:badshah400:branches:science

Update to version 4.4.0

OBS-URL: https://build.opensuse.org/request/show/330981
OBS-URL: https://build.opensuse.org/package/show/science/paraview?expand=0&rev=33
This commit is contained in:
Ismail Dönmez 2015-09-15 07:48:44 +00:00 committed by Git OBS Bridge
parent df26edb168
commit ee46cfc015
5 changed files with 16 additions and 32 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d534c475fc052215ecadf4ad19d9c7996c634b5d965951292b966710509a2542
size 50842525

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c2dc334a89df24ce5233b81b74740fc9f10bc181cd604109fd13f6ad2381fc73
size 58397252

View File

@ -1,24 +0,0 @@
Index: ParaView-v4.2.0-source/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx
===================================================================
--- ParaView-v4.2.0-source.orig/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx
+++ ParaView-v4.2.0-source/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx
@@ -1183,7 +1183,7 @@ bool vtkFreeTypeTools::CalculateBounding
if (bitmap)
{
metaData.ascent = std::max(bitmapGlyph->top - 1, metaData.ascent);
- metaData.descent = std::min(-(bitmap->rows - (bitmapGlyph->top - 1)),
+ metaData.descent = std::min(-(static_cast<int>(bitmap->rows) - (bitmapGlyph->top - 1)),
metaData.descent);
}
++heightString;
@@ -1950,8 +1950,8 @@ void vtkFreeTypeTools::GetLineMetrics(T
if (bitmap)
{
bbox[0] = std::min(bbox[0], pen[0] + bitmapGlyph->left);
- bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + bitmap->width);
- bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - bitmap->rows);
+ bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + static_cast<int>(bitmap->width));
+ bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - static_cast<int>(bitmap->rows));
bbox[3] = std::max(bbox[3], pen[1] + bitmapGlyph->top - 1);
}
else

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Sep 14 21:44:39 UTC 2015 - badshah400@gmail.com
- Update to version 4.4.0:
+ List of changes at
http://www.paraview.org/Bug/changelog_page.php?version_id=114.
- Drop paraview-freetype-2.5.4.patch: incorporated upstream.
-------------------------------------------------------------------
Sat Feb 14 06:32:22 UTC 2015 - foss@grueninger.de

View File

@ -16,9 +16,9 @@
#
%define major_ver 4.3
%define major_ver 4.4
Name: paraview
Version: 4.3.1
Version: 4.4.0
Release: 0
Summary: Data analysis and visualization application
License: BSD-3-Clause
@ -32,8 +32,6 @@ 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
# PATCH-FIx-UPSTREAM paraview-freetype-2.5.4.patch dimstar@opensuse.org -- Fix build with FreeType 2.5.4+
Patch3: paraview-freetype-2.5.4.patch
BuildRequires: Mesa-devel
BuildRequires: boost-devel
BuildRequires: cmake >= 2.8.8
@ -116,7 +114,6 @@ This package provides the SciberQuestToolKit plugin for paraview.
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
# Prepare for gcc 4.9.0: work around gcc 4.9.0 regression
@ -183,6 +180,9 @@ done
%py_compile %{buildroot}%{_libdir}/%{name}/site-packages/paraview/vtk/util
# UNNECESSARY STATIC LIB
rm -fr %{buildroot}%{_libexecdir}/libFmmMesh.a
%fdupes %{buildroot}/
%post