summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaleem Abdulrasool <compnerd@gentoo.org>2006-06-25 23:30:07 +0000
committerSaleem Abdulrasool <compnerd@gentoo.org>2006-06-25 23:30:07 +0000
commit2057cec88c77a61965737b5648a9496535874668 (patch)
treeb88dc5f362a4ba64d2f42164d37078b3ac7b0ef6 /gnome-extra/gcalctool/files
parentdropping older releases (bug #110984) (diff)
downloadgentoo-2-2057cec88c77a61965737b5648a9496535874668.tar.gz
gentoo-2-2057cec88c77a61965737b5648a9496535874668.tar.bz2
gentoo-2-2057cec88c77a61965737b5648a9496535874668.zip
dropping older releases (bug #110984)
(Portage version: 2.1.1_pre1-r2) (Unsigned Manifest commit)
Diffstat (limited to 'gnome-extra/gcalctool/files')
-rw-r--r--gnome-extra/gcalctool/files/digest-gcalctool-5.5.42-r13
-rw-r--r--gnome-extra/gcalctool/files/digest-gcalctool-5.5.42-r23
-rw-r--r--gnome-extra/gcalctool/files/gcalctool-5.5.42-hexdec-fix.patch190
-rw-r--r--gnome-extra/gcalctool/files/gcalctool-5.5.42-malloc.patch13
4 files changed, 0 insertions, 209 deletions
diff --git a/gnome-extra/gcalctool/files/digest-gcalctool-5.5.42-r1 b/gnome-extra/gcalctool/files/digest-gcalctool-5.5.42-r1
deleted file mode 100644
index 1bcdfaff0cf8..000000000000
--- a/gnome-extra/gcalctool/files/digest-gcalctool-5.5.42-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0f42e6e437f64c844b7b30e3255b02aa gcalctool-5.5.42.tar.bz2 1072489
-RMD160 6d9235ef9cec9e32bb5929d6567b009f4eca09ee gcalctool-5.5.42.tar.bz2 1072489
-SHA256 0b25a551c5b5e11e2aaee3e9e9e030928c99392e705f1e5f4c57c6ad41dc2ef2 gcalctool-5.5.42.tar.bz2 1072489
diff --git a/gnome-extra/gcalctool/files/digest-gcalctool-5.5.42-r2 b/gnome-extra/gcalctool/files/digest-gcalctool-5.5.42-r2
deleted file mode 100644
index 1bcdfaff0cf8..000000000000
--- a/gnome-extra/gcalctool/files/digest-gcalctool-5.5.42-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0f42e6e437f64c844b7b30e3255b02aa gcalctool-5.5.42.tar.bz2 1072489
-RMD160 6d9235ef9cec9e32bb5929d6567b009f4eca09ee gcalctool-5.5.42.tar.bz2 1072489
-SHA256 0b25a551c5b5e11e2aaee3e9e9e030928c99392e705f1e5f4c57c6ad41dc2ef2 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
deleted file mode 100644
index dfee7bb89dd8..000000000000
--- a/gnome-extra/gcalctool/files/gcalctool-5.5.42-hexdec-fix.patch
+++ /dev/null
@@ -1,190 +0,0 @@
---- 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/files/gcalctool-5.5.42-malloc.patch b/gnome-extra/gcalctool/files/gcalctool-5.5.42-malloc.patch
deleted file mode 100644
index 66b7827e4c74..000000000000
--- a/gnome-extra/gcalctool/files/gcalctool-5.5.42-malloc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gcalctool-5.5.42/gcalctool/syntax_translation.c
-===================================================================
---- gcalctool-5.5.42.orig/gcalctool/syntax_translation.c
-+++ gcalctool-5.5.42/gcalctool/syntax_translation.c
-@@ -21,7 +21,7 @@
-
- #include <stdio.h>
- #include <libintl.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include <assert.h>
- #include <string.h>
-