pyqwt3d-cvs/pyqwt3d-0.16-Qt-4.7.patch

   1 --- pyqwt3d-0.1.7~cvs20090625~/sip/Qwt3D_Qt3_Module.sip 2010-02-07 16:36:56.000000000 +0100
   2 +++ pyqwt3d-0.1.7~cvs20090625/sip/Qwt3D_Qt3_Module.sip  2010-02-07 16:37:33.000000000 +0100
   3 @@ -35,7 +35,7 @@
   4
   5  typedef unsigned int    GLenum;
   6  typedef unsigned char   GLboolean;
   7 -typedef unsigned int    GLbitfield;
   8 +//typedef unsigned int    GLbitfield;
   9  typedef void            GLvoid;
  10  typedef /*signed*/ char GLbyte;         /* 1-byte signed */
  11  typedef short           GLshort;        /* 2-byte signed */
  12 diff -urNad pyqwt3d-0.1.7~cvs20090625~/sip/Qwt3D_Qt4_Module.sip pyqwt3d-0.1.7~cvs20090625/sip/Qwt3D_Qt4_Module.sip
  13 --- pyqwt3d-0.1.7~cvs20090625~/sip/Qwt3D_Qt4_Module.sip 2010-02-07 16:36:56.000000000 +0100
  14 +++ pyqwt3d-0.1.7~cvs20090625/sip/Qwt3D_Qt4_Module.sip  2010-02-07 16:36:59.000000000 +0100
  15 @@ -36,7 +36,7 @@
  16
  17  // typedef unsigned int    GLenum;
  18  typedef unsigned char   GLboolean;
  19 -typedef unsigned int    GLbitfield;
  20 +//typedef unsigned int    GLbitfield;
  21  typedef void            GLvoid;
  22  typedef /*signed*/ char GLbyte;         /* 1-byte signed */
  23  typedef short           GLshort;        /* 2-byte signed */
  24 @@ -45,7 +45,7 @@
  25  typedef unsigned short  GLushort;       /* 2-byte unsigned */
  26  // typedef unsigned int    GLuint;         /* 4-byte unsigned */
  27  typedef int             GLsizei;        /* 4-byte signed */
  28 -typedef float           GLfloat;        /* single precision float */
  29 +//typedef float           GLfloat;        /* single precision float */
  30  typedef float           GLclampf;       /* single precision float in [0,1] */
  31  typedef double          GLdouble;       /* double precision float */
  32  typedef double          GLclampd;       /* double precision float in [0,1] */
  33 --- pyqwt3d-0.1.7~cvs20090625~/sip/qwt3d_plot.sip 2010-02-07 16:36:56.000000000 +0100
  34 +++ pyqwt3d-0.1.7~cvs20090625/sip/qwt3d_plot.sip  2010-02-07 16:36:59.000000000 +0100
  35 @@ -45,8 +45,8 @@
  36          sipWrapperType **type;
  37          int yes, no;
  38      } graph[] = {
  39 -        {sipName_Plot3D, &sipClass_Plot3D, 1, -1},
  40 -        {sipName_SurfacePlot, &sipClass_SurfacePlot, -1, -1},
  41 +        {(char*)sipName_Plot3D, &sipClass_Plot3D, 1, -1},
  42 +        {(char*)sipName_SurfacePlot, &sipClass_SurfacePlot, -1, -1},
  43      };
  44      int i = 0;
  45      sipClass = NULL;