pkg/37035: math/gcalctool fails to build with gtk2.12

[Yakovetsky Vladimir <yx%x.ua@localhost>]

>Number:         37035
>Category:       pkg
>Synopsis:       math/gcalctool: fails to build with gtk2.12
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri Sep 28 11:30:00 +0000 2007
>Originator:     Yakovetsky Vladimir
>Release:        NetBSD 4.99.29
>Organization:
>Environment:
System: NetBSD lrou.x.ua 4.99.29 NetBSD 4.99.29 (lrou_odd-1.840) #0: Wed Aug 15 
18:46:47 EEST 2007 yx%lrou.x.ua@localhost:/sys/arch/i386/compile/lrou_odd i386
Architecture: i386
Machine: i386

>Description:
        misuse deprecated (since gtk 2.12) GtkTooltips
        together with defined GTK_DISABLE_DEPRECATED

>How-To-Repeat:
% cd /usr/pkgsrc/math/gcalctool && make
if cc -DHAVE_CONFIG_H -I. -I. -I.. -I/usr/pkg/include -DG_DISABLE_DEPRECATED 
-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED 
-DGNOME_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED 
-DPACKAGE_DATA_DIR=\""/usr/pkg/share"\" 
-DPACKAGE_LOCALE_DIR=\""/usr/pkg/share/locale"\" 
-DPACKAGE_PIXMAP_DIR=\""/usr/pkg/share/pixmaps"\" 
-D_POSIX_THREAD_SAFE_FUNCTIONS -I/usr/pkg/include/gtk-2.0 
-I/usr/pkg/lib/gtk-2.0/include -I/usr/pkg/include/atk-1.0 
-I/usr/pkg/include/cairo -I/usr/pkg/include/pango-1.0 -I/usr/pkg/include 
-I/usr/pkg/include/glib/glib-2.0 -I/usr/pkg/lib/glib-2.0/include 
-I/usr/pkg/include/freetype2 -I/usr/pkg/include/libpng12   -DORBIT2=1 -pthread 
-D_POSIX_THREAD_SAFE_FUNCTIONS -I/usr/pkg/include/libgnome-2.0 
-I/usr/pkg/include/orbit-2.0 -I/usr/pkg/include/gconf/2 
-I/usr/pkg/include/gnome-vfs-2.0 -I/usr/pkg/lib/gnome-vfs-2.0/include 
-I/usr/pkg/include/glib/glib-2.0 -I/usr/pkg/lib/glib-2.0/include 
-I/usr/pkg/include/libbonobo-2.0 -I/usr/pkg/include/bonobo-activation-2.0 -I/!
 usr/pkg/include/libgnomeui-2.0 -I/usr/pkg/include/libgnomecanvas-2.0 
-I/usr/pkg/include/gtk-2.0 -I/usr/pkg/include/libart-2.0 
-I/usr/pkg/include/libbonoboui-2.0 -I/usr/pkg/include/gnome-keyring-1 
-I/usr/pkg/include/pango-1.0 -I/usr/pkg/include -I/usr/pkg/include/freetype2 
-I/usr/pkg/lib/gtk-2.0/include -I/usr/pkg/include/atk-1.0 
-I/usr/pkg/include/cairo -I/usr/pkg/include/libpng12 -I/usr/pkg/include/libxml2 
  -DORBIT2=1 -pthread -I/usr/pkg/include/gconf/2 -I/usr/pkg/include/orbit-2.0 
-I/usr/pkg/include/glib/glib-2.0 -I/usr/pkg/lib/glib-2.0/include    
-I/usr/pkg/include -I/usr/include -I/usr/pkg/include/freetype2  -O2 
-mfpmath=sse -msse2 -march=pentium4 -finline-functions -fomit-frame-pointer 
-ffast-math -I/usr/pkg/include -I/usr/include -I/usr/pkg/include/freetype2 
-Wall -MT gtk.o -MD -MP -MF ".deps/gtk.Tpo" -c -o gtk.o gtk.c; \
        then mv -f ".deps/gtk.Tpo" ".deps/gtk.Po"; else rm -f ".deps/gtk.Tpo"; 
exit 1; fi
gtk.c:97: error: expected specifier-qualifier-list before 'GtkTooltips'
...
gmake[2]: *** [gtk.o] Error 1
gmake[2]: Leaving directory 
`/usr/obj/math/gcalctool/work/gcalctool-5.9.14/gcalctool'
gmake[1]: *** [all-recursive] Error 1
gmake[1]: Leaving directory `/usr/obj/math/gcalctool/work/gcalctool-5.9.14'
gmake: *** [all] Error 2
*** Error code 2

Stop.

>Fix:
:r /usr/pkgsrc/math/gcalctool/patches/patch-aa
--- gcalctool/gtk.c.orig
+++ gcalctool/gtk.c
@@ -27,6 +27,10 @@
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <netdb.h>
+#include <gtk/gtkversion.h>
+#if GTK_CHECK_VERSION(2,12,0)
+#undef GTK_DISABLE_DEPRECATED
+#endif
 #include "calctool.h"
 #include "extern.h"
 #include "dsdefs.h"