| 1 |
yngwin 09/07/05 08:36:59 |
| 2 |
|
| 3 |
Added: fltk-1.1.9-glibc2.10-scandir.patch |
| 4 |
fltk-1.1.9-consts.patch |
| 5 |
Log: |
| 6 |
Add patches to make 1.1.9 build with glibc-2.10/gcc-4.4. Fixes bug 270487. |
| 7 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 x11-libs/fltk/files/fltk-1.1.9-glibc2.10-scandir.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/fltk/files/fltk-1.1.9-glibc2.10-scandir.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/fltk/files/fltk-1.1.9-glibc2.10-scandir.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: fltk-1.1.9-glibc2.10-scandir.patch |
| 16 |
=================================================================== |
| 17 |
diff -up fltk-1.1.9/src/filename_list.cxx.gcc44 fltk-1.1.9/src/filename_list.cxx |
| 18 |
--- fltk-1.1.9/src/filename_list.cxx.gcc44 2006-06-09 11:16:34.000000000 -0500 |
| 19 |
+++ fltk-1.1.9/src/filename_list.cxx 2009-05-13 09:46:42.372917879 -0500 |
| 20 |
@@ -67,7 +67,7 @@ int fl_filename_list(const char *d, dire |
| 21 |
// The vast majority of UNIX systems want the sort function to have this |
| 22 |
// prototype, most likely so that it can be passed to qsort without any |
| 23 |
// changes: |
| 24 |
- int n = scandir(d, list, 0, (int(*)(const void*,const void*))sort); |
| 25 |
+ int n = scandir(d, list, 0, (int(*)(const dirent **,const dirent **))sort); |
| 26 |
#else |
| 27 |
// This version is when we define our own scandir (WIN32 and perhaps |
| 28 |
// some Unix systems) and apparently on IRIX: |
| 29 |
|
| 30 |
|
| 31 |
|
| 32 |
1.1 x11-libs/fltk/files/fltk-1.1.9-consts.patch |
| 33 |
|
| 34 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/fltk/files/fltk-1.1.9-consts.patch?rev=1.1&view=markup |
| 35 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/fltk/files/fltk-1.1.9-consts.patch?rev=1.1&content-type=text/plain |
| 36 |
|
| 37 |
Index: fltk-1.1.9-consts.patch |
| 38 |
=================================================================== |
| 39 |
diff -ru fltk-1.1.9.orig/src/fl_set_fonts_xft.cxx fltk-1.1.9/src/fl_set_fonts_xft.cxx |
| 40 |
--- fltk-1.1.9.orig/src/fl_set_fonts_xft.cxx 2009-03-04 10:58:49.000000000 +0000 |
| 41 |
+++ fltk-1.1.9/src/fl_set_fonts_xft.cxx 2009-03-04 11:01:25.000000000 +0000 |
| 42 |
@@ -253,13 +253,13 @@ |
| 43 |
// So the bit we want is up to the first comma - BUT some strings have |
| 44 |
// more than one name, separated by, guess what?, a comma... |
| 45 |
stop = start = first = 0; |
| 46 |
- stop = strchr((const char *)font, ','); |
| 47 |
- start = strchr((const char *)font, ':'); |
| 48 |
+ stop = strchr((char *)font, ','); |
| 49 |
+ start = strchr((char *)font, ':'); |
| 50 |
if ((stop) && (start) && (stop < start)) |
| 51 |
{ |
| 52 |
first = stop + 1; // discard first version of name |
| 53 |
// find first comma *after* the end of the name |
| 54 |
- stop = strchr((const char *)start, ','); |
| 55 |
+ stop = strchr((char *)start, ','); |
| 56 |
} |
| 57 |
else |
| 58 |
{ |
Archives