[packages/ParaView] - fix protobufs for latest libprotobuf - rel 8
baggins
baggins at pld-linux.org
Wed Oct 29 21:57:58 CET 2014
commit a084c52da93058e1bfc4aa9ba559ebb14a5bf4d3
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Wed Oct 29 21:59:30 2014 +0100
- fix protobufs for latest libprotobuf
- rel 8
ParaView.spec | 3 ++-
protobuf.patch | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 66 insertions(+), 1 deletion(-)
---
diff --git a/ParaView.spec b/ParaView.spec
index d7395e6..49776ed 100644
--- a/ParaView.spec
+++ b/ParaView.spec
@@ -1,7 +1,7 @@
Summary: Parallel visualization application
Name: ParaView
Version: 4.0.1
-Release: 7
+Release: 8
License: BSD
Group: Applications/Engineering
URL: http://www.paraview.org/
@@ -14,6 +14,7 @@ Patch1: %{name}-install.patch
Patch2: %{name}-system-Protobuf.patch
Patch3: %{name}-system-netcdf.patch
Patch4: disable-broken-tests.patch
+Patch5: protobuf.patch
BuildRequires: Mesa-libOSMesa-devel
BuildRequires: QtDesigner-devel
BuildRequires: QtHelp-devel
diff --git a/protobuf.patch b/protobuf.patch
new file mode 100644
index 0000000..a22d688
--- /dev/null
+++ b/protobuf.patch
@@ -0,0 +1,64 @@
+--- 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/a084c52da93058e1bfc4aa9ba559ebb14a5bf4d3
More information about the pld-cvs-commit
mailing list