[ptx] Hugin Patches for GCC 3.4.1

[Emmanuel Favre-Nicolin]

Le lundi 5 Juillet 2004 20:09, Douglas Wilkins a écrit :
> Hi there!
> I have been patching hugin (CVS of 5 July 2004) to allow it to compile
> with GCC 3.4.1 (which is now the default compiler for the next
> Mandrakelinux release). I finally have it running, and have run some
> quick tests (imported 5 jpg's, created control points, run the preview
> and created jpg, tiff, "multilayer tiff" and "tiff using enblend"
> panoramas).
>
> That said, here are the patches split more or less by area and change:
> 03-vigra-update.patch.bz2 - two mistakes in vigra that are caught by the
> newer compiler. (corrections from latest mandrake vigra package)
> 04-vigra-namespace.patch.bz2 - explicit namespace declarations required
> by 3.4.1
> 05-hugin-fix1.patch.bz2 - remove dead code (never called) which has an
> undeclared variable "s"
> 06-hugin-move.patch.bz2 - move code so that forward declarations are not
> required
> 07-hugin-namepace.patch.bz2 - explicit namespace declarations required
> by 3.4.1

I used http://hugin.sourceforge.net/snapshots/hugin_2004_07_03-17_50.tgz and 
updated to CVS of 5 July 2004 (in the evening). I applied patches 03, 04, 05 
and 06.
during make install there are some errors :

    ---- Compiling UniversalCursor.cpp (C++)
g++ -I. -I../include -Wall -O2 -I/usr/lib/wx/include/gtk2-2.4 
-DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES 
-I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include 
-I/usr/X11R6/include -I../  -I../foreign  -c -o .obj/UniversalCursor.o 
UniversalCursor.cpp
In file included from /usr/include/gtk-1.2/gdk/gdk.h:31,
                 from UniversalCursor.cpp:67:
/usr/include/gtk-1.2/gdk/gdktypes.h:52: error: conflicting types for `typedef 
gulong GdkAtom'
/usr/include/wx/defs.h:2058: error: previous declaration as `typedef struct 
_GdkAtom*GdkAtom'
/usr/include/gtk-1.2/gdk/gdktypes.h:57: error: conflicting types for `typedef 
struct _GdkWindow GdkWindow'
/usr/include/wx/defs.h:2059: error: previous declaration as `typedef struct 
_GdkDrawable GdkWindow'
/usr/include/gtk-1.2/gdk/gdktypes.h:58: error: conflicting types for `typedef 
struct _GdkWindow GdkPixmap'
/usr/include/wx/defs.h:2061: error: previous declaration as `typedef struct 
_GdkDrawable GdkPixmap'
/usr/include/gtk-1.2/gdk/gdktypes.h:59: error: conflicting types for `typedef 
struct _GdkWindow GdkBitmap'
/usr/include/wx/defs.h:2060: error: previous declaration as `typedef struct 
_GdkDrawable GdkBitmap'
make[2]: *** [.obj/UniversalCursor.o] Error 1
make[2]: Leaving directory 
`/home/manu/Documents/tmp/Package_Source/hugin/src/hugin'

I hope I did it well, I will also try the one patch version.

> These work for me, but it would be nice if others could try these out,
> especially on older compilers under linux or on windows. :-)
>
> regards,
> Doug