pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/fltk/patches Patches no longer needed
details: https://anonhg.NetBSD.org/pkgsrc/rev/f26ba9a78b04
branches: trunk
changeset: 482173:f26ba9a78b04
user: adam <adam%pkgsrc.org@localhost>
date: Thu Oct 21 08:30:22 2004 +0000
description:
Patches no longer needed
diffstat:
x11/fltk/patches/patch-ah | 32 --------------------------------
x11/fltk/patches/patch-ai | 22 ----------------------
2 files changed, 0 insertions(+), 54 deletions(-)
diffs (62 lines):
diff -r 0f90a4dae571 -r f26ba9a78b04 x11/fltk/patches/patch-ah
--- a/x11/fltk/patches/patch-ah Thu Oct 21 08:29:45 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2004/02/18 05:07:34 ben Exp $
-
---- src/Fl_Text_Buffer.cxx.orig 2003-05-28 09:09:12.000000000 -0700
-+++ src/Fl_Text_Buffer.cxx
-@@ -935,7 +935,8 @@ int Fl_Text_Buffer::expand_character( ch
- /* Convert control codes to readable character sequences */
- /*... is this safe with international character sets? */
- if ( ( ( unsigned char ) c ) <= 31 ) {
-- sprintf( outStr, "<%s>", ControlCodeTable[ c ] );
-+ i = c;
-+ sprintf( outStr, "<%s>", ControlCodeTable[ i ] );
- return strlen( outStr );
- } else if ( c == 127 ) {
- sprintf( outStr, "<del>" );
-@@ -958,12 +959,14 @@ int Fl_Text_Buffer::expand_character( ch
- ** to ignore).
- */
- int Fl_Text_Buffer::character_width( char c, int indent, int tabDist, char nullSubsChar ) {
-+ int i;
- /* Note, this code must parallel that in Fl_Text_Buffer::ExpandCharacter */
- if ( c == '\t' )
- return tabDist - ( indent % tabDist );
-- else if ( ( ( unsigned char ) c ) <= 31 )
-- return strlen( ControlCodeTable[ c ] ) + 2;
-- else if ( c == 127 )
-+ else if ( ( ( unsigned char ) c ) <= 31 ) {
-+ i = c;
-+ return strlen( ControlCodeTable[ i ] ) + 2;
-+ } else if ( c == 127 )
- return 5;
- else if ( c == nullSubsChar )
- return 5;
diff -r 0f90a4dae571 -r f26ba9a78b04 x11/fltk/patches/patch-ai
--- a/x11/fltk/patches/patch-ai Thu Oct 21 08:29:45 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2004/02/18 05:07:34 ben Exp $
-
---- src/fl_draw_pixmap.cxx.orig 2003-01-30 13:43:43.000000000 -0800
-+++ src/fl_draw_pixmap.cxx
-@@ -147,14 +147,15 @@ int fl_draw_pixmap(const char*const* di,
- // if first color is ' ' it is transparent (put it later to make
- // it not be transparent):
- if (*p == ' ') {
-- uchar* c = (uchar*)&d.colors[' '];
-+ uchar* c;
-+ transparent_index = ' ';
-+ c = (uchar*)&d.colors[transparent_index];
- #ifdef U64
- *(U64*)c = 0;
- # if WORDS_BIGENDIAN
- c += 4;
- # endif
- #endif
-- transparent_index = ' ';
- Fl::get_color(bg, c[0], c[1], c[2]); c[3] = 0;
- p += 4;
- ncolors--;
Home |
Main Index |
Thread Index |
Old Index