Attachment 188723 Details for Bug 216634 – Unified diff

[patch] Unified diff

paraview.diff (text/plain), 5.78 KB, created by Jason W. Bacon on 2017-12-11 17:18:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason W. Bacon

Created: 2017-12-11 17:18:55 UTC

Size: 5.78 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 456051)
>+++ Makefile	(working copy)
>@@ -33,16 +33,17 @@
> 
> CONFLICTS_BUILD=	protobuf*
> 
>+USES=		alias desktop-file-utils cmake:outsource jpeg python:2.7 shebangfix
> USE_QT4=	qmake_build moc_build rcc_build uic_build \
> 		linguisttools_build assistant_run qt3support \
> 		corelib dbus designer gui help-tools network script \
> 		sql svg xml webkit assistantclient clucene \
> 		xmlpatterns xmlpatterns-tool help
>-USE_GL=		gl
>-USE_XORG=	x11 xt xext ice xdmcp xau xcb xfixes xdamage xxf86vm xrender sm
>+USE_GL=		gl glu
>+USE_XORG=	x11 xt xext ice xdmcp xau xcb xfixes xdamage xxf86vm xrender sm dri3proto
> USE_LDCONFIG=	yes
> USE_GSTREAMER=	yes
>-USES=		alias desktop-file-utils cmake:outsource jpeg python:2.7 shebangfix
>+
> INSTALLS_ICONS=	yes
> 
> CMAKE_ARGS+=	-DBUILD_SHARED_LIBS="ON" \
>Index: files/patch-VTK_ThirdParty_netcdf_vtknetcdf_cxx_ncvalues.h
>===================================================================
>--- files/patch-VTK_ThirdParty_netcdf_vtknetcdf_cxx_ncvalues.h	(nonexistent)
>+++ files/patch-VTK_ThirdParty_netcdf_vtknetcdf_cxx_ncvalues.h	(working copy)
>@@ -0,0 +1,20 @@
>+--- VTK/ThirdParty/netcdf/vtknetcdf/cxx/ncvalues.h.orig	2017-12-11 10:53:52.580909000 -0600
>++++ VTK/ThirdParty/netcdf/vtknetcdf/cxx/ncvalues.h	2017-12-11 10:56:41.150698000 -0600
>+@@ -65,7 +65,7 @@ static const double ncBad_double = NC_FI
>+ #define NcVal(TYPE) makename2(NcValues_,TYPE)
>+ 
>+ #define NcValuesdeclare(TYPE)						      \
>+-class MSCPP_EXTRA NcVal(TYPE) : public NcValues				      \
>++class NcVal(TYPE) : public NcValues				      \
>+ {									      \
>+   public:								      \
>+     NcVal(TYPE)( void );						      \
>+@@ -237,7 +237,7 @@ char* NcVal(TYPE)::as_string( long n ) c
>+     return s;								      \
>+ }
>+ 
>+-class MSCPP_EXTRA NcValues			// ABC for value blocks
>++class NcValues			// ABC for value blocks
>+ {
>+   public:
>+     NcValues( void );
>
>Index: files/patch-VTK_ThirdParty_netcdf_vtknetcdf_cxx_netcdfcpp.h
>===================================================================
>--- files/patch-VTK_ThirdParty_netcdf_vtknetcdf_cxx_netcdfcpp.h	(nonexistent)
>+++ files/patch-VTK_ThirdParty_netcdf_vtknetcdf_cxx_netcdfcpp.h	(working copy)
>@@ -0,0 +1,70 @@
>+--- VTK/ThirdParty/netcdf/vtknetcdf/cxx/netcdfcpp.h.orig	2017-12-11 10:58:01.273469000 -0600
>++++ VTK/ThirdParty/netcdf/vtknetcdf/cxx/netcdfcpp.h	2017-12-11 10:58:25.315543000 -0600
>+@@ -21,17 +21,17 @@
>+ typedef const char* NcToken;    // names for netCDF objects
>+ typedef unsigned int NcBool;    // many members return 0 on failure
>+ 
>+-class MSCPP_EXTRA NcDim;        // dimensions
>+-class MSCPP_EXTRA NcVar;        // variables
>+-class MSCPP_EXTRA NcAtt;        // attributes
>+-class MSCPP_EXTRA NcError;
>++class NcDim;        // dimensions
>++class NcVar;        // variables
>++class NcAtt;        // attributes
>++class NcError;
>+ 
>+ /*
>+  * ***********************************************************************
>+  * A netCDF file.
>+  * ***********************************************************************
>+  */
>+-class MSCPP_EXTRA NcFile
>++class NcFile
>+ {
>+   public:
>+ 
>+@@ -146,7 +146,7 @@ class MSCPP_EXTRA NcFile
>+  * of an open netCDF file.
>+  * **********************************************************************
>+  */
>+-class MSCPP_EXTRA NcDim
>++class NcDim
>+ {
>+   public:
>+     NcToken name( void ) const;
>+@@ -178,7 +178,7 @@ class MSCPP_EXTRA NcDim
>+  * components of an open netCDF file.
>+  * **********************************************************************
>+  */
>+-class MSCPP_EXTRA NcTypedComponent
>++class NcTypedComponent
>+ {
>+   public:
>+     virtual ~NcTypedComponent( void ) {}
>+@@ -216,7 +216,7 @@ class MSCPP_EXTRA NcTypedComponent
>+  * a shape, given by a list of dimensions
>+  * **********************************************************************
>+  */
>+-class MSCPP_EXTRA NcVar : public NcTypedComponent
>++class NcVar : public NcTypedComponent
>+ {
>+   public:
>+     virtual ~NcVar( void );
>+@@ -414,7 +414,7 @@ class MSCPP_EXTRA NcVar : public NcTyped
>+  * associated with a specific variable, or are global to the file.
>+  * **********************************************************************
>+  */
>+-class MSCPP_EXTRA NcAtt : public NcTypedComponent
>++class NcAtt : public NcTypedComponent
>+ {
>+   public:          
>+     virtual ~NcAtt( void );
>+@@ -447,7 +447,7 @@ class MSCPP_EXTRA NcAtt : public NcTyped
>+  * which time the previous error-handling behavior is restored.
>+  * **********************************************************************
>+  */
>+-class MSCPP_EXTRA NcError {
>++class NcError {
>+   public:
>+     enum Behavior {
>+         silent_nonfatal = 0,
>
>Index: files/patch-VTK_ThirdParty_xdmf2_vtkxdmf2_libsrc_XdmfDsmComm.cxx
>===================================================================
>--- files/patch-VTK_ThirdParty_xdmf2_vtkxdmf2_libsrc_XdmfDsmComm.cxx	(nonexistent)
>+++ files/patch-VTK_ThirdParty_xdmf2_vtkxdmf2_libsrc_XdmfDsmComm.cxx	(working copy)
>@@ -0,0 +1,20 @@
>+--- VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfDsmComm.cxx.orig	2017-12-11 09:34:06.254757000 -0600
>++++ VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfDsmComm.cxx	2017-12-11 10:21:02.989631000 -0600
>+@@ -52,7 +52,7 @@ XdmfDsmComm::Receive(XdmfDsmMsg *Msg){
>+         XdmfErrorMessage("Cannot Receive Message of Length = " << Msg->Length);
>+         return(XDMF_FAIL);
>+     }
>+-    if(Msg->Data <= 0 ){
>++    if(Msg->Data == 0 ){
>+         XdmfErrorMessage("Cannot Receive Message into Data Buffer = " << Msg->Length);
>+         return(XDMF_FAIL);
>+     }
>+@@ -66,7 +66,7 @@ XdmfDsmComm::Send(XdmfDsmMsg *Msg){
>+         XdmfErrorMessage("Cannot Send Message of Length = " << Msg->Length);
>+         return(XDMF_FAIL);
>+     }
>+-    if(Msg->Data <= 0 ){
>++    if(Msg->Data == 0 ){
>+         XdmfErrorMessage("Cannot Send Message from Data Buffer = " << Msg->Length);
>+         return(XDMF_FAIL);
>+     }

Actions: View | Diff

Attachments on bug 216634: 181537 | 188723