Hi Tambet, El lun, 23-09-2002 a las 12:05, Tambet Ingo escribió: > CVSROOT: /cvs/gnome > Module name: gnome-system-tools > Changes by: carlosg 02/09/22 17:12:17 > > Modified files: > src/time/e-map : ChangeLog Makefile.am e-map.c > > Log message: > 2002-09-22 Carlos Garnacho Parro <garnacho@tuxerver.net> > > * Makefile.am: fixed to create marshallers before trying to use them > > * e-map.c: fixed to use created marshaller > > URL : http://cvs.gnome.org/bonsai/cvsquery.cgi?module=gnome-system-tools&branch=HEAD&branchtype=match&dir=gnome-system-tools&file=&filetype=match&who=carlosg&whotype=match&sortby=Date&hours=&date=explicit&mindate=09%2F22%2F02+17%3A11&maxdate=09%2F22%2F02+17%3A13&cvsroot=%2Fcvs%2Fgnome > > > What was the reason of that commit? Have you tried to re-download and re-compile from CVS before this commit (I did it)? carlos@mortadelo:~/gnome-system-tools$ ./autogen.sh --prefix=/usr/ ... ... ... Now type `make' to compile GNOME System Tools. carlos@mortadelo:~/gnome-system-tools$ cd src/time/e-map/ carlos@mortadelo:~/gnome-system-tools/src/time/e-map$ ls ChangeLog e-map.c e-map-marshal.list gen-seq.c Makefile.am CVS e-map.h e-map-test.c Makefile Makefile.in carlos@mortadelo:~/gnome-system-tools/src/time/e-map$ make gcc -DHAVE_CONFIG_H -I. -I. -I../../.. -DMAP_DIR=\""/usr//share/gnome-system-tools/pixmaps"\" -I/usr/include/libgnomeui-2.0 -I/usr/include/libgnome-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/gtk-2.0 -I/usr/include/libart-2.0 -I/usr/include/gconf/2 -I/usr/include/libbonoboui-2.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/orbit-2.0 -I/usr/include/libbonobo-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/linc-1.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/X11R6/include -I/usr/include/libglade-2.0 -I/usr/include/gal-2-0 -I/usr/include/libgnomeprint-2.0 -DXST_CRACK_LIB_DICT_PATH="\"/usr/lib/\"" -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -I../../../src/common -g -O2 -c e-map.c e-map.c:32: e-map-marshal.h: No such file or directory make: *** [e-map.o] Error 1 carlos@mortadelo:~/gnome-system-tools/src/time/e-map$ That's the reason for that commit. The e-map-marshal.[ch] weren't created before using them. > > Makefile.am was done by suggested (http://developer.gnome.org/dotplan/porting/ar01s15.html) > way, it worked before that commit also: > > [tambet@router e-map]$ make > ( /home/tambet/gnome2/bin/glib-genmarshal --prefix=e_map_marshal e-map-marshal.list --header > e-map-marshal.tmp \ > && mv e-map-marshal.tmp e-map-marshal.h ) \ > || ( rm -f e-map-marshal.tmp && exit 1 ) > source='e-map.c' object='libemap_a-e-map.o' libtool=no \ > depfile='.deps/libemap_a-e-map.Po' tmpdepfile='.deps/libemap_a-e-map.TPo' \ > depmode=gcc3 /bin/sh ../../../depcomp \ > gcc -DHAVE_CONFIG_H -I. -I. -I../../.. -DMAP_DIR=\""/home/tambet/gnome2/share/ > <snip> > > e-map.c: > > [tambet@router e-map]$ cvs diff -u -r 1.23 -r 1.24 > cvs server: Diffing . > Index: e-map.c > =================================================================== > RCS file: /cvs/gnome/gnome-system-tools/src/time/e-map/e-map.c,v > retrieving revision 1.23 > retrieving revision 1.24 > diff -u -r1.23 -r1.24 > --- e-map.c 18 Sep 2002 12:50:04 -0000 1.23 > +++ e-map.c 22 Sep 2002 21:12:16 -0000 1.24 > @@ -200,7 +200,7 @@ > G_SIGNAL_RUN_LAST, > G_STRUCT_OFFSET (EMapClass, set_scroll_adjustments), > NULL, NULL, > - e_map_marshal_VOID__OBJECT_OBJECT, > + g_cclosure_user_marshal_VOID__OBJECT_OBJECT, > G_TYPE_NONE, 2, > GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT); > /* > > > Why did you have to rename that closure? Does it look better now? I forgot to restore the --prefix parameter in glib-genmarshall, sorry > > > There are TONS of bugs to fix, why waste time on some questionable non-important my-way-is-the-best-way > things? > Yeah, there are tons of bugs, but this was a blocker bug, It happened in my computer and in the computer of 2 kind users that reported me the bug by IRC. my-way-is-the-best-way? do you really have that concept about me? I'm not going to spend any time anwering that... Carlos
Esta parte del mensaje esta firmada digitalmente