- update to 6.2.0

x11/gnome/gcalctool/Makefile

@@ -1,11 +1,9 @@
-# $OpenBSD: Makefile,v 1.52 2011/09/20 20:52:46 jasper Exp $
+# $OpenBSD: Makefile,v 1.53 2011/09/27 06:28:14 jasper Exp $
 
 COMMENT=		GTK desktop calculator
 
 GNOME_PROJECT=		gcalctool
-GNOME_VERSION=		6.0.2
-
-REVISION=		5
+GNOME_VERSION=		6.2.0
 
 CATEGORIES=		math
 
@@ -15,12 +13,10 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-EXTRACT_SUFX=		.tar.bz2
-
 WANTLIB += GL X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
 WANTLIB += Xrandr Xrender atk-1.0 c cairo cairo-gobject expat
 WANTLIB += fontconfig freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
-WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 gtk-3 m pango-1.0
+WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 gtk-3 kvm m pango-1.0
 WANTLIB += pangocairo-1.0 pangoft2-1.0 pixman-1 png pthread pthread-stubs
 WANTLIB += xcb xcb-render xcb-shm xml2 z
 
@@ -29,16 +25,13 @@ MODULES=		devel/gettext \
 			devel/dconf
 
 LIB_DEPENDS+=		x11/gtk+3
-BUILD_DEPENDS=		devel/bison
-YACC=			bison
 
 # needed to download IMF/ECB rates (Financial mode)
 RUN_DEPENDS=		x11/gnome/gvfs
 
 MODGNOME_TOOLS= 	yelp
-MODGNOME_DESKTOP_FILE=		Yes
+MODGNOME_DESKTOP_FILE=	Yes
 
-CONFIGURE_ARGS+=	--with-gtk=3.0
 CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
 

x11/gnome/gcalctool/distinfo

@@ -1,5 +1,5 @@
-MD5 (gnome/gcalctool-6.0.2.tar.bz2) = UxVt2Wru7PaiZpKSAl3nXA==
-RMD160 (gnome/gcalctool-6.0.2.tar.bz2) = xnM2Y2mT26Yd7d8jHBepMstVYl0=
-SHA1 (gnome/gcalctool-6.0.2.tar.bz2) = eChe7tYdlQHnU0FhsU7sZ6OFiQs=
-SHA256 (gnome/gcalctool-6.0.2.tar.bz2) = YxkP3hvlICq0N3R4W1Uh2PEVksap4SVnMCjFrCNckxY=
-SIZE (gnome/gcalctool-6.0.2.tar.bz2) = 1275979
+MD5 (gnome/gcalctool-6.2.0.tar.xz) = LsME8RhzX2Jo04dBOUo7ng==
+RMD160 (gnome/gcalctool-6.2.0.tar.xz) = k0HpJMyodXyvT29cAZCtCz6Me1A=
+SHA1 (gnome/gcalctool-6.2.0.tar.xz) = 3Gm8G2WynOTkAmPP2sHAJgL8S/M=
+SHA256 (gnome/gcalctool-6.2.0.tar.xz) = 3cLv4lIg6TQYMjBN/Z5eI5CnC7a9cNGv60naiAI83/s=
+SIZE (gnome/gcalctool-6.2.0.tar.xz) = 999804

x11/gnome/gcalctool/patches/patch-src_math-equation_c

@@ -1,35 +0,0 @@
-$OpenBSD: patch-src_math-equation_c,v 1.2 2011/06/15 08:26:41 jasper Exp $
-
-From 97556066ca313d42fb7c73d136395729cd690489 Mon Sep 17 00:00:00 2001
-From: Joe Marcus Clarke <marcus@freebsd.org>
-Date: Wed, 15 Jun 2011 08:18:27 +0000
-Subject: Fix crash running on BSD
-
---- src/math-equation.c.orig	Tue May 24 05:20:42 2011
-+++ src/math-equation.c	Wed Jun 15 10:24:30 2011
-@@ -1305,6 +1305,7 @@ void
- math_equation_solve(MathEquation *equation)
- {
-     GError *error = NULL;
-+    gulong stacksize = 0;
- 
-     g_return_if_fail(equation != NULL);
- 
-@@ -1326,7 +1327,16 @@ math_equation_solve(MathEquation *equation)
- 
-     math_equation_set_number_mode(equation, NORMAL);
- 
--    g_thread_create(math_equation_solve_real, equation, false, &error);
-+    // Fix for https://bugzilla.gnome.org/show_bug.cgi?id=650174
-+    // FIXME: This is a real hack, should be avoidable when parser is rewritten and doesn't require a crazy large stack
-+    if (GLIB_SIZEOF_LONG == 8) {
-+           stacksize = 0x400000;
-+    } else {
-+           stacksize = 0x200000;
-+    }
-+
-+    g_thread_create_full(math_equation_solve_real, equation, stacksize, false,
-+        false, G_THREAD_PRIORITY_NORMAL, &error);
- 
-     if (error)
-         g_warning("Error spawning thread for calculations: %s\n", error->message);