rpms/fltk/devel fltk-1.1.9-consts.patch, NONE, 1.1 fltk.spec, 1.38, 1.39

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/fltk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12389

Modified Files:
	fltk.spec 
Added Files:
	fltk-1.1.9-consts.patch 
Log Message:
fix uses of strchr wrt. constness

fltk-1.1.9-consts.patch:

--- NEW FILE fltk-1.1.9-consts.patch ---
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
       {


Index: fltk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fltk/devel/fltk.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- fltk.spec	24 Feb 2009 17:36:23 -0000	1.38
+++ fltk.spec	4 Mar 2009 11:14:39 -0000	1.39
@@ -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 @@
 # 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 @@
 %patch3 -p1 -b .undefined
 %patch4 -p1 -b .rpath
 %patch5 -p1 -b .fluid_desktop
+%patch6 -p1 -b .consts
 
 
 %build
@@ -206,6 +208,9 @@
 
 
 %changelog
+* Wed Mar 04 2009 Caolán McNamara <caolanm at redhat.com> - 1.1.9-3
+- fix uses of strchr wrt. constness
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild