commit 2e7b177aaf7c654fe31fa7b81d48b3b1a7375515
Author: Jan Rękorajski <[email protected]>
Date: Sat May 19 08:14:20 2018 +0900
- started update to 5.5.0
ParaView-install.patch | 12 ------
ParaView-kwprocessxml_rpath.patch | 27 --------------
ParaView-system-Protobuf.patch | 60 ------------------------------
ParaView-system-netcdf.patch | 75 --------------------------------------
ParaView-vtk-use-system-libs.patch | 27 --------------
ParaView.spec | 68 +++++++++++++++-------------------
disable-broken-tests.patch | 17 ---------
freetype.patch | 22 -----------
protobuf.patch | 64 --------------------------------
9 files changed, 30 insertions(+), 342 deletions(-)
---
diff --git a/ParaView.spec b/ParaView.spec
index 55f7840..104cfad 100644
--- a/ParaView.spec
+++ b/ParaView.spec
@@ -5,30 +5,23 @@
Summary: Parallel visualization application
Summary(pl.UTF-8): Aplikacja do równoległej wizualizacji
Name: ParaView
-Version: 4.0.1
-Release: 18
+Version: 5.5.0
+Release: 0.1
License: BSD
Group: Applications/Engineering
-Source0:
http://www.paraview.org/files/v4.0/%{name}-v%{version}-source.tgz
-# Source0-md5: 6a300744eaf32676a3a7e1b42eb642c7
+Source0: http://www.paraview.org/files/v5.5/%{name}-v%{version}.tar.gz
+# Source0-md5: a8f2f41edadffdcc89b37fdc9aa7f005
Source1: %{name}_22x22.png
Source2: %{name}.xml
-Patch0: %{name}-vtk-use-system-libs.patch
-Patch1: %{name}-install.patch
-Patch2: %{name}-system-Protobuf.patch
-Patch3: %{name}-system-netcdf.patch
-Patch4: disable-broken-tests.patch
-Patch5: protobuf.patch
-Patch6: freetype.patch
URL: http://www.paraview.org/
BuildRequires: Mesa-libOSMesa-devel
-BuildRequires: QtDesigner-devel
-BuildRequires: QtHelp-devel
-BuildRequires: QtSql-devel
-BuildRequires: QtSql-sqlite3
-BuildRequires: QtUiTools-devel
-BuildRequires: QtXmlPatterns-devel
-BuildRequires: QtWebKit-devel
+BuildRequires: Qt5Designer-devel
+BuildRequires: Qt5Help-devel
+BuildRequires: Qt5Sql-devel
+BuildRequires: Qt5Sql-sqldriver-sqlite3
+BuildRequires: Qt5UiTools-devel
+BuildRequires: Qt5XmlPatterns-devel
+BuildRequires: Qt5WebKit-devel
BuildRequires: boost-devel
BuildRequires: cmake
BuildRequires: desktop-file-utils
@@ -48,14 +41,15 @@ BuildRequires: netcdf-cxx-devel
BuildRequires: openssl-devel
%{?with_system_protobuf:BuildRequires: protobuf-devel}
BuildRequires: python-devel
-BuildRequires: qt4-build
+BuildRequires: qt5-assistant
+BuildRequires: qt5-build
BuildRequires: readline-devel
BuildRequires: tk-devel
BuildRequires: wget
BuildRequires: zlib-devel
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
-Requires: QtSql-sqlite3
+Requires: Qt5Sql-sqldriver-sqlite3
%requires_eq_to hdf5 hdf5-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -121,33 +115,28 @@ Ten pakiet zawiera pliki nagłówkowe do tworzenia aplikacji
wykorzystujących ParaView.
%prep
-%setup -q -n %{name}-v%{version}-source
-%patch0 -p0
-%patch1 -p1
-%patch3 -p0
-%patch4 -p1
-%patch6 -p1
+%setup -q -n %{name}-v%{version}
%if %{with system_protobuf}
-%patch2 -p1
-%patch5 -p1
#Remove included thirdparty sources just to be sure
-for x in protobuf ; do
- %{__rm} -r ThirdParty/$x/vtk$x
-done
+%{__rm} -r ThirdParty/protobuf/vtkprotobuf
%endif
-for x in expat freetype gl2ps hdf5 jpeg libxml2 netcdf oggtheora png sqlite
tiff zlib ; do
+for x in expat freetype hdf5 jpeg libxml2 netcdf png sqlite tiff zlib ; do
%{__rm} -r VTK/ThirdParty/$x/vtk$x
done
-%{__rm} -r ParaViewCore/ServerImplementation/Default/Testing
-
%build
rm -rf build
mkdir build
cd build
%cmake .. \
+ -DCMAKE_CXX_FLAGS="%{rpmcxxflags} -DNDEBUG -DQT_NO_DEBUG" \
+ -DCMAKE_C_FLAGS="%{rpmcflags} -DNDEBUG -DQT_NO_DEBUG" \
+ -DCMAKE_Fortran_FLAGS="%{rpmcflags} -DNDEBUG -DQT_NO_DEBUG" \
+ -DCMAKE_EXE_LINKER_FLAGS="%{rpmldflags}" \
+ -DCMAKE_SHARED_LINKER_FLAGS="%{rpmldflags}" \
+ -DCMAKE_MODULE_LINKER_FLAGS="%{rpmldflags}" \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_CXX_COMPILER:FILEPATH=%{__cxx} \
-DCMAKE_C_COMPILER:FILEPATH=%{__cc} \
@@ -156,12 +145,11 @@ cd build
-DTCL_LIBRARY:PATH=tcl \
-DTK_LIBRARY:PATH=tk \
-DPARAVIEW_BUILD_PLUGIN_AdiosReader:BOOL=ON \
- -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=ON \
-DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting:BOOL=ON \
- -DPARAVIEW_BUILD_PLUGIN_ForceTime:BOOL=ON \
-DPARAVIEW_ENABLE_PYTHON:BOOL=ON \
- -DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES:BOOL=OFF \
-DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON \
+ -DQT_XMLPATTERNS_EXECUTABLE:FILEPATH=%{_bindir}/xmlpatterns-qt5 \
+ -DQT_HELP_GENERATOR:FILEPATH=%{_bindir}/qhelpgenerator-qt5 \
-DVTK_INSTALL_ARCHIVE_DIR:PATH=%{_lib}/paraview \
-DVTK_INSTALL_INCLUDE_DIR:PATH=include/paraview \
-DVTK_INSTALL_LIBRARY_DIR:PATH=%{_lib}/paraview \
@@ -177,7 +165,10 @@ cd build
-DVTK_USE_SYSTEM_HDF5=ON \
-DHDF5_HL_LIBRARY:FILEPATH=%{_libdir}/libhdf5_hl.so \
-DVTK_USE_SYSTEM_JPEG:BOOL=ON \
- -DVTK_USE_SYSTEM_LIBPROJ4=OFF \
+ -DVTK_USE_SYSTEM_CGNS:BOOL=OFF \
+ -DVTK_USE_SYSTEM_LIBPROJ4:BOOL=OFF \
+ -DVTK_USE_SYSTEM_JSONCPP:BOOL=OFF \
+ -DVTK_USE_SYSTEM_LIBHARU:BOOL=OFF \
-DVTK_USE_SYSTEM_LIBRARIES:BOOL=ON \
-DVTK_USE_SYSTEM_LIBRARIES=ON \
-DVTK_USE_SYSTEM_PNG:BOOL=ON \
@@ -190,6 +181,7 @@ cd build
-DVTK_USE_SYSTEM_NETCDF=ON \
-DVTK_USE_SYSTEM_QTTESTING=OFF \
-DVTK_USE_SYSTEM_XDMF2=OFF \
+ -DVTK_USE_SYSTEM_GL2PS:BOOL=OFF \
-DXDMF_WRAP_PYTHON:BOOL=ON \
-DBUILD_DOCUMENTATION:BOOL=ON \
-DBUILD_EXAMPLES:BOOL=ON
diff --git a/ParaView-install.patch b/ParaView-install.patch
deleted file mode 100644
index 529e32f..0000000
--- a/ParaView-install.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ParaView-3.98.0-src/Plugins/SciberQuestToolKit/CMakeLists.txt.install
ParaView-3.98.0-src/Plugins/SciberQuestToolKit/CMakeLists.txt
---- ParaView-3.98.0-src/Plugins/SciberQuestToolKit/CMakeLists.txt.install
2012-12-03 08:31:22.000000000 -0700
-+++ ParaView-3.98.0-src/Plugins/SciberQuestToolKit/CMakeLists.txt
2012-12-05 11:20:52.659956535 -0700
-@@ -82,7 +82,7 @@ set (SQTK_VERSION "SQTK-${SQTK_RELEASE}
-
- # put the plugin inside the pv install
- set(SQTK_LIB_INSTALL_PATH
--
"${CMAKE_INSTALL_PREFIX}/lib/paraview-${PARAVIEW_VERSION_MAJOR}.${PARAVIEW_VERSION_MINOR}"
-+ "${PV_INSTALL_LIB_DIR}"
- )
- #message(STATUS "SQTK will be installed at ${SQTK_LIB_INSTALL_PATH}")
-
diff --git a/ParaView-kwprocessxml_rpath.patch
b/ParaView-kwprocessxml_rpath.patch
deleted file mode 100644
index f71ead9..0000000
--- a/ParaView-kwprocessxml_rpath.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: This patch forces building of kwProcessXML as shared forwarded
- executable in our case (even is CMAKE_SKIP_RPATH is OFF in debian)
-Author: Mathieu Malaterre <[email protected]>
-Bug-Debian: http://bugs.debian.org/640305
-Last-Update: 2011-09-13
-
---- a/Common/KWCommon/CMakeLists.txt
-+++ b/Common/KWCommon/CMakeLists.txt
-@@ -225,7 +225,7 @@
- IF(KWCOMMON_BUILD_PROCESSXML)
- # For shared libraries on non-windows systems use the KWSys shared-forward
- # implementation to make sure shared libraries are found.
-- IF(BUILD_SHARED_LIBS AND CMAKE_SKIP_RPATH)
-+ IF(BUILD_SHARED_LIBS )
- IF(NOT WIN32)
- SET(KWCommon_FORWARD_DIR_BUILD ${EXECUTABLE_OUTPUT_PATH})
- SET(KWCommon_FORWARD_BIN_TO_LIB "..${KWCommon_INSTALL_LIB_DIR}")
-@@ -248,7 +248,7 @@
- COMPONENT Development)
- ENDIF(NOT KWCommon_INSTALL_NO_DEVELOPMENT)
- ENDIF(NOT WIN32)
-- ENDIF(BUILD_SHARED_LIBS AND CMAKE_SKIP_RPATH)
-+ ENDIF(BUILD_SHARED_LIBS )
-
- ADD_EXECUTABLE(kwProcessXML${KWCommon_EXE_SUFFIX} ProcessXML.cxx)
- TARGET_LINK_LIBRARIES(kwProcessXML${KWCommon_EXE_SUFFIX} vtkCommon vtksys)
-
diff --git a/ParaView-system-Protobuf.patch b/ParaView-system-Protobuf.patch
deleted file mode 100644
index 871ce12..0000000
--- a/ParaView-system-Protobuf.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -up
ParaView/ParaViewCore/ServerImplementation/Core/CMakeLists.txt.Protobuf
ParaView/ParaViewCore/ServerImplementation/Core/CMakeLists.txt
---- ParaView/ParaViewCore/ServerImplementation/Core/CMakeLists.txt.Protobuf
2012-11-27 09:09:41.000000000 -0700
-+++ ParaView/ParaViewCore/ServerImplementation/Core/CMakeLists.txt
2012-11-27 13:00:36.072178577 -0700
-@@ -80,16 +80,16 @@ set (${vtk-module}_HDRS
-
#------------------------------------------------------------------------------
- # Generate the protbuf message file.
-
#------------------------------------------------------------------------------
--get_target_property(PROTOC_LOCATION protoc_compiler LOCATION)
-+get_target_property(PROTOC_LOCATION protoc LOCATION)
- add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/vtkPVMessage.pb.h
- ${CMAKE_CURRENT_BINARY_DIR}/vtkPVMessage.pb.cc
-
-- COMMAND protoc_compiler
-+ COMMAND protoc
-
"--cpp_out=dllexport_decl=VTKPVSERVERIMPLEMENTATIONCORE_EXPORT:${CMAKE_CURRENT_BINARY_DIR}"
- --proto_path "@CMAKE_CURRENT_SOURCE_DIR@"
- "${CMAKE_CURRENT_SOURCE_DIR}/vtkPVMessage.proto"
-- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/vtkPVMessage.proto protoc_compiler
-+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/vtkPVMessage.proto
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- )
-
-@@ -108,5 +108,7 @@ endif()
- vtk_module_library(vtkPVServerImplementationCore
- ${Module_SRCS})
-
-+target_link_libraries(vtkPVServerImplementationCore -lpthread)
-+
- add_dependencies(vtkPVServerImplementationCore
- protobuf_code_generation)
-diff -up ParaView/ThirdParty/protobuf/CMakeLists.txt.Protobuf
ParaView/ThirdParty/protobuf/CMakeLists.txt
---- ParaView/ThirdParty/protobuf/CMakeLists.txt.Protobuf 2012-11-27
09:09:45.000000000 -0700
-+++ ParaView/ThirdParty/protobuf/CMakeLists.txt 2012-11-27
13:02:04.535632175 -0700
-@@ -34,7 +34,7 @@ set (PROTOBUF_INSTALL_BIN_DIR ${VTK_INST
- set (PROTOBUF_INSTALL_LIB_DIR ${VTK_INSTALL_LIBRARY_DIR})
- set (PROTOBUF_INSTALL_EXPORT_NAME ${VTK_INSTALL_EXPORT_NAME})
-
--vtk_module_third_party(protobuf
-+vtk_module_third_party(Protobuf
- INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/vtkprotobuf/src
- LIBRARIES protobuf
- )
-@@ -42,11 +42,11 @@ vtk_module_third_party(protobuf
- # protobuf exports it's build-dir targets to a custom file
- # (PROTOBUF_EXPORTS.cmake). We don't care much about that. We export
- # build-dir targets ourselves.
--vtk_target_export(protobuf)
--vtk_target_export(protobuf-lite)
--if (NOT CMAKE_CROSSCOMPILING)
-- vtk_compile_tools_target_export(protoc_compiler)
--endif()
-+#vtk_target_export(protobuf)
-+#vtk_target_export(protobuf-lite)
-+#if (NOT CMAKE_CROSSCOMPILING)
-+# vtk_compile_tools_target_export(protoc_compiler)
-+#endif()
-
- # All these exports don't add any install rules. However we make protobuf
itself
- # install components at the right location by setting PROTOBUF_INSTALL_*
diff --git a/ParaView-system-netcdf.patch b/ParaView-system-netcdf.patch
deleted file mode 100644
index df0ef94..0000000
--- a/ParaView-system-netcdf.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -up VTK/IO/NetCDF/CMakeLists.txt.netcdf VTK/IO/NetCDF/CMakeLists.txt
---- VTK/IO/NetCDF/CMakeLists.txt.netcdf 2013-01-28 14:44:35.000000000
-0700
-+++ VTK/IO/NetCDF/CMakeLists.txt 2013-01-28 15:40:00.825176295 -0700
-@@ -10,5 +10,5 @@ set(Module_SRCS
-
- vtk_module_library(vtkIONetCDF ${Module_SRCS})
-
--target_link_libraries(vtkIONetCDF vtkNetCDF_cxx)
-+target_link_libraries(vtkIONetCDF netcdf_c++ netcdf)
- set_target_properties(vtkIONetCDF PROPERTIES LINK_INTERFACE_LIBRARIES "")
-diff -up VTK/IO/ParallelNetCDF/CMakeLists.txt.netcdf
VTK/IO/ParallelNetCDF/CMakeLists.txt
---- VTK/IO/ParallelNetCDF/CMakeLists.txt.netcdf 2013-01-28
14:44:35.000000000 -0700
-+++ VTK/IO/ParallelNetCDF/CMakeLists.txt 2013-01-28 15:40:00.825176295
-0700
-@@ -8,4 +8,4 @@ set(Module_SRCS
-
- vtk_module_library(vtkIOParallelNetCDF ${Module_SRCS})
-
--target_link_libraries(vtkIOParallelNetCDF vtkNetCDF_cxx)
-+target_link_libraries(vtkIOParallelNetCDF netcdf)
-diff -up VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt.netcdf
VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt
---- VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt.netcdf 2013-01-28
14:44:36.000000000 -0700
-+++ VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt 2013-01-28
15:40:27.534030910 -0700
-@@ -241,7 +241,7 @@ ENDIF(APPLE)
-
-
- VTK_ADD_LIBRARY(vtkexoIIc ${cbind_SRCS})
--TARGET_LINK_LIBRARIES(vtkexoIIc vtkNetCDF)
-+TARGET_LINK_LIBRARIES(vtkexoIIc netcdf)
-
- #INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake)
-
-diff -up VTK/ThirdParty/netcdf/CMakeLists.txt.netcdf
VTK/ThirdParty/netcdf/CMakeLists.txt
---- VTK/ThirdParty/netcdf/CMakeLists.txt.netcdf 2013-01-28
14:44:36.000000000 -0700
-+++ VTK/ThirdParty/netcdf/CMakeLists.txt 2013-01-28 15:40:00.825176295
-0700
-@@ -1,8 +1,12 @@
- set(vtknetcdf_THIRD_PARTY 1)
--set(vtknetcdf_LIBRARIES vtkNetCDF vtkNetCDF_cxx)
--set(vtknetcdf_INCLUDE_DIRS
-- ${vtknetcdf_SOURCE_DIR}/vtknetcdf/include
-- ${vtknetcdf_BINARY_DIR}/vtknetcdf
-- )
-+if(NOT VTK_USE_SYSTEM_NETCDF)
-+ set(vtknetcdf_LIBRARIES vtkNetCDF vtkNetCDF_cxx)
-+ set(vtknetcdf_INCLUDE_DIRS
-+ ${vtknetcdf_SOURCE_DIR}/vtknetcdf/include
-+ ${vtknetcdf_BINARY_DIR}/vtknetcdf
-+ )
-+ add_subdirectory(vtknetcdf)
-+else(NOT VTK_USE_SYSTEM_NETCDF)
-+ set(vtknetcdf_LIBRARIES netcdf)
-+endif()
- vtk_module_export_info()
--add_subdirectory(vtknetcdf)
-diff -up VTK/ThirdParty/netcdf/vtk_netcdfcpp.h.netcdf
VTK/ThirdParty/netcdf/vtk_netcdfcpp.h
---- VTK/ThirdParty/netcdf/vtk_netcdfcpp.h.netcdf 2013-01-28
14:44:36.000000000 -0700
-+++ VTK/ThirdParty/netcdf/vtk_netcdfcpp.h 2013-01-28 15:40:00.826176289
-0700
-@@ -16,6 +16,6 @@
- #define __vtk_netcdfcpp_h
-
- /* Use the netcdf library configured for VTK. */
--#include <vtknetcdf/cxx/netcdfcpp.h>
-+#include <netcdfcpp.h>
-
- #endif
-diff -up VTK/ThirdParty/netcdf/vtk_netcdf.h.netcdf
VTK/ThirdParty/netcdf/vtk_netcdf.h
---- VTK/ThirdParty/netcdf/vtk_netcdf.h.netcdf 2013-01-28 14:44:36.000000000
-0700
-+++ VTK/ThirdParty/netcdf/vtk_netcdf.h 2013-01-28 15:40:00.826176289 -0700
-@@ -16,6 +16,6 @@
- #define __vtk_netcdf_h
-
- /* Use the netcdf library configured for VTK. */
--#include <vtknetcdf/include/netcdf.h>
-+#include <netcdf.h>
-
- #endif
diff --git a/ParaView-vtk-use-system-libs.patch
b/ParaView-vtk-use-system-libs.patch
deleted file mode 100644
index 7beecbc..0000000
--- a/ParaView-vtk-use-system-libs.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -up VTK/CMakeLists.txt.system VTK/CMakeLists.txt
---- VTK/CMakeLists.txt.system 2012-12-03 08:31:29.000000000 -0700
-+++ VTK/CMakeLists.txt 2012-12-06 09:58:22.809749444 -0700
-@@ -97,6 +97,11 @@ set(VTK_INSTALL_INCLUDE_DIR_CM24 ${VTK_I
- set(VTK_INSTALL_DOXYGEN_DIR_CM24 ${VTK_INSTALL_DATA_DIR}/doxygen)
-
- #-----------------------------------------------------------------------------
-+# Do we try to use system libraries by default?
-+OPTION(VTK_USE_SYSTEM_LIBRARIES "Use the system's libraries by default." OFF)
-+MARK_AS_ADVANCED(VTK_USE_SYSTEM_LIBRARIES)
-+
-+#-----------------------------------------------------------------------------
- # The third party macros are still used in one or two third party builds.
- include(vtkThirdParty)
-
-diff -up VTK/CMake/vtkModuleMacros.cmake.system VTK/CMake/vtkModuleMacros.cmake
---- VTK/CMake/vtkModuleMacros.cmake.system 2012-12-03 08:31:29.000000000
-0700
-+++ VTK/CMake/vtkModuleMacros.cmake 2012-12-06 09:58:22.810749439 -0700
-@@ -563,7 +563,7 @@ macro(vtk_module_third_party _pkg)
- message(FATAL_ERROR "Cannot specify both LIBRARIES and NO_LIBRARIES")
- endif()
-
-- option(VTK_USE_SYSTEM_${_upper} "Use system-installed ${_pkg}" OFF)
-+ option(VTK_USE_SYSTEM_${_upper} "Use system-installed ${_pkg}"
${VTK_USE_SYSTEM_LIBRARIES})
- mark_as_advanced(VTK_USE_SYSTEM_${_upper})
-
- if(VTK_USE_SYSTEM_${_upper})
diff --git a/disable-broken-tests.patch b/disable-broken-tests.patch
deleted file mode 100644
index d5f28c0..0000000
--- a/disable-broken-tests.patch
+++ /dev/null
@@ -1,17 +0,0 @@
----
ParaView-v4.0.1-source/ParaViewCore/ServerManager/Default/Testing/Cxx/CMakeLists.txt~
2013-07-14 21:17:50.899664442 +0200
-+++
ParaView-v4.0.1-source/ParaViewCore/ServerManager/Default/Testing/Cxx/CMakeLists.txt
2013-07-14 21:37:51.474780574 +0200
-@@ -14,14 +14,6 @@
- TestProxyAnnotation
- )
-
--foreach (name ${test_srcs})
-- vtk_module_test_executable(${name}
-- ${name}.cxx)
-- add_test(NAME ${name}
-- COMMAND ${name} ${name} -D ${VTK_DATA_ROOT})
-- set_tests_properties(${name} PROPERTIES LABELS "PARAVIEW")
--endforeach()
--
-
#------------------------------------------------------------------------------
- if (PARAVIEW_DATA_ROOT)
- # This is the executable that can load any Server Manager state (*.pvsm)
file
diff --git a/freetype.patch b/freetype.patch
deleted file mode 100644
index 8ebb711..0000000
--- a/freetype.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- ParaView-v4.0.1-source/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx.orig
2015-07-18 13:23:54.368978722 +0000
-+++ ParaView-v4.0.1-source/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx
2015-07-18 13:23:47.992170735 +0000
-@@ -1165,7 +1165,7 @@
- if (bitmap)
- {
- metaData.ascent = std::max(bitmapGlyph->top - 1, metaData.ascent);
-- metaData.descent = std::min(-(bitmap->rows - (bitmapGlyph->top - 1)),
-+ metaData.descent = std::min(-((int)bitmap->rows - (bitmapGlyph->top -
1)),
- metaData.descent);
- }
- ++heightString;
-@@ -1930,8 +1930,8 @@
- 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 +
(int)bitmap->width);
-+ bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 -
(int)bitmap->rows);
- bbox[3] = std::max(bbox[3], pen[1] + bitmapGlyph->top - 1);
- }
- else
diff --git a/protobuf.patch b/protobuf.patch
deleted file mode 100644
index a22d688..0000000
--- a/protobuf.patch
+++ /dev/null
@@ -1,64 +0,0 @@
----
ParaView-v4.0.1-source/ParaViewCore/ServerImplementation/Core/vtkPVMessage.proto.orig
2014-10-29 21:55:42.582965302 +0100
-+++
ParaView-v4.0.1-source/ParaViewCore/ServerImplementation/Core/vtkPVMessage.proto
2014-10-29 21:58:20.865441145 +0100
-@@ -62,10 +62,10 @@
- {
- extend Message {
- // The classname for the driver process i.e. the client, typically
-- required string client_class = 10;
-+ optional string client_class = 10;
-
- // The classname for the process where the processing occurs
-- required string server_class = 11;
-+ optional string server_class = 11;
- }
- }
-
-@@ -98,8 +98,8 @@
- }
-
- extend Message {
-- required string xml_group = 20;
-- required string xml_name = 21;
-+ optional string xml_group = 20;
-+ optional string xml_name = 21;
- optional string xml_sub_proxy_name = 22;
- repeated Property property = 23;
- repeated SubProxy subproxy = 24;
-@@ -204,7 +204,7 @@
- }
-
- extend Message {
-- required uint32 view = 70;
-+ optional uint32 view = 70;
- optional double x = 71 [default = 0];
- optional double y = 72 [default = 0];
- optional bool forceShow = 73 [default = false];
-@@ -217,7 +217,7 @@
- message ChartViewBounds {
-
- extend Message {
-- required uint32 view = 75;
-+ optional uint32 view = 75;
- repeated double range = 76;
- }
- }
-@@ -240,8 +240,8 @@
-
- message ChatMessage {
- extend Message {
-- required uint32 author = 84;
-- required string txt = 85;
-+ optional uint32 author = 84;
-+ optional string txt = 85;
- }
- }
-
-@@ -254,7 +254,7 @@
- }
-
- extend Message {
-- required QtEventType type = 98;
-+ optional QtEventType type = 98;
- }
- }
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ParaView.git/commitdiff/2e7b177aaf7c654fe31fa7b81d48b3b1a7375515
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
