doxygen: updated to 1.8.10, fixed flex support (FS#1264), fixed deps (FS#1259) and mandir
This commit is contained in:
Jose V Beneyto
parent
daba12135f
commit
4fad5f8c30
@ -1,6 +1,7 @@
|
||||
drwxr-xr-x root/root usr/
|
||||
drwxr-xr-x root/root usr/bin/
|
||||
-rwxr-xr-x root/root usr/bin/doxygen
|
||||
drwxr-xr-x root/root usr/man/
|
||||
drwxr-xr-x root/root usr/man/man1/
|
||||
-rw-r--r-- root/root usr/man/man1/doxygen.1.gz
|
||||
drwxr-xr-x root/root usr/share/
|
||||
drwxr-xr-x root/root usr/share/man/
|
||||
drwxr-xr-x root/root usr/share/man/man1/
|
||||
-rwxr-xr-x root/root usr/share/man/man1/doxygen.1.gz
|
||||
|
||||
@ -1 +1,2 @@
|
||||
0cbe6912fcac302a984bfcfb9231fec9 doxygen-1.8.8.src.tar.gz
|
||||
79767ccd986f12a0f949015efb5f058f doxygen-1.8.10.src.tar.gz
|
||||
b282c91bac1888f607a3676a236d2828 flex-2.6.0-compat.patch
|
||||
|
||||
@ -2,20 +2,22 @@
|
||||
# URL: http://www.stack.nl/~dimitri/doxygen/
|
||||
# Maintainer: Jose V Beneyto, sepen at crux dot nu
|
||||
# Packager: Hannes Mayer, kontakt at ecarux dot de
|
||||
# Depends on:
|
||||
# Depends on: cmake python
|
||||
|
||||
name=doxygen
|
||||
version=1.8.8
|
||||
release=1
|
||||
source=(ftp://ftp.stack.nl/pub/users/dimitri/$name-$version.src.tar.gz)
|
||||
version=1.8.10
|
||||
release=1
|
||||
source=(ftp://ftp.stack.nl/pub/users/dimitri/$name-$version.src.tar.gz \
|
||||
flex-2.6.0-compat.patch)
|
||||
|
||||
build() {
|
||||
cd $name-$version
|
||||
|
||||
./configure --prefix /usr \
|
||||
--platform 'linux-64' \
|
||||
--english-only
|
||||
patch -p1 -i $SRC/flex-2.6.0-compat.patch
|
||||
cmake . -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr
|
||||
|
||||
make CXXFLAGS="$CXXFLAGS"
|
||||
make DESTDIR=$PKG install
|
||||
|
||||
install -D -m 0755 doc/$name.1 $PKG/usr/share/man/man1/$name.1
|
||||
}
|
||||
|
||||
104
doxygen/flex-2.6.0-compat.patch
Normal file
104
doxygen/flex-2.6.0-compat.patch
Normal file
@ -0,0 +1,104 @@
|
||||
From 5fcb13572417a3b4a05217e9023c683864f35643 Mon Sep 17 00:00:00 2001
|
||||
From: Heiko Becker <heirecka@exherbo.org>
|
||||
Date: Thu, 19 Nov 2015 12:00:54 +0100
|
||||
Subject: [PATCH] Support flex-2.6.0
|
||||
|
||||
The version checks only considered YY_FLEX_SUBMINOR_VERSION and did not
|
||||
take YY_FLEX_MINOR_VERSION into account, which made them fail with
|
||||
flex-2.6.0.
|
||||
---
|
||||
src/code.l | 2 +-
|
||||
src/commentscan.l | 4 ++--
|
||||
src/fortrancode.l | 2 +-
|
||||
src/pycode.l | 2 +-
|
||||
src/vhdlcode.l | 2 +-
|
||||
src/xmlcode.l | 2 +-
|
||||
6 files changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/src/code.l b/src/code.l
|
||||
index 3323580..25719af 100644
|
||||
--- a/src/code.l
|
||||
+++ b/src/code.l
|
||||
@@ -3700,7 +3700,7 @@ void codeFreeScanner()
|
||||
extern "C" { // some bogus code to keep the compiler happy
|
||||
void codeYYdummy() { yy_flex_realloc(0,0); }
|
||||
}
|
||||
-#elif YY_FLEX_SUBMINOR_VERSION<33
|
||||
+#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
|
||||
#error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
|
||||
#endif
|
||||
|
||||
diff --git a/src/commentscan.l b/src/commentscan.l
|
||||
index cf892a0..2629857 100644
|
||||
--- a/src/commentscan.l
|
||||
+++ b/src/commentscan.l
|
||||
@@ -1128,7 +1128,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$"
|
||||
// but we need to know the position in the input buffer where this
|
||||
// rule matched.
|
||||
// for flex 2.5.33+ we should use YY_CURRENT_BUFFER_LVALUE
|
||||
-#if YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
|
||||
+#if YY_FLEX_MINOR_VERSION>5 || YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
|
||||
inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf);
|
||||
#else
|
||||
inputPosition=prevPosition + (int)(yy_bp - yy_current_buffer->yy_ch_buf);
|
||||
@@ -1190,7 +1190,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$"
|
||||
g_memberGroupHeader.resize(0);
|
||||
parseMore=TRUE;
|
||||
needNewEntry = TRUE;
|
||||
-#if YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
|
||||
+#if YY_FLEX_MINOR_VERSION>5 || YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
|
||||
inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf) + strlen(yytext);
|
||||
#else
|
||||
inputPosition=prevPosition + (int)(yy_bp - yy_current_buffer->yy_ch_buf) + strlen(yytext);
|
||||
diff --git a/src/fortrancode.l b/src/fortrancode.l
|
||||
index fb91a83..352912b 100644
|
||||
--- a/src/fortrancode.l
|
||||
+++ b/src/fortrancode.l
|
||||
@@ -1306,7 +1306,7 @@ void parseFortranCode(CodeOutputInterface &od,const char *className,const QCStri
|
||||
extern "C" { // some bogus code to keep the compiler happy
|
||||
void fortrancodeYYdummy() { yy_flex_realloc(0,0); }
|
||||
}
|
||||
-#elif YY_FLEX_SUBMINOR_VERSION<33
|
||||
+#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
|
||||
#error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
|
||||
#else
|
||||
extern "C" { // some bogus code to keep the compiler happy
|
||||
diff --git a/src/pycode.l b/src/pycode.l
|
||||
index 3c41a69..f58f7c1 100644
|
||||
--- a/src/pycode.l
|
||||
+++ b/src/pycode.l
|
||||
@@ -1503,7 +1503,7 @@ void parsePythonCode(CodeOutputInterface &od,const char * /*className*/,
|
||||
extern "C" { // some bogus code to keep the compiler happy
|
||||
void pycodeYYdummy() { yy_flex_realloc(0,0); }
|
||||
}
|
||||
-#elif YY_FLEX_SUBMINOR_VERSION<33
|
||||
+#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
|
||||
#error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)."
|
||||
#endif
|
||||
|
||||
diff --git a/src/vhdlcode.l b/src/vhdlcode.l
|
||||
index 369ae48..6957048 100644
|
||||
--- a/src/vhdlcode.l
|
||||
+++ b/src/vhdlcode.l
|
||||
@@ -1613,7 +1613,7 @@ void codeFreeVhdlScanner()
|
||||
extern "C" { // some bogus code to keep the compiler happy
|
||||
void vhdlcodeYYdummy() { yy_flex_realloc(0,0); }
|
||||
}
|
||||
-#elif YY_FLEX_SUBMINOR_VERSION<33
|
||||
+#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
|
||||
#error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
|
||||
#endif
|
||||
|
||||
diff --git a/src/xmlcode.l b/src/xmlcode.l
|
||||
index 15b5d7e..2bef4a0 100644
|
||||
--- a/src/xmlcode.l
|
||||
+++ b/src/xmlcode.l
|
||||
@@ -407,7 +407,7 @@ void resetXmlCodeParserState()
|
||||
extern "C" { // some bogus code to keep the compiler happy
|
||||
void xmlcodeYYdummy() { yy_flex_realloc(0,0); }
|
||||
}
|
||||
-#elif YY_FLEX_SUBMINOR_VERSION<33
|
||||
+#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
|
||||
#error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)."
|
||||
#endif
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user