diff options
author | reinoud <reinoud> | 2004-04-06 19:02:48 +0000 |
---|---|---|
committer | reinoud <reinoud> | 2004-04-06 19:02:48 +0000 |
commit | e8ada87333bbaa29967f8a948aa264e56027d347 (patch) | |
tree | 6e81ec08a830f1acd80cd3d4482354b52323a4cf /editors | |
parent | 156f4679a12ad18663a4d7732fc1243fa2529fe2 (diff) | |
download | pkgsrc-e8ada87333bbaa29967f8a948aa264e56027d347.tar.gz |
Fixing of fatal compilation errors. Mainly it redefined time_t causing it
to bomb out. Secondly it made assumptions about the processor being a 32
bitter wich gave rise to various warnings about pointer to integer
conversion. These were not that serious for they were mainly used for
calculating hash values but i decided to fix those too if only to get
better hash values.
Diffstat (limited to 'editors')
-rw-r--r-- | editors/TeXmacs/distinfo | 7 | ||||
-rw-r--r-- | editors/TeXmacs/patches/patch-ad | 13 | ||||
-rw-r--r-- | editors/TeXmacs/patches/patch-ae | 16 | ||||
-rw-r--r-- | editors/TeXmacs/patches/patch-af | 16 | ||||
-rw-r--r-- | editors/TeXmacs/patches/patch-ag | 13 | ||||
-rw-r--r-- | editors/TeXmacs/patches/patch-ah | 13 |
6 files changed, 77 insertions, 1 deletions
diff --git a/editors/TeXmacs/distinfo b/editors/TeXmacs/distinfo index 5e9568002f2..bd64bd469fe 100644 --- a/editors/TeXmacs/distinfo +++ b/editors/TeXmacs/distinfo @@ -1,7 +1,12 @@ -$NetBSD: distinfo,v 1.16 2004/04/04 23:19:45 recht Exp $ +$NetBSD: distinfo,v 1.17 2004/04/06 19:02:48 reinoud Exp $ SHA1 (TeXmacs-1.0.3.6-src.tar.gz) = 0cfb605ecea8544625b271ff449027a2a6d9f216 Size (TeXmacs-1.0.3.6-src.tar.gz) = 2458392 bytes SHA1 (patch-aa) = 95b9e42fe1ff343e891fe299382c3647636eec99 SHA1 (patch-ab) = 607bf8530544e39c91f38f4390c9c6eadc9efa84 SHA1 (patch-ac) = 03ca16a943531fe94ba3a6ad5055f92d087a3026 +SHA1 (patch-ad) = 467d93bfaf01a5750a7b2a799ced643bd87becf8 +SHA1 (patch-ae) = ea2d1cc62f0ecfbc13822091e66ead665f2a105b +SHA1 (patch-af) = c0c7cb96de31282cf68491d9cb1f73d89ded98f6 +SHA1 (patch-ag) = d2aab149b5ff85d9efc036c8eb1c4a477feecdcf +SHA1 (patch-ah) = df69f3e574f7851892215a2e830c989498af74f1 diff --git a/editors/TeXmacs/patches/patch-ad b/editors/TeXmacs/patches/patch-ad new file mode 100644 index 00000000000..167fa0c5da4 --- /dev/null +++ b/editors/TeXmacs/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1 2004/04/06 19:02:49 reinoud Exp $ + +--- src/Classes/Abstract/basic.hpp.orig 2004-04-05 23:16:59.000000000 +0200 ++++ src/Classes/Abstract/basic.hpp +@@ -81,7 +81,7 @@ inline SI max (SI i, SI j) { if (i>j) re + inline double min (double i, double j) { if (i<j) return i; else return j; } + inline double max (double i, double j) { if (i>j) return i; else return j; } + inline int hash (int i) { return i; } +-inline int hash (pointer ptr) { return (int) ptr; } ++inline int hash (pointer ptr) { return (int) ((char *) ptr - (char *) 0); } + inline int copy (int x) { return x; } + + enum display_control { INDENT, UNINDENT, HRULE, LF }; diff --git a/editors/TeXmacs/patches/patch-ae b/editors/TeXmacs/patches/patch-ae new file mode 100644 index 00000000000..3e97cf3ede1 --- /dev/null +++ b/editors/TeXmacs/patches/patch-ae @@ -0,0 +1,16 @@ +$NetBSD: patch-ae,v 1.1 2004/04/06 19:02:49 reinoud Exp $ + +--- src/Window/event.hpp.orig 2004-04-03 21:20:49.000000000 +0200 ++++ src/Window/event.hpp +@@ -15,10 +15,7 @@ + #include "tree.hpp" + #include "command.hpp" + +-#ifndef _TIME_T +-#define _TIME_T +-typedef long time_t; +-#endif ++#include <time.h> + + class window_rep; + typedef window_rep* window; diff --git a/editors/TeXmacs/patches/patch-af b/editors/TeXmacs/patches/patch-af new file mode 100644 index 00000000000..adac213b917 --- /dev/null +++ b/editors/TeXmacs/patches/patch-af @@ -0,0 +1,16 @@ +$NetBSD: patch-af,v 1.1 2004/04/06 19:02:49 reinoud Exp $ + +--- src/Window/display.hpp.orig 2004-04-03 21:20:49.000000000 +0200 ++++ src/Window/display.hpp +@@ -15,10 +15,7 @@ + #include "tree.hpp" + #include "bitmap_font.hpp" + +-#ifndef _TIME_T +-#define _TIME_T +-typedef long time_t; +-#endif ++#include <time.h> + + struct font; + class widget; diff --git a/editors/TeXmacs/patches/patch-ag b/editors/TeXmacs/patches/patch-ag new file mode 100644 index 00000000000..a4f45793682 --- /dev/null +++ b/editors/TeXmacs/patches/patch-ag @@ -0,0 +1,13 @@ +$NetBSD: patch-ag,v 1.1 2004/04/06 19:02:49 reinoud Exp $ + +--- src/Edit/Editor/edit_main.cpp.orig 2004-04-03 21:20:48.000000000 +0200 ++++ src/Edit/Editor/edit_main.cpp +@@ -250,7 +250,7 @@ edit_main_rep::print (url name, bool con + string col_name= env->get_string (BG_COLOR); + dev->set_background (dis->get_color (col_name)); + if (col_name != "white") +- dev->clear (0, -h, w, 0); ++ dev->clear (0, (int) -h, (int) w, 0); + + rectangles rs; + the_box[0]->sx(i)= 0; diff --git a/editors/TeXmacs/patches/patch-ah b/editors/TeXmacs/patches/patch-ah new file mode 100644 index 00000000000..22b54cb9270 --- /dev/null +++ b/editors/TeXmacs/patches/patch-ah @@ -0,0 +1,13 @@ +$NetBSD: patch-ah,v 1.1 2004/04/06 19:02:49 reinoud Exp $ + +--- src/Window/X/x_display.cpp.orig 2004-04-03 21:20:49.000000000 +0200 ++++ src/Window/X/x_display.cpp +@@ -44,7 +44,7 @@ bool operator != (x_character xc1, x_cha + (xc1->sf!=xc2->sf) || (xc1->fg!=xc2->fg) || (xc1->bg!=xc2->bg); } + + int hash (x_character xc) { +- return xc->c ^ ((int) xc->fng.rep) ^ xc->fg ^ xc->bg ^ xc->sf; } ++ return xc->c ^ ((int) ((char *) xc->fng.rep - (char *) 0)) ^ xc->fg ^ xc->bg ^ xc->sf; } + + void + x_display_rep::prepare_color (int sf, color fg, color bg) { |