Add gcc41 patch

This commit is contained in:
Jochen Schmitt 2006-03-22 17:22:58 +00:00
parent 4b114cec4e
commit 556108124d
3 changed files with 16 additions and 18 deletions

View File

@ -1,16 +0,0 @@
diff -ur highlight-2.4.4.old/highlight/codegenerator.cpp highlight-2.4.4/highlight/codegenerator.cpp
--- highlight-2.4.4.old/highlight/codegenerator.cpp 2006-02-19 09:11:18.000000000 -0800
+++ highlight-2.4.4/highlight/codegenerator.cpp 2006-02-19 09:11:18.000000000 -0800
@@ -284,7 +284,11 @@
bool CodeGenerator::readNewLine(string &newLine){
bool eof;
- terminatingChar=newLine[lineIndex-1];
+ if (lineIndex > 0) {
+ terminatingChar=newLine[lineIndex-1];
+ } else {
+ terminatingChar = '\0';
+ }
if (formattingPossible && formattingEnabled) {
eof=!formatter->hasMoreLines();
if (!eof) {

11
highlight-2.4-gcc41.patch Normal file
View File

@ -0,0 +1,11 @@
--- highlight-2.4.5/highlight/codegenerator.h.org 2006-03-22 17:45:01.000000000 +0100
+++ highlight-2.4.5/highlight/codegenerator.h 2006-03-22 17:50:02.000000000 +0100
@@ -248,7 +248,7 @@
string &getTitle();
/** \param p HTML anchor prefix */
- void CodeGenerator::setHTMLAnchorPrefix(const string & p);
+ void setHTMLAnchorPrefix(const string & p);
protected:
CodeGenerator(highlight::OutputType type);

View File

@ -1,7 +1,7 @@
Name: highlight Name: highlight
Summary: Universal source code to formatted text converter Summary: Universal source code to formatted text converter
Version: 2.4.5 Version: 2.4.5
Release: 1%{?dist} Release: 2%{?dist}
Group: Development/Tools Group: Development/Tools
License: GPL License: GPL
@ -10,6 +10,7 @@ URL: http://www.andre-simon.de/
Source0: http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz Source0: http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz
Patch1: highlight-2.4-makefile.patch Patch1: highlight-2.4-makefile.patch
Patch2: highlight-2.4-rpmoptflags.patch Patch2: highlight-2.4-rpmoptflags.patch
Patch3: highlight-2.4-gcc41.patch
Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
@ -25,6 +26,7 @@ It is easily possible to create new language definitions and colour themes.
%setup -q %setup -q
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1
%build %build
make %{?_smp_mflags} LDFLAGS= make %{?_smp_mflags} LDFLAGS=
@ -49,8 +51,9 @@ rm -rf $RPM_BUILD_ROOT
%doc ChangeLog AUTHORS README* COPYING TODO examples/ %doc ChangeLog AUTHORS README* COPYING TODO examples/
%changelog %changelog
* Wed Mar 22 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.4.5-1 * Wed Mar 22 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.4.5-2
- New upstream relase - New upstream relase
- Add gcc41 patch
* Wed Mar 15 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.4.4-2 * Wed Mar 15 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.4.4-2
- Add fixcodegen patch from Eric Hopper #184245 - Add fixcodegen patch from Eric Hopper #184245