diff options
| author |   Ben de Groot <yngwin@gentoo.org> | 2009-07-05 08:37:00 +0000 |
|---|---|---|
| committer | Ben de Groot <yngwin@gentoo.org> | 2009-07-05 08:37:00 +0000 |
| commit | 6a1411ce1df3131521993e1a9c59dea659160378 (patch) | |
| tree | a9d3f55b974922b9d3f3643274b0f5e1264d8918 /x11-libs/fltk/files | |
| parent | Initial import. (diff) | |
| download | gentoo-2-6a1411ce1df3131521993e1a9c59dea659160378.tar.gz gentoo-2-6a1411ce1df3131521993e1a9c59dea659160378.tar.bz2 gentoo-2-6a1411ce1df3131521993e1a9c59dea659160378.zip | |
Add patches to make 1.1.9 build with glibc-2.10/gcc-4.4. Fixes bug 270487.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs/fltk/files')
| -rw-r--r-- | x11-libs/fltk/files/fltk-1.1.9-consts.patch | 20 | ||||
| -rw-r--r-- | x11-libs/fltk/files/fltk-1.1.9-glibc2.10-scandir.patch | 12 |
2 files changed, 32 insertions, 0 deletions
diff --git a/x11-libs/fltk/files/fltk-1.1.9-consts.patch b/x11-libs/fltk/files/fltk-1.1.9-consts.patch new file mode 100644 index 000000000000..1ca0d84c9fc4 --- /dev/null +++ b/x11-libs/fltk/files/fltk-1.1.9-consts.patch @@ -0,0 +1,20 @@ +diff -ru fltk-1.1.9.orig/src/fl_set_fonts_xft.cxx fltk-1.1.9/src/fl_set_fonts_xft.cxx +--- fltk-1.1.9.orig/src/fl_set_fonts_xft.cxx 2009-03-04 10:58:49.000000000 +0000 ++++ fltk-1.1.9/src/fl_set_fonts_xft.cxx 2009-03-04 11:01:25.000000000 +0000 +@@ -253,13 +253,13 @@ + // So the bit we want is up to the first comma - BUT some strings have + // more than one name, separated by, guess what?, a comma... + stop = start = first = 0; +- stop = strchr((const char *)font, ','); +- start = strchr((const char *)font, ':'); ++ stop = strchr((char *)font, ','); ++ start = strchr((char *)font, ':'); + if ((stop) && (start) && (stop < start)) + { + first = stop + 1; // discard first version of name + // find first comma *after* the end of the name +- stop = strchr((const char *)start, ','); ++ stop = strchr((char *)start, ','); + } + else + { diff --git a/x11-libs/fltk/files/fltk-1.1.9-glibc2.10-scandir.patch b/x11-libs/fltk/files/fltk-1.1.9-glibc2.10-scandir.patch new file mode 100644 index 000000000000..0051306ebc2a --- /dev/null +++ b/x11-libs/fltk/files/fltk-1.1.9-glibc2.10-scandir.patch @@ -0,0 +1,12 @@ +diff -up fltk-1.1.9/src/filename_list.cxx.gcc44 fltk-1.1.9/src/filename_list.cxx +--- fltk-1.1.9/src/filename_list.cxx.gcc44 2006-06-09 11:16:34.000000000 -0500 ++++ fltk-1.1.9/src/filename_list.cxx 2009-05-13 09:46:42.372917879 -0500 +@@ -67,7 +67,7 @@ int fl_filename_list(const char *d, dire + // The vast majority of UNIX systems want the sort function to have this + // prototype, most likely so that it can be passed to qsort without any + // changes: +- int n = scandir(d, list, 0, (int(*)(const void*,const void*))sort); ++ int n = scandir(d, list, 0, (int(*)(const dirent **,const dirent **))sort); + #else + // This version is when we define our own scandir (WIN32 and perhaps + // some Unix systems) and apparently on IRIX: |