New upstream release
This commit is contained in:
Jochen Schmitt
parent
c18aa89202
commit
8541fa08ea
@ -1 +1 @@
|
||||
highlight-2.6.10.tar.gz
|
||||
highlight-2.6.11.tar.gz
|
||||
|
||||
36
highlight-2.6.11-gcc43.patch
Normal file
36
highlight-2.6.11-gcc43.patch
Normal file
@ -0,0 +1,36 @@
|
||||
diff -up highlight-2.6.11/src/astyle/astyle.h.gcc43 highlight-2.6.11/src/astyle/astyle.h
|
||||
--- highlight-2.6.11/src/astyle/astyle.h.gcc43 2008-01-24 01:41:01.000000000 +0100
|
||||
+++ highlight-2.6.11/src/astyle/astyle.h 2008-07-17 17:27:43.000000000 +0200
|
||||
@@ -39,6 +39,8 @@
|
||||
#include <cctype>
|
||||
#include <cstring>
|
||||
|
||||
+#include <cstring>
|
||||
+
|
||||
using namespace std;
|
||||
|
||||
|
||||
diff -up highlight-2.6.11/src/codegenerator.cpp.gcc43 highlight-2.6.11/src/codegenerator.cpp
|
||||
--- highlight-2.6.11/src/codegenerator.cpp.gcc43 2008-06-27 03:53:10.000000000 +0200
|
||||
+++ highlight-2.6.11/src/codegenerator.cpp 2008-07-17 17:27:43.000000000 +0200
|
||||
@@ -31,6 +31,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.11/src/languagedefinition.cpp.gcc43 highlight-2.6.11/src/languagedefinition.cpp
|
||||
--- highlight-2.6.11/src/languagedefinition.cpp.gcc43 2008-07-05 04:14:25.000000000 +0200
|
||||
+++ highlight-2.6.11/src/languagedefinition.cpp 2008-07-17 17:27:43.000000000 +0200
|
||||
@@ -20,6 +20,7 @@
|
||||
#include "languagedefinition.h"
|
||||
#include "stringtools.h"
|
||||
|
||||
+#include <memory>
|
||||
|
||||
using namespace std;
|
||||
|
||||
@ -1,15 +1,6 @@
|
||||
diff -up highlight-2.6.9/makefile.mak highlight-2.6.9/makefile
|
||||
--- highlight-2.6.9/makefile.mak 2008-03-26 22:17:36.000000000 +0100
|
||||
+++ highlight-2.6.9/makefile 2008-03-31 20:40:34.000000000 +0200
|
||||
@@ -25,7 +25,7 @@ doc_dir = ${PREFIX}/share/doc/highlight/
|
||||
examples_dir = ${PREFIX}/share/doc/highlight/examples/
|
||||
|
||||
# Location of the highlight config files:
|
||||
-conf_dir = ${PREFIX}/etc/highlight/
|
||||
+conf_dir = /etc/highlight/
|
||||
|
||||
# Commands:
|
||||
INSTALL_DATA=install -m644
|
||||
@@ -51,21 +51,12 @@ all-gui-wx29:
|
||||
install:
|
||||
@echo "This script will install highlight in the following directories:"
|
||||
@ -1,36 +0,0 @@
|
||||
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;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
Name: highlight
|
||||
Summary: Universal source code to formatted text converter
|
||||
Version: 2.6.10
|
||||
Version: 2.6.11
|
||||
Release: 1%{?dist}
|
||||
|
||||
Group: Development/Tools
|
||||
@ -8,8 +8,8 @@ License: GPLv2
|
||||
|
||||
URL: http://www.andre-simon.de/
|
||||
Source0: http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz
|
||||
Patch1: highlight-2.6.9-makefile.patch
|
||||
Patch3: highlight-2.6.7-gcc43.patch
|
||||
Patch1: highlight-2.6.11-makefile.patch
|
||||
Patch3: highlight-2.6.11-gcc43.patch
|
||||
|
||||
Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
|
||||
|
||||
@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%doc ChangeLog AUTHORS README* COPYING TODO examples/
|
||||
|
||||
%changelog
|
||||
* Thu Jul 17 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.11-1
|
||||
- New upstream release
|
||||
|
||||
* Mon May 12 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.6.10-1
|
||||
- New upstream release
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user