From dcff498461d00adbea39e455862ea47f3dab87fb Mon Sep 17 00:00:00 2001
From: Jochen Schmitt <s4504kr@fedoraproject.org>
Date: Mon, 21 Jan 2008 17:31:13 +0000
Subject: [PATCH] New upstream release

---
 .cvsignore                    |  2 +-
 highlight-2.6.3-rpmopts.patch | 12 ------------
 highlight-2.6.7-gcc43.patch   | 36 +++++++++++++++++++++++++++++++++++
 highlight.spec                | 12 ++++++++----
 sources                       |  2 +-
 5 files changed, 46 insertions(+), 18 deletions(-)
 delete mode 100644 highlight-2.6.3-rpmopts.patch
 create mode 100644 highlight-2.6.7-gcc43.patch

diff --git a/.cvsignore b/.cvsignore
index 5c11403..106c4b9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-highlight-2.6.6.tar.gz
+highlight-2.6.7.tar.gz
diff --git a/highlight-2.6.3-rpmopts.patch b/highlight-2.6.3-rpmopts.patch
deleted file mode 100644
index ff189d4..0000000
--- a/highlight-2.6.3-rpmopts.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up highlight-2.6.3/src/makefile.bak highlight-2.6.3/src/makefile
---- highlight-2.6.3/src/makefile.bak	2007-09-04 23:25:34.000000000 +0200
-+++ highlight-2.6.3/src/makefile	2007-09-11 21:26:50.000000000 +0200
-@@ -15,7 +15,7 @@
- 
- CXX=c++
- 
--CFLAGS := -O2
-+CFLAGS := ${RPM_OPT_FLAGS}
- 
- # Do not strip by default (Mac OS X lazy pointer issues)
- # Add -static to avoid linking with shared libs (can cause trouble when highlight
diff --git a/highlight-2.6.7-gcc43.patch b/highlight-2.6.7-gcc43.patch
new file mode 100644
index 0000000..0fceff9
--- /dev/null
+++ b/highlight-2.6.7-gcc43.patch
@@ -0,0 +1,36 @@
+diff -up highlight-2.6.7/src/astyle/astyle.h.gcc43 highlight-2.6.7/src/astyle/astyle.h
+--- highlight-2.6.7/src/astyle/astyle.h.gcc43	2007-07-19 22:23:37.000000000 +0200
++++ highlight-2.6.7/src/astyle/astyle.h	2008-01-21 18:18:16.000000000 +0100
+@@ -38,6 +38,8 @@
+ #include <vector>
+ #include <cctype>
+ 
++#include <cstring>
++
+ using namespace std;
+ 
+ 
+diff -up highlight-2.6.7/src/codegenerator.cpp.gcc43 highlight-2.6.7/src/codegenerator.cpp
+--- highlight-2.6.7/src/codegenerator.cpp.gcc43	2008-01-01 21:34:56.000000000 +0100
++++ highlight-2.6.7/src/codegenerator.cpp	2008-01-21 18:18:16.000000000 +0100
+@@ -27,6 +27,9 @@
+ #include "re/Matcher.h"
+ #include "astyle/astyle.h"
+ 
++#include <climits>
++#include <memory>
++
+ //-> siehe wx/defs.h
+ #ifndef __WXWINDOWS__
+   #include "ansigenerator.h"
+diff -up highlight-2.6.7/src/languagedefinition.cpp.gcc43 highlight-2.6.7/src/languagedefinition.cpp
+--- highlight-2.6.7/src/languagedefinition.cpp.gcc43	2008-01-21 18:24:27.000000000 +0100
++++ highlight-2.6.7/src/languagedefinition.cpp	2008-01-21 18:24:48.000000000 +0100
+@@ -18,6 +18,7 @@
+ #include "languagedefinition.h"
+ #include "stringtools.h"
+ 
++#include <memory>
+ 
+ using namespace std;
+ 
diff --git a/highlight.spec b/highlight.spec
index 8439619..8d71d1d 100644
--- a/highlight.spec
+++ b/highlight.spec
@@ -1,6 +1,6 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
-Version:	2.6.6
+Version:	2.6.7
 Release:	1%{?dist}
 
 Group:		Development/Tools
@@ -9,7 +9,7 @@ License:	GPLv2
 URL:		http://www.andre-simon.de/
 Source0:	http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz
 Patch1:		highlight-2.6.1-makefile.patch
-Patch2:		highlight-2.6.3-rpmopts.patch
+Patch3:         highlight-2.6.7-gcc43.patch
 
 Buildroot:	%{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -24,10 +24,10 @@ It is easily possible to create new language definitions and colour themes.
 %prep
 %setup -q
 %patch1 -p1 -b .mak
-%patch2 -p1 -b .bak
+%patch3 -p1 -b .gcc43
 
 %build
-make %{?_smp_mflags} LDFLAGS=
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS=
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -49,6 +49,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc ChangeLog AUTHORS README* COPYING TODO examples/
 
 %changelog
+* Mon Jan 21 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.7-1
+- New upstream release
+- Fix gcc-4.3 issues
+
 * Tue Dec 11 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.6.6-1
 - New upstream release
 
diff --git a/sources b/sources
index 5df2b06..bcf4389 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b6e25243ba0261e11e1f4cf37c4add2c  highlight-2.6.6.tar.gz
+2200bdc03b47ce94a097fefd9bd5ee33  highlight-2.6.7.tar.gz