wok-current rev 4243
Fix: fltk build with new toolchain
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Thu Sep 24 22:32:00 2009 +0200 (2009-09-24) |
parents | da1f31fbbf36 |
children | fb4d44366d13 |
files | fltk/receipt fltk/stuff/filename_list-dirent.patch fltk/stuff/fl_set_fonts_xft.patch |
line diff
1.1 --- a/fltk/receipt Thu Sep 24 21:40:03 2009 +0200 1.2 +++ b/fltk/receipt Thu Sep 24 22:32:00 2009 +0200 1.3 @@ -16,6 +16,8 @@ 1.4 compile_rules() 1.5 { 1.6 cd $src 1.7 + patch -p 0 < ../stuff/filename_list-dirent.patch || exit 1 1.8 + patch -p 0 < ../stuff/fl_set_fonts_xft.patch || exit 1 1.9 ./configure \ 1.10 --prefix=/usr \ 1.11 --mandir=/usr/share/man \
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/fltk/stuff/filename_list-dirent.patch Thu Sep 24 22:32:00 2009 +0200 2.3 @@ -0,0 +1,11 @@ 2.4 +--- src/filename_list.cxx Thu Sep 24 21:32:52 2009 2.5 ++++ src/filename_list.cxx Thu Sep 24 21:35:20 2009 2.6 +@@ -67,7 +67,7 @@ 2.7 + // The vast majority of UNIX systems want the sort function to have this 2.8 + // prototype, most likely so that it can be passed to qsort without any 2.9 + // changes: 2.10 +- int n = scandir(d, list, 0, (int(*)(const void*,const void*))sort); 2.11 ++ int n = scandir(d, list, 0, (int(*)(const dirent **,const dirent **))sort); 2.12 + #else 2.13 + // This version is when we define our own scandir (WIN32 and perhaps 2.14 + // some Unix systems) and apparently on IRIX:
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/fltk/stuff/fl_set_fonts_xft.patch Thu Sep 24 22:32:00 2009 +0200 3.3 @@ -0,0 +1,19 @@ 3.4 +--- src/fl_set_fonts_xft.cxx 2009-03-04 10:58:49.000000000 +0000 3.5 ++++ src/fl_set_fonts_xft.cxx 2009-03-04 11:01:25.000000000 +0000 3.6 +@@ -253,13 +253,13 @@ 3.7 + // So the bit we want is up to the first comma - BUT some strings have 3.8 + // more than one name, separated by, guess what?, a comma... 3.9 + stop = start = first = 0; 3.10 +- stop = strchr((const char *)font, ','); 3.11 +- start = strchr((const char *)font, ':'); 3.12 ++ stop = strchr((char *)font, ','); 3.13 ++ start = strchr((char *)font, ':'); 3.14 + if ((stop) && (start) && (stop < start)) 3.15 + { 3.16 + first = stop + 1; // discard first version of name 3.17 + // find first comma *after* the end of the name 3.18 +- stop = strchr((const char *)start, ','); 3.19 ++ stop = strchr((char *)start, ','); 3.20 + } 3.21 + else 3.22 + {