rpms/highlight/devel highlight-2.6.7-gcc43.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 highlight.spec, 1.25, 1.26 sources, 1.14, 1.15 highlight-2.6.3-rpmopts.patch, 1.1, NONE
Jochen Schmitt (s4504kr)
fedora-extras-commits at redhat.com
Mon Jan 21 17:31:54 UTC 2008
Author: s4504kr
Update of /cvs/extras/rpms/highlight/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9314
Modified Files:
.cvsignore highlight.spec sources
Added Files:
highlight-2.6.7-gcc43.patch
Removed Files:
highlight-2.6.3-rpmopts.patch
Log Message:
New upstream release
highlight-2.6.7-gcc43.patch:
--- NEW FILE highlight-2.6.7-gcc43.patch ---
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;
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore 11 Dec 2007 19:34:04 -0000 1.13
+++ .cvsignore 21 Jan 2008 17:31:13 -0000 1.14
@@ -1 +1 @@
-highlight-2.6.6.tar.gz
+highlight-2.6.7.tar.gz
Index: highlight.spec
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/highlight.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- highlight.spec 11 Dec 2007 19:34:04 -0000 1.25
+++ highlight.spec 21 Jan 2008 17:31:13 -0000 1.26
@@ -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 @@
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 @@
%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 @@
%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
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/highlight/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources 11 Dec 2007 19:34:04 -0000 1.14
+++ sources 21 Jan 2008 17:31:13 -0000 1.15
@@ -1 +1 @@
-b6e25243ba0261e11e1f4cf37c4add2c highlight-2.6.6.tar.gz
+2200bdc03b47ce94a097fefd9bd5ee33 highlight-2.6.7.tar.gz
--- highlight-2.6.3-rpmopts.patch DELETED ---
More information about the fedora-extras-commits
mailing list