fix for bug #95463, backport patch from gnome CVS.

Package-Manager: portage-2.0.51.19

5 files changed, 250 insertions, 17 deletions

diff --git a/gnome-extra/gcalctool/ChangeLog b/gnome-extra/gcalctool/ChangeLog
index 158905eca529..46dceface1b9 100644
--- a/gnome-extra/gcalctool/ChangeLog
+++ b/gnome-extra/gcalctool/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/gcalctool
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/ChangeLog,v 1.62 2005/06/09 19:52:15 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/ChangeLog,v 1.63 2005/06/11 13:23:59 allanonjl Exp $
+
+*gcalctool-5.5.42-r1 (11 Jun 2005)
+
+  11 Jun 2005; John N. Laliberte <allanonjl@gentoo.org>
+  +files/gcalctool-5.5.42-hexdec-fix.patch, +gcalctool-5.5.42-r1.ebuild:
+  fix for bug #95463, backport patch from gnome CVS.
 
   09 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   gcalctool-5.5.41.ebuild:
diff --git a/gnome-extra/gcalctool/Manifest b/gnome-extra/gcalctool/Manifest
index 727e3effb76a..2837a43cc4e6 100644
--- a/gnome-extra/gcalctool/Manifest
+++ b/gnome-extra/gcalctool/Manifest
@@ -1,21 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 8f7cf038381c5100cfb707d51f01f1f0 gcalctool-5.5.42.ebuild 938
 MD5 59fcbca88a444647d7031463d7fe3afe gcalctool-5.5.41.ebuild 938
+MD5 5fc2d9d6abb21e1596c3195a5a59cbbf gcalctool-4.4.20.ebuild 951
 MD5 06757f29077ba93d75f8bb762caee848 gcalctool-4.4.22.ebuild 959
+MD5 8f7cf038381c5100cfb707d51f01f1f0 gcalctool-5.5.42.ebuild 938
+MD5 0e989db683655a518ab1b3b70f1e1ee8 gcalctool-5.5.42-r1.ebuild 1049
+MD5 127509f5837fdb183d1cab1fab2c7cf9 ChangeLog 6904
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 874900535ab521dddaf601c59554b254 ChangeLog 6684
-MD5 5fc2d9d6abb21e1596c3195a5a59cbbf gcalctool-4.4.20.ebuild 951
-MD5 84697b19eaf743396f6d59b86a058b66 files/gcalctool-4.4.20-remove_disable_deprecated.patch 1289
-MD5 d25091f431080032c9f203ea97882402 files/digest-gcalctool-4.4.22 69
+MD5 65a63bafe87741895d52ee30ab304b93 files/digest-gcalctool-5.5.42-r1 70
 MD5 16a23e780e431cedcd5a78e64aab35c3 files/digest-gcalctool-4.4.20 69
-MD5 65a63bafe87741895d52ee30ab304b93 files/digest-gcalctool-5.5.42 70
+MD5 d25091f431080032c9f203ea97882402 files/digest-gcalctool-4.4.22 69
 MD5 804e74faec2cab4025478c0bfc0e4bfd files/digest-gcalctool-5.5.41 70
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFCqJ4DKRy60XGEcJIRAklbAKCGSuAKyds3MaDU2yythKauwRuiCwCeNPDU
-UFJhI1Of0umZ+ZL/jYOJfSU=
-=bi7L
------END PGP SIGNATURE-----
+MD5 65a63bafe87741895d52ee30ab304b93 files/digest-gcalctool-5.5.42 70
+MD5 643f5117320cc2c403b8eceff4d156b9 files/gcalctool-5.5.42-hexdec-fix.patch 4268
+MD5 84697b19eaf743396f6d59b86a058b66 files/gcalctool-4.4.20-remove_disable_deprecated.patch 1289
diff --git a/gnome-extra/gcalctool/files/digest-gcalctool-5.5.42-r1 b/gnome-extra/gcalctool/files/digest-gcalctool-5.5.42-r1
new file mode 100644
index 000000000000..76f9798750de
--- /dev/null
+++ b/gnome-extra/gcalctool/files/digest-gcalctool-5.5.42-r1
@@ -0,0 +1 @@
+MD5 0f42e6e437f64c844b7b30e3255b02aa gcalctool-5.5.42.tar.bz2 1072489
diff --git a/gnome-extra/gcalctool/files/gcalctool-5.5.42-hexdec-fix.patch b/gnome-extra/gcalctool/files/gcalctool-5.5.42-hexdec-fix.patch
new file mode 100644
index 000000000000..dfee7bb89dd8
--- /dev/null
+++ b/gnome-extra/gcalctool/files/gcalctool-5.5.42-hexdec-fix.patch
@@ -0,0 +1,190 @@
+--- gcalctool-5.5.42/gcalctool/functions.c	2005-03-14 14:08:33.000000000 -0500
++++ gcalctool-5.5.42.new/gcalctool/functions.c	2005-06-11 08:55:23.000000000 -0400
+@@ -63,21 +63,6 @@
+     }
+ }
+ 
+-
+-void
+-do_base(enum base_type b)    /* Change the current base setting. */
+-{
+-    v->base = b;
+-    put_resource(R_BASE, Rbstr[(int) v->base]);
+-    grey_buttons(v->base);
+-    refresh_display();
+-    v->pending = 0;
+-    if (v->rstate) {
+-        make_registers();
+-    }
+-}
+-
+-
+ void
+ do_business()     /* Perform special business mode calculations. */
+ {
+@@ -614,7 +599,6 @@
+     } else assert(0);
+   
+     return(do_tfunc(s, t, tfunc));
+-
+ }
+ 
+ 
+@@ -629,72 +613,25 @@
+ int
+ do_tfunc(int s[MP_SIZE], int t[MP_SIZE], enum trig_func tfunc)
+ {
+-    enum mode {
+-        normal = 0,
+-        inv = 1,
+-        hyp = 2,
+-        invhyp = 3,
+-    } mode;
+-
+-    int inverse;
+-    int hyperbolic;
+-
+-    if (!v->current) {
+-        return(-EINVAL);
+-    }
+-
+-    inverse = (v->inverse) ? inv : 0;
+-    hyperbolic = (v->hyperbolic) ? hyp : 0;
+-
+-    mode = (inverse | hyperbolic);
+-
+-    switch (mode) {
+-        case normal:
+-            if (tfunc & SIN) {
+-                calc_trigfunc(sin_t, s, t);
+-            } else if (tfunc & COS) {
+-                calc_trigfunc(cos_t, s, t);
+-            } else if (tfunc & TAN) {
+-                calc_trigfunc(tan_t, s, t);
+-            }
+-            break;
+-
+-        case inv:
+-            if (tfunc & SIN) {
+-                calc_trigfunc(asin_t, s, t);
+-            } else if (tfunc & COS) {
+-                calc_trigfunc(acos_t, s, t);
+-            } else if (tfunc & TAN) {
+-                calc_trigfunc(atan_t, s, t);
+-            }
+-            break;
+-
+-        case hyp:
+-            if (tfunc & SIN) {
+-                calc_trigfunc(sinh_t, s, t);
+-            } else if (tfunc & COS) {
+-                calc_trigfunc(cosh_t, s, t);
+-            } else if (tfunc & TAN) {
+-                calc_trigfunc(tanh_t, s, t);
+-            }
+-            break;
+-
+-        case invhyp:
+-            if (tfunc & SIN) {
+-                calc_trigfunc(asinh_t, s, t);
+-            } else if (tfunc & COS) {
+-                calc_trigfunc(acosh_t, s, t);
+-            } else if (tfunc & TAN) {
+-                calc_trigfunc(atanh_t, s, t);
+-            } 
+-            break;
+-
+-        default:
+-            assert(0);
+-    }
+-
+-
+-    return(0);
++    // Assumes the SIN=0, COS=1, TAN=2
++    
++    assert(tfunc < 3); 
++    
++    enum trig_func conv_table[3][4] = {
++	{sin_t, asin_t, sinh_t, asinh_t},
++	{cos_t, acos_t, cosh_t, acosh_t},
++	{tan_t, atan_t, tanh_t, atanh_t},
++    };
++    
++    int inverse = (v->inverse) ? 1 : 0;
++    int hyperbolic = (v->hyperbolic) ? 2 : 0;
++    int mode = (inverse | hyperbolic);
++    
++    if (!v->current) return -EINVAL;
++    
++    calc_trigfunc(conv_table[tfunc][mode], s, t);
++    
++    return 0;
+ }
+ 
+ 
+@@ -715,6 +652,43 @@
+     clear_display(FALSE);
+ }
+ 
++void
++do_base(enum base_type b)    /* Change the current base setting. */
++{
++    v->base = b;
++    put_resource(R_BASE, Rbstr[(int) v->base]);
++    grey_buttons(v->base);
++    
++    switch (v->syntax) {
++    case npa:
++	v->pending = 0;
++	if (v->rstate) {
++	    make_registers();
++	}
++	break;
++	
++    case exprs: {
++	int MP[MP_SIZE];
++	int ret = usable_num(MP);
++	if (ret) {
++	    update_statusbar(_("No sane value to convert"), 
++			     "gtk-dialog-error");
++	} else {
++	    mpstr(v->e.ans, v->e.ansbak);
++	    mpstr(MP, v->e.ans);
++	    exp_replace("Ans");
++	    v->e.calc_complete = 1;
++	    make_registers();
++	}
++    }
++    break;
++    
++    default:
++	assert(0);
++    }
++    
++    refresh_display();
++}
+ 
+ static void
+ do_constant()
+@@ -778,8 +752,8 @@
+ static void
+ do_exchange()         /* Exchange display with memory register. */
+ {
+-  int MPtemp[MP_SIZE];
+-  int MPexpr[MP_SIZE];
++    int MPtemp[MP_SIZE];
++    int MPexpr[MP_SIZE];
+ 
+     switch (v->syntax) {
+         case npa:
+@@ -804,6 +778,10 @@
+ 	      mpstr(MPtemp, v->e.ans);	      
+ 	      // TODO: duplicated code in do_expression
+ 	      mpstr(v->e.ans, v->e.ansbak);
++	      if (v->e.expbak) {
++		free(v->e.expbak);
++		v->e.expbak = NULL;
++	      }
+ 	      v->e.expbak = gc_strdup(v->expression);
+ 	      exp_replace("Ans");
+ 	      v->e.calc_complete = 1;
diff --git a/gnome-extra/gcalctool/gcalctool-5.5.42-r1.ebuild b/gnome-extra/gcalctool/gcalctool-5.5.42-r1.ebuild
new file mode 100644
index 000000000000..3bb865788643
--- /dev/null
+++ b/gnome-extra/gcalctool/gcalctool-5.5.42-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-5.5.42-r1.ebuild,v 1.1 2005/06/11 13:23:59 allanonjl Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="A scientific calculator for Gnome2"
+HOMEPAGE="http://calctool.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~hppa ~alpha ~ia64 ~amd64 ~mips ~arm ~ppc64"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.6
+	>=gnome-base/libgnome-2
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/gconf-1.2
+	>=dev-libs/atk-1.6"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.29
+	app-text/scrollkeeper
+	dev-util/pkgconfig"
+
+DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO MAINTAINERS"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# fix for bug #95463
+	epatch ${FILESDIR}/${P}-hexdec-fix.patch
+}
+
+src_install() {
+
+	gnome2_src_install scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/
+
+	# remove symlink that conflicts with <2.3 gnome-utils
+	rm -f ${D}/usr/bin/gnome-calculator
+
+}
+USE_DESTDIR="1"