rpms/cssed/devel cssed-0.4.0-gcc44.patch, NONE, 1.1 cssed.spec, 1.4, 1.5

[Rafał Psota]

Author: rafalzaq

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

Modified Files:
	cssed.spec 
Added Files:
	cssed-0.4.0-gcc44.patch 
Log Message:
gcc44 build fix

cssed-0.4.0-gcc44.patch:

--- NEW FILE cssed-0.4.0-gcc44.patch ---
--- scintilla/src/LexCaml.cxx.orig	2005-05-27 05:30:23.000000000 +0200
+++ scintilla/src/LexCaml.cxx	2009-02-27 14:05:28.000000000 +0100
@@ -275,7 +275,7 @@
 			// [try to] interpret as [additional] operator char
 			char* o = 0;
 			if (iscaml(ch) || isspace(ch)			/* ident or whitespace */
-				|| ((o = strchr(")]};,\'\"`#", ch)) != 0)/* "termination" chars */
+				|| ((o = const_cast<char *>(strchr(")]};,\'\"`#", ch))) != 0)/* "termination" chars */
 				|| !strchr("!$%&*+-./:<=>?@^|~", ch)/* "operator" chars */) {
 				// check for INCLUSIVE termination
 				if (o && strchr(")]};,", ch)) {


Index: cssed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cssed/devel/cssed.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cssed.spec	24 Feb 2009 10:02:09 -0000	1.4
+++ cssed.spec	27 Feb 2009 13:32:25 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		cssed
 Version:	0.4.0
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	CSS editor and validator
 
 Group:		Applications/Editors
@@ -9,6 +9,7 @@
 Source0:	http://dl.sourceforge.net/sourceforge/cssed/%{name}-%{version}.tar.gz
 Source1:	%{name}.desktop
 Patch0:		cssed-0.4.0-headersfix.patch
+Patch1:		cssed-0.4.0-gcc44.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libxml2-devel,gettext,gtk2-devel,desktop-file-utils
@@ -37,6 +38,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .headersfix
+%patch1 -p0 -b .gcc44
 %{__sed} -i 's/\r//' include/{SciLexer.h,Scintilla.h,ScintillaWidget.h}
 %{__sed} -i 's/\r//' scintilla/License.txt
 %{__sed} -i '4i includedir\=\@includedir\@\npkgincludedir\=\${includedir}\/\@PACKAGE\@\n' cssed.pc.in
@@ -73,23 +75,31 @@
 %{_includedir}/cssed
 
 %changelog
+* Fri Feb 27 2009 Rafał Psota <rafalzaq at gmail.com> - 0.4.0-8
+- gcc44 build fix
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Sat Feb 09 2008 Rafał Psota <rafalzaq at gmail.com> - 0.4.0-6
 - gcc 4.3 rebuild
 - .desktop file fix
+
 * Sat Aug 25 2007 Rafał Psota <rafalzaq at gmail.com> - 0.4.0-5
 - BuildID rebuild
+
 * Sun Jan 07 2007 Rafał Psota <rafalzaq at gmail.com> - 0.4.0-4
 - add scintilla license
 - fixed .desktop file
 - fixed BRs & Rs
 - fixed end-of-lines
 - new patch
+
 * Sun Jan 07 2007 Rafał Psota <rafalzaq at gmail.com> - 0.4.0-3
 - fixed changelog
+
 * Sun Jan 07 2007 Rafał Psota <rafalzaq at gmail.com> - 0.4.0-2
 - fixed .desktop file and clean section
+
 * Sat Jan 06 2007 Rafał Psota <rafalzaq at gmail.com> - 0.4.0-1
 - Initial release