View | Details | Raw Unified | Return to bug 216634 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-3 / +4 lines)
Lines 33-48 Link Here
33
33
34
CONFLICTS_BUILD=	protobuf*
34
CONFLICTS_BUILD=	protobuf*
35
35
36
USES=		alias desktop-file-utils cmake:outsource jpeg python:2.7 shebangfix
36
USE_QT4=	qmake_build moc_build rcc_build uic_build \
37
USE_QT4=	qmake_build moc_build rcc_build uic_build \
37
		linguisttools_build assistant_run qt3support \
38
		linguisttools_build assistant_run qt3support \
38
		corelib dbus designer gui help-tools network script \
39
		corelib dbus designer gui help-tools network script \
39
		sql svg xml webkit assistantclient clucene \
40
		sql svg xml webkit assistantclient clucene \
40
		xmlpatterns xmlpatterns-tool help
41
		xmlpatterns xmlpatterns-tool help
41
USE_GL=		gl
42
USE_GL=		gl glu
42
USE_XORG=	x11 xt xext ice xdmcp xau xcb xfixes xdamage xxf86vm xrender sm
43
USE_XORG=	x11 xt xext ice xdmcp xau xcb xfixes xdamage xxf86vm xrender sm dri3proto
43
USE_LDCONFIG=	yes
44
USE_LDCONFIG=	yes
44
USE_GSTREAMER=	yes
45
USE_GSTREAMER=	yes
45
USES=		alias desktop-file-utils cmake:outsource jpeg python:2.7 shebangfix
46
46
INSTALLS_ICONS=	yes
47
INSTALLS_ICONS=	yes
47
48
48
CMAKE_ARGS+=	-DBUILD_SHARED_LIBS="ON" \
49
CMAKE_ARGS+=	-DBUILD_SHARED_LIBS="ON" \
(-)files/patch-VTK_ThirdParty_netcdf_vtknetcdf_cxx_ncvalues.h (+20 lines)
Line 0 Link Here
1
--- VTK/ThirdParty/netcdf/vtknetcdf/cxx/ncvalues.h.orig	2017-12-11 10:53:52.580909000 -0600
2
+++ VTK/ThirdParty/netcdf/vtknetcdf/cxx/ncvalues.h	2017-12-11 10:56:41.150698000 -0600
3
@@ -65,7 +65,7 @@ static const double ncBad_double = NC_FI
4
 #define NcVal(TYPE) makename2(NcValues_,TYPE)
5
 
6
 #define NcValuesdeclare(TYPE)						      \
7
-class MSCPP_EXTRA NcVal(TYPE) : public NcValues				      \
8
+class NcVal(TYPE) : public NcValues				      \
9
 {									      \
10
   public:								      \
11
     NcVal(TYPE)( void );						      \
12
@@ -237,7 +237,7 @@ char* NcVal(TYPE)::as_string( long n ) c
13
     return s;								      \
14
 }
15
 
16
-class MSCPP_EXTRA NcValues			// ABC for value blocks
17
+class NcValues			// ABC for value blocks
18
 {
19
   public:
20
     NcValues( void );
(-)files/patch-VTK_ThirdParty_netcdf_vtknetcdf_cxx_netcdfcpp.h (+70 lines)
Line 0 Link Here
1
--- VTK/ThirdParty/netcdf/vtknetcdf/cxx/netcdfcpp.h.orig	2017-12-11 10:58:01.273469000 -0600
2
+++ VTK/ThirdParty/netcdf/vtknetcdf/cxx/netcdfcpp.h	2017-12-11 10:58:25.315543000 -0600
3
@@ -21,17 +21,17 @@
4
 typedef const char* NcToken;    // names for netCDF objects
5
 typedef unsigned int NcBool;    // many members return 0 on failure
6
 
7
-class MSCPP_EXTRA NcDim;        // dimensions
8
-class MSCPP_EXTRA NcVar;        // variables
9
-class MSCPP_EXTRA NcAtt;        // attributes
10
-class MSCPP_EXTRA NcError;
11
+class NcDim;        // dimensions
12
+class NcVar;        // variables
13
+class NcAtt;        // attributes
14
+class NcError;
15
 
16
 /*
17
  * ***********************************************************************
18
  * A netCDF file.
19
  * ***********************************************************************
20
  */
21
-class MSCPP_EXTRA NcFile
22
+class NcFile
23
 {
24
   public:
25
 
26
@@ -146,7 +146,7 @@ class MSCPP_EXTRA NcFile
27
  * of an open netCDF file.
28
  * **********************************************************************
29
  */
30
-class MSCPP_EXTRA NcDim
31
+class NcDim
32
 {
33
   public:
34
     NcToken name( void ) const;
35
@@ -178,7 +178,7 @@ class MSCPP_EXTRA NcDim
36
  * components of an open netCDF file.
37
  * **********************************************************************
38
  */
39
-class MSCPP_EXTRA NcTypedComponent
40
+class NcTypedComponent
41
 {
42
   public:
43
     virtual ~NcTypedComponent( void ) {}
44
@@ -216,7 +216,7 @@ class MSCPP_EXTRA NcTypedComponent
45
  * a shape, given by a list of dimensions
46
  * **********************************************************************
47
  */
48
-class MSCPP_EXTRA NcVar : public NcTypedComponent
49
+class NcVar : public NcTypedComponent
50
 {
51
   public:
52
     virtual ~NcVar( void );
53
@@ -414,7 +414,7 @@ class MSCPP_EXTRA NcVar : public NcTyped
54
  * associated with a specific variable, or are global to the file.
55
  * **********************************************************************
56
  */
57
-class MSCPP_EXTRA NcAtt : public NcTypedComponent
58
+class NcAtt : public NcTypedComponent
59
 {
60
   public:          
61
     virtual ~NcAtt( void );
62
@@ -447,7 +447,7 @@ class MSCPP_EXTRA NcAtt : public NcTyped
63
  * which time the previous error-handling behavior is restored.
64
  * **********************************************************************
65
  */
66
-class MSCPP_EXTRA NcError {
67
+class NcError {
68
   public:
69
     enum Behavior {
70
         silent_nonfatal = 0,
(-)files/patch-VTK_ThirdParty_xdmf2_vtkxdmf2_libsrc_XdmfDsmComm.cxx (+20 lines)
Line 0 Link Here
1
--- VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfDsmComm.cxx.orig	2017-12-11 09:34:06.254757000 -0600
2
+++ VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfDsmComm.cxx	2017-12-11 10:21:02.989631000 -0600
3
@@ -52,7 +52,7 @@ XdmfDsmComm::Receive(XdmfDsmMsg *Msg){
4
         XdmfErrorMessage("Cannot Receive Message of Length = " << Msg->Length);
5
         return(XDMF_FAIL);
6
     }
7
-    if(Msg->Data <= 0 ){
8
+    if(Msg->Data == 0 ){
9
         XdmfErrorMessage("Cannot Receive Message into Data Buffer = " << Msg->Length);
10
         return(XDMF_FAIL);
11
     }
12
@@ -66,7 +66,7 @@ XdmfDsmComm::Send(XdmfDsmMsg *Msg){
13
         XdmfErrorMessage("Cannot Send Message of Length = " << Msg->Length);
14
         return(XDMF_FAIL);
15
     }
16
-    if(Msg->Data <= 0 ){
17
+    if(Msg->Data == 0 ){
18
         XdmfErrorMessage("Cannot Send Message from Data Buffer = " << Msg->Length);
19
         return(XDMF_FAIL);
20
     }

Return to bug 216634