Package: ghemical
Version: 1.01-2
Severity: normal
Tags: patch
When building 'ghemical' on amd64/unstable with gcc-4.0,
I get the following error:
make[2]: Entering directory `/ghemical-1.01/src/graphics'
x86_64-linux-g++ -c -g -O2 -fno-exceptions -I../../src/graphics
-I../../src/common -I/usr/include/openbabel -I/ghemical-1.01/src
-I/usr/include/sc -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2
-I/usr/lib/glib/include -I/usr/include/gnome-1.0 -DNEED_GNOMESUPPORT_H
-I/usr/lib/gnome-libs/include -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2
-I/usr/lib/glib/include ./mtools.cpp
./objects.h:93: error: 'obj_loc_data* dummy_object::GetLocDataRW() const' is
protected
./objects.h:180: error: within this context
./views.h:233: error: variable or field 'mm1_apply_udata_as_cset' declared void
./views.h:233: error: 'mm1_docv' was not declared in this scope
./views.h:233: error: expected primary-expression before ',' token
./views.h:233: error: expected primary-expression before 'void'
./views.h:233: error: initializer expression list treated as compound expression
make[2]: *** [mtools.o] Error 1
make[2]: Leaving directory `/ghemical-1.01/src/graphics'
With the attached patch 'ghemical' can be compiled
on amd64 using gcc-4.0.
Regards
Andreas Jochens
diff -urN ../tmp-orig/ghemical-1.01/src/graphics/camera.cpp
./src/graphics/camera.cpp
--- ../tmp-orig/ghemical-1.01/src/graphics/camera.cpp 2002-07-31
11:53:35.000000000 +0200
+++ ./src/graphics/camera.cpp 2005-06-19 14:32:21.000000000 +0200
@@ -585,7 +585,7 @@
fGL r3 = tmp1 * tmp2;
const dummy_object * name = this;
- glPushName(GLNAME_LIGHT); glPushName((iGLu) name);
+ glPushName(GLNAME_LIGHT); glPushName((long) name);
glPushMatrix(); SetModelView();
diff -urN ../tmp-orig/ghemical-1.01/src/graphics/mm1docv.cpp
./src/graphics/mm1docv.cpp
--- ../tmp-orig/ghemical-1.01/src/graphics/mm1docv.cpp 2002-11-11
14:18:03.000000000 +0100
+++ ./src/graphics/mm1docv.cpp 2005-06-19 14:32:21.000000000 +0200
@@ -337,7 +337,7 @@
for (iter_mm1al it1 = atom_list.begin();it1 !=
atom_list.end();it1++) // wireframe atoms
{
if (!TestAtom(& (* it1), rm)) continue;
- glPushName(GLNAME_MD_TYPE1); glPushName((i32u)
& (* it1));
+ glPushName(GLNAME_MD_TYPE1); glPushName((long)
& (* it1));
glBegin(GL_POINTS);
SetColor(gv->colormode, & (* it1));
@@ -401,7 +401,7 @@
break;
}
- glPushName(GLNAME_MD_TYPE1); glPushName((i32u)
& (* it1));
+ glPushName(GLNAME_MD_TYPE1); glPushName((long)
& (* it1));
GLUquadricObj * qo = gluNewQuadric();
gluQuadricDrawStyle(qo, (GLenum) GLU_FILL);
@@ -460,7 +460,7 @@
break;
}
- glPushName(GLNAME_MD_TYPE1);
glPushName((i32u) (* it1).atmr[n2]);
+ glPushName(GLNAME_MD_TYPE1);
glPushName((long) (* it1).atmr[n2]);
GLUquadricObj * qo = gluNewQuadric();
gluQuadricDrawStyle(qo, (GLenum)
GLU_FILL);
diff -urN ../tmp-orig/ghemical-1.01/src/graphics/objects.h
./src/graphics/objects.h
--- ../tmp-orig/ghemical-1.01/src/graphics/objects.h 2001-12-29
15:56:49.000000000 +0100
+++ ./src/graphics/objects.h 2005-06-19 14:32:21.000000000 +0200
@@ -88,7 +88,7 @@
void SetModelView(void) const;
const obj_loc_data * GetLocData(void) const;
- protected:
+// protected:
obj_loc_data * GetLocDataRW(void) const;
diff -urN ../tmp-orig/ghemical-1.01/src/graphics/plane.cpp
./src/graphics/plane.cpp
--- ../tmp-orig/ghemical-1.01/src/graphics/plane.cpp 2001-10-23
15:10:41.000000000 +0200
+++ ./src/graphics/plane.cpp 2005-06-19 14:32:21.000000000 +0200
@@ -134,7 +134,7 @@
glPushMatrix();
glPushName(GLNAME_OBJECT);
- glPushName((iGLu) name);
+ glPushName((iGLu) (long) name);
// if this is a transparent object, we will not render the quads here.
// instead, the quads get rendered at docview::Render(), like all other
diff -urN ../tmp-orig/ghemical-1.01/src/graphics/qm1docv.cpp
./src/graphics/qm1docv.cpp
--- ../tmp-orig/ghemical-1.01/src/graphics/qm1docv.cpp 2002-10-31
14:11:11.000000000 +0100
+++ ./src/graphics/qm1docv.cpp 2005-06-19 14:32:21.000000000 +0200
@@ -191,7 +191,7 @@
if (!TestAtom(& (* it1), rm)) continue;
glPushName(GLNAME_MD_TYPE1);
- glPushName((i32u) & (* it1));
+ glPushName((long) & (* it1));
glBegin(GL_POINTS);
SetColor(gv->colormode, & (* it1));
@@ -218,7 +218,7 @@
rad *= (* it1).el.GetVDWRadius() *
4.0;
int res =
model_prefs->Value("QM1Graphics/BallResolution", 12);
- glPushName(GLNAME_MD_TYPE1); glPushName((i32u)
& (* it1));
+ glPushName(GLNAME_MD_TYPE1); glPushName((long)
& (* it1));
GLUquadricObj * qo = gluNewQuadric();
gluQuadricDrawStyle(qo, (GLenum) GLU_FILL);
diff -urN ../tmp-orig/ghemical-1.01/src/graphics/surface.cpp
./src/graphics/surface.cpp
--- ../tmp-orig/ghemical-1.01/src/graphics/surface.cpp 2002-10-31
14:11:11.000000000 +0100
+++ ./src/graphics/surface.cpp 2005-06-19 14:32:21.000000000 +0200
@@ -342,7 +342,7 @@
void color_surface::Render(void)
{
glPushName(GLNAME_OBJECT);
- glPushName((iGLu) name);
+ glPushName((iGLu) (long) name);
if (wireframe)
{
diff -urN ../tmp-orig/ghemical-1.01/src/graphics/views.cpp
./src/graphics/views.cpp
--- ../tmp-orig/ghemical-1.01/src/graphics/views.cpp 2002-10-24
14:09:53.000000000 +0200
+++ ./src/graphics/views.cpp 2005-06-19 14:32:21.000000000 +0200
@@ -233,7 +233,7 @@
// then just store the coordinates...
- fGL * ptr2 = (fGL *) ((i32u) udata + sizeof(i32s)); i32s counter = 0;
+ fGL * ptr2 = (fGL *) ((long) udata + sizeof(i32s)); i32s counter = 0;
for (iter_mm1al it1 = mdl->GetAtomsBegin();it1 !=
mdl->GetAtomsEnd();it1++)
{
ptr2[counter++] = (* it1).crd_vector[cset].data[0];
@@ -253,7 +253,7 @@
return;
}
- fGL * ptr2 = (fGL *) ((i32u) udata + sizeof(i32s)); i32s counter = 0;
+ fGL * ptr2 = (fGL *) ((long) udata + sizeof(i32s)); i32s counter = 0;
for (iter_mm1al it1 = docv->GetAtomsBegin();it1 !=
docv->GetAtomsEnd();it1++)
{
const i32s cset = 0; // how to set this?!?!?!
diff -urN ../tmp-orig/ghemical-1.01/src/graphics/views.h ./src/graphics/views.h
--- ../tmp-orig/ghemical-1.01/src/graphics/views.h 2002-05-27
15:36:39.000000000 +0200
+++ ./src/graphics/views.h 2005-06-19 14:43:32.000000000 +0200
@@ -29,6 +29,8 @@
class graphics_class_factory;
+class mm1_docv;
+
/*################################################################################################*/
class camera; // camera.h
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
