diff --git a/fltk-1.1.9-consts.patch b/fltk-1.1.9-consts.patch new file mode 100644 index 0000000..1ca0d84 --- /dev/null +++ b/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/fltk.spec b/fltk.spec index b70b935..fa2c89f 100644 --- a/fltk.spec +++ b/fltk.spec @@ -6,7 +6,7 @@ Summary: C++ user interface toolkit Name: fltk Version: 1.1.9 -Release: 2%{?dist} +Release: 3%{?dist} # see COPYING (or http://www.fltk.org/COPYING.php ) for exceptions details License: LGPLv2+ with exceptions @@ -28,6 +28,7 @@ Patch3: fltk-1.1.x-r5750-undefined.patch # nuke --rpath (#238284) Patch4: fltk-1.1.x-r5750-rpath.patch Patch5: fltk-1.1.8-fluid_desktop.patch +Patch6: fltk-1.1.9-consts.patch %if 0%{?rhel} > 4 || 0%{?fedora} > 4 BuildRequires: libICE-devel libSM-devel @@ -85,6 +86,7 @@ Requires: %{name}-devel = %{version}-%{release} %patch3 -p1 -b .undefined %patch4 -p1 -b .rpath %patch5 -p1 -b .fluid_desktop +%patch6 -p1 -b .consts %build @@ -206,6 +208,9 @@ update-desktop-database >& /dev/null ||: %changelog +* Wed Mar 04 2009 Caolán McNamara - 1.1.9-3 +- fix uses of strchr wrt. constness + * Tue Feb 24 2009 Fedora Release Engineering - 1.1.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild