tamiko 15/04/19 13:15:00 Added: paraview-4.2.0-protobuf.patch paraview-4.2.0-protobuf-2.patch paraview-4.1.0-vtk-freetype.patch Removed: paraview-4.2.0-Protobuf.patch Log: version bump (bug #538690), fix dependencies (bug #538168), fix freetype-2.5.5 compatibility also in 4.1.0-r2 (bug #541012), fix protobuf compatibility in 4.2.0 and 4.3.1 (bug #537988) (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key BD3A97A3)
Revision Changes Path 1.1 sci-visualization/paraview/files/paraview-4.2.0-protobuf.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/paraview/files/paraview-4.2.0-protobuf.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/paraview/files/paraview-4.2.0-protobuf.patch?rev=1.1&content-type=text/plain Index: paraview-4.2.0-protobuf.patch =================================================================== http://paraview.org/Bug/view.php?id=13656 --- ParaViewCore/ServerImplementation/Core/CMakeLists.txt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/ParaViewCore/ServerImplementation/Core/CMakeLists.txt b/ParaViewCore/ServerImplementation/Core/CMakeLists.txt index 5ca5168..2a7ff4b 100644 --- a/ParaViewCore/ServerImplementation/Core/CMakeLists.txt +++ b/ParaViewCore/ServerImplementation/Core/CMakeLists.txt @@ -82,15 +82,23 @@ set (${vtk-module}_HDRS #------------------------------------------------------------------------------ # Generate the protbuf message file. #------------------------------------------------------------------------------ +if (VTK_USE_SYSTEM_PROTOBUF) + set (_PROTOC_COMPILER protoc) + set (_PROTOC_DEPEND "") +else() + set (_PROTOC_COMPILER protoc_compiler) + set (_PROTOC_DEPEND ${_PROTOC_COMPILER}) +endif() + add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/vtkPVMessage.pb.h ${CMAKE_CURRENT_BINARY_DIR}/vtkPVMessage.pb.cc - COMMAND protoc_compiler + COMMAND ${_PROTOC_COMPILER} "--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 ${_PROTOC_DEPEND} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) -- 2.0.5 1.1 sci-visualization/paraview/files/paraview-4.2.0-protobuf-2.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/paraview/files/paraview-4.2.0-protobuf-2.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/paraview/files/paraview-4.2.0-protobuf-2.patch?rev=1.1&content-type=text/plain Index: paraview-4.2.0-protobuf-2.patch =================================================================== diff --git a/ParaViewCore/ServerImplementation/Core/vtkPVMessage.proto b/ParaViewCore/ServerImplementation/Core/vtkPVMessage.proto index 60e084c..aed5832 100644 --- a/ParaViewCore/ServerImplementation/Core/vtkPVMessage.proto +++ b/ParaViewCore/ServerImplementation/Core/vtkPVMessage.proto @@ -21,7 +21,7 @@ message Variant { MAP = 7; } - required Type type = 1; + optional Type type = 1; repeated sint64 idtype = 3; repeated sint32 integer = 4; repeated double float64 = 5; @@ -47,8 +47,8 @@ message MessageCollection message Message { - required uint64 global_id = 1; - required uint32 location = 2; + optional uint64 global_id = 1; + optional uint32 location = 2; optional bool share_only = 3 [default = false]; optional bool req_def = 4 [default = false]; optional uint32 client_id = 5 [default = 0]; @@ -62,10 +62,10 @@ message DefinitionHeader { 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; } } @@ -76,32 +76,32 @@ message ProxyState message SubProxy { - required string name = 1; - required uint32 global_id = 2; + optional string name = 1; + optional uint32 global_id = 2; } message Annotation { - required string key = 1; - required string value = 2; + optional string key = 1; + optional string value = 2; } message UserData { - required string key = 1; + optional string key = 1; repeated Variant variant = 2; } message Property { - required string name = 1; + optional string name = 1; optional Variant value = 2; repeated UserData user_data = 3; } 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; @@ -118,8 +118,8 @@ message PXMRegistrationState message Entry { optional string group = 1; - required string name = 2; - required uint64 global_id = 3; + optional string name = 2; + optional uint64 global_id = 3; } extend Message { @@ -135,9 +135,9 @@ message ProxyDefinitionState { message ProxyXMLDefinition { - required string group = 1; - required string name = 2; - required string xml = 3; + optional string group = 1; + optional string name = 2; + optional string xml = 3; } extend Message { @@ -181,9 +181,9 @@ message LinkState { OUTPUT = 2; } - required uint32 proxy = 1; + optional uint32 proxy = 1; optional string property_name = 2; - required Direction direction = 3; + optional Direction direction = 3; } extend Message { @@ -206,7 +206,7 @@ message MousePointer { } 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]; @@ -219,7 +219,7 @@ message MousePointer { message ChartViewBounds { extend Message { - required uint32 view = 75; + optional uint32 view = 75; repeated double range = 76; } } @@ -229,7 +229,7 @@ message ChartViewBounds { message ClientsInformation { message ClientInfo { - required uint32 user = 1; + optional uint32 user = 1; optional string name = 2; optional bool is_master = 3 [default = false]; optional bool follow_cam = 4 [default = false]; @@ -242,8 +242,8 @@ message ClientsInformation { message ChatMessage { extend Message { - required uint32 author = 84; - required string txt = 85; + optional uint32 author = 84; + optional string txt = 85; } } @@ -256,7 +256,7 @@ message QtEvent { } extend Message { - required QtEventType type = 98; + optional QtEventType type = 98; } } 1.1 sci-visualization/paraview/files/paraview-4.1.0-vtk-freetype.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/paraview/files/paraview-4.1.0-vtk-freetype.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/paraview/files/paraview-4.1.0-vtk-freetype.patch?rev=1.1&content-type=text/plain Index: paraview-4.1.0-vtk-freetype.patch =================================================================== --- a/ParaView-v4.2.0-source/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx_orig 2014-12-23 09:25:35.000000000 +0100 +++ b/ParaView-v4.2.0-source/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx 2014-12-24 09:40:31.886953389 +0100 @@ -1185,7 +1185,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(-(static_cast<int>(bitmap->rows) - (bitmapGlyph->top - 1)), metaData.descent); } ++heightString; @@ -1952,8 +1952,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 + 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