pkg/37017: Update Galculator from 1.2.5.2 to 1.3

["César Catrián Carreño" <ccatrian%eml.cc@localhost>]

>Number:         37017
>Category:       pkg
>Synopsis:       Update Galculator from 1.2.5.2 to 1.3
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sat Sep 22 15:55:00 +0000 2007
>Originator:     César Catrián Carreño
>Release:        NetBSD 4.99.31 i386
>Organization:
>Environment:


System: NetBSD 4.99.31 (Basado en GENERIC: 1.781) #0: Thu Sep 20 21:50:32 CLT 
2007
        
cetrox%core.cjc.cl@localhost:/home/cetrox/src/netbsd-current/src/sys/arch/i386/compile/SAT



>Description:


Old source fails to build with new gtk-2:
In file included from main.c:34:
general_functions.h:54: error: conflicting types for 'gdk_color_to_string'
/pkg_comp/obj/pkgsrc/math/galculator/default/.buildlink/include/gtk-2.0/gdk/gdkcolor.h:137:
 error: previous declaration of 'gdk_color_to_string' was here
and
general_functions.c:320: error: conflicting types for 'gdk_color_to_string'
/pkg_comp/obj/pkgsrc/math/galculator/default/.buildlink/include/gtk-2.0/gdk/gdkcolor.h:137:
 error: previous declaration of 'gdk_color_to_string' was here


>How-To-Repeat:





>Fix:


--- math/galculator/Makefile.orig       2007-09-22 10:28:50.000000000 -0400
+++ math/galculator/Makefile    2007-09-22 10:32:06.000000000 -0400
@@ -1,8 +1,7 @@
 # $NetBSD: Makefile,v 1.13 2007/09/21 13:03:58 wiz Exp $
 #
 
-DISTNAME=              galculator-1.2.5.2
-PKGREVISION=           2
+DISTNAME=              galculator-1.3
 CATEGORIES=            math
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=galculator/}
 
@@ -10,6 +9,8 @@
 HOMEPAGE=              http://galculator.sourceforge.net/
 COMMENT=               Desktop calculator with scientific / RPN modes
 
+WRKSRC=                        ${WRKDIR}/galculator-1.3.0
+
 USE_PKGLOCALEDIR=      yes
 GNU_CONFIGURE=         yes
 USE_TOOLS+=            gmake msgfmt pkg-config intltool


--- math/galculator/PLIST.orig  2007-09-22 10:34:03.000000000 -0400
+++ math/galculator/PLIST       2007-09-22 10:35:47.000000000 -0400
@@ -4,19 +4,24 @@
 share/applications/galculator.desktop
 share/galculator/glade/about.glade
 share/galculator/glade/basic_buttons.glade
-share/galculator/glade/color.glade
+share/galculator/glade/classic_view.glade
 share/galculator/glade/dispctrl_bottom.glade
 share/galculator/glade/dispctrl_right.glade
 share/galculator/glade/dispctrl_right_vertical.glade
-share/galculator/glade/font.glade
 share/galculator/glade/main_frame.glade
+share/galculator/glade/paper_view.glade
 share/galculator/glade/prefs.glade
 share/galculator/glade/scientific_buttons.glade
 share/locale/de/LC_MESSAGES/galculator.mo
+share/locale/es_MX/LC_MESSAGES/galculator.mo
 share/locale/fr/LC_MESSAGES/galculator.mo
 share/locale/ja/LC_MESSAGES/galculator.mo
 share/locale/pl/LC_MESSAGES/galculator.mo
 share/locale/pt_BR/LC_MESSAGES/galculator.mo
 share/locale/ro/LC_MESSAGES/galculator.mo
+share/locale/ru/LC_MESSAGES/galculator.mo
+share/locale/sk/LC_MESSAGES/galculator.mo
+share/pixmaps/galculator/galculator.svg
+share/pixmaps/galculator/galculator_48x48.png
 @dirrm share/galculator/glade
 @dirrm share/galculator