diff options
author | adam <adam@pkgsrc.org> | 2004-10-21 08:30:22 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2004-10-21 08:30:22 +0000 |
commit | 60f795885246c337c6001430dbaf6ae09b75b0ba (patch) | |
tree | 564a20cb18420405804615597f4b566aa935e3ad /x11 | |
parent | 92a0cfdaa610cb80ad59fc536e2ed4f748631061 (diff) | |
download | pkgsrc-60f795885246c337c6001430dbaf6ae09b75b0ba.tar.gz |
Patches no longer needed
Diffstat (limited to 'x11')
-rw-r--r-- | x11/fltk/patches/patch-ah | 32 | ||||
-rw-r--r-- | x11/fltk/patches/patch-ai | 22 |
2 files changed, 0 insertions, 54 deletions
diff --git a/x11/fltk/patches/patch-ah b/x11/fltk/patches/patch-ah deleted file mode 100644 index 06c23bee138..00000000000 --- a/x11/fltk/patches/patch-ah +++ /dev/null @@ -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 --git a/x11/fltk/patches/patch-ai b/x11/fltk/patches/patch-ai deleted file mode 100644 index 6512085c051..00000000000 --- a/x11/fltk/patches/patch-ai +++ /dev/null @@ -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--; |