Fix hex floating point input; bug #152021

(Portage version: 2.1.2-r9)

4 files changed, 81 insertions, 1 deletions

diff --git a/gnome-extra/gcalctool/ChangeLog b/gnome-extra/gcalctool/ChangeLog
index 691d7275f453..54a300e890bf 100644
--- a/gnome-extra/gcalctool/ChangeLog
+++ b/gnome-extra/gcalctool/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/gcalctool
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/ChangeLog,v 1.121 2007/02/09 23:46:59 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/ChangeLog,v 1.122 2007/02/11 02:08:00 dang Exp $
+
+*gcalctool-5.8.25-r1 (11 Feb 2007)
+
+  11 Feb 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/gcalctool-5.8.25-hex-float.patch, +gcalctool-5.8.25-r1.ebuild:
+  Fix hex floating point input; bug #152021
 
   09 Feb 2007; Roy Marples <uberlord@gentoo.org> gcalctool-5.8.25.ebuild:
   Added ~x86-fbsd keyword.
diff --git a/gnome-extra/gcalctool/files/digest-gcalctool-5.8.25-r1 b/gnome-extra/gcalctool/files/digest-gcalctool-5.8.25-r1
new file mode 100644
index 000000000000..f249a1c5b54a
--- /dev/null
+++ b/gnome-extra/gcalctool/files/digest-gcalctool-5.8.25-r1
@@ -0,0 +1,3 @@
+MD5 28074081a9625b8b3d1f7499bc27bbfb gcalctool-5.8.25.tar.bz2 1146544
+RMD160 78fb68e274e1e43fbc82ce6301b1595a798bedaa gcalctool-5.8.25.tar.bz2 1146544
+SHA256 a7942e8be300fdeea061ac5ed50b7f0b81e5bf7f598713317aff85b85b5345a3 gcalctool-5.8.25.tar.bz2 1146544
diff --git a/gnome-extra/gcalctool/files/gcalctool-5.8.25-hex-float.patch b/gnome-extra/gcalctool/files/gcalctool-5.8.25-hex-float.patch
new file mode 100644
index 000000000000..058585d5bfc1
--- /dev/null
+++ b/gnome-extra/gcalctool/files/gcalctool-5.8.25-hex-float.patch
@@ -0,0 +1,26 @@
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gcalctool-5.8.25.orig/gcalctool/ce_tokeniser.l gcalctool-5.8.25/gcalctool/ce_tokeniser.l
+--- gcalctool-5.8.25.orig/gcalctool/ce_tokeniser.l	2005-12-19 10:46:57.000000000 -0500
++++ gcalctool-5.8.25/gcalctool/ce_tokeniser.l	2007-02-10 20:36:06.000000000 -0500
+@@ -102,7 +102,7 @@ MPstr_to_num(yytext, v->base, celval.int
+ return tINUMBER;
+ }
+ 
+-{DIGIT}*{DECIMAL}{DIGIT}+ {
++{HEX}*{DECIMAL}{HEX}+ {
+ if (strlen(yytext) > 40) parser_state.error = -PARSER_ERR_TOO_LONG_NUMBER;
+ check_numbase(yytext);
+ MPstr_to_num(yytext, v->base, celval.int_t);
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gcalctool-5.8.25.orig/gcalctool/functions.c gcalctool-5.8.25/gcalctool/functions.c
+--- gcalctool-5.8.25.orig/gcalctool/functions.c	2006-11-02 13:02:44.000000000 -0500
++++ gcalctool-5.8.25/gcalctool/functions.c	2007-02-10 20:36:06.000000000 -0500
+@@ -1447,8 +1447,8 @@ do_shift()     /* Perform bitwise shift 
+             int n = char_val(e->button.value[0]);
+             int ret = usable_num(MPval);
+ 
+-            if (ret) {
+-	        update_statusbar(_("No sane value to store"), 
++            if (ret || !is_integer(MPval)) {
++	        update_statusbar(_("No sane value to do bitwise shift"), 
+                                  "gtk-dialog-error");
+ 	        return;
+             } 
diff --git a/gnome-extra/gcalctool/gcalctool-5.8.25-r1.ebuild b/gnome-extra/gcalctool/gcalctool-5.8.25-r1.ebuild
new file mode 100644
index 000000000000..d0e8afeff1bb
--- /dev/null
+++ b/gnome-extra/gcalctool/gcalctool-5.8.25-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-5.8.25-r1.ebuild,v 1.1 2007/02/11 02:08:00 dang Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="A calculator application for GNOME"
+HOMEPAGE="http://calctool.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.6
+	>=dev-libs/glib-2
+	>=dev-libs/atk-1.5
+	>=gnome-base/libgnome-2
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/gconf-2"
+DEPEND="${RDEPEND}
+	  sys-devel/gettext
+	  app-text/scrollkeeper
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.9
+	>=app-text/gnome-doc-utils-0.3.2"
+
+DOCS="AUTHORS ChangeLog* MAINTAINERS NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF} --enable-gnome"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	epatch "${FILESDIR}"/${P}-hex-float.patch
+}
+
+src_install() {
+	gnome2_src_install
+
+	# remove symlink that conflicts with <2.3 gnome-utils
+	rm -f "${D}"/usr/bin/gnome-calculator
+}