6 files changed, 75 insertions, 0 deletions

diff --git a/devel/doxygen/files/patch-src_code.l b/devel/doxygen/files/patch-src_code.l
new file mode 100644
index 000000000000..e3d5cc841fa4
--- /dev/null
+++ b/devel/doxygen/files/patch-src_code.l
@@ -0,0 +1,11 @@
+--- src/code.l.orig	2015-05-31 19:01:12 UTC
++++ src/code.l
+@@ -3695,7 +3695,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==5 && 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/devel/doxygen/files/patch-src_commentscan.l b/devel/doxygen/files/patch-src_commentscan.l
new file mode 100644
index 000000000000..48564d351100
--- /dev/null
+++ b/devel/doxygen/files/patch-src_commentscan.l
@@ -0,0 +1,20 @@
+--- src/commentscan.l.orig	2015-05-31 19:01:12 UTC
++++ src/commentscan.l
+@@ -1103,7 +1103,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_SUBMINOR_VERSION>=33 || YY_FLEX_MINOR_VERSION>=6
+ 					      inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf);
+ #else
+ 					      inputPosition=prevPosition + (int)(yy_bp - yy_current_buffer->yy_ch_buf);
+@@ -1165,7 +1165,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_SUBMINOR_VERSION>=33 || YY_FLEX_MINOR_VERSION>=6
+ 				          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/devel/doxygen/files/patch-src_fortrancode.l b/devel/doxygen/files/patch-src_fortrancode.l
new file mode 100644
index 000000000000..752d4691cfe8
--- /dev/null
+++ b/devel/doxygen/files/patch-src_fortrancode.l
@@ -0,0 +1,11 @@
+--- src/fortrancode.l.orig	2015-11-19 06:39:17 UTC
++++ src/fortrancode.l
+@@ -1306,7 +1306,7 @@ void parseFortranCode(CodeOutputInterfac
+ 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==5 && 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/devel/doxygen/files/patch-src_pycode.l b/devel/doxygen/files/patch-src_pycode.l
new file mode 100644
index 000000000000..476cf39054b6
--- /dev/null
+++ b/devel/doxygen/files/patch-src_pycode.l
@@ -0,0 +1,11 @@
+--- src/pycode.l.orig	2015-11-19 06:41:15 UTC
++++ src/pycode.l
+@@ -1503,7 +1503,7 @@ void parsePythonCode(CodeOutputInterface
+ 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==5 && 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/devel/doxygen/files/patch-src_vhdlcode.l b/devel/doxygen/files/patch-src_vhdlcode.l
new file mode 100644
index 000000000000..8fa957e57d7e
--- /dev/null
+++ b/devel/doxygen/files/patch-src_vhdlcode.l
@@ -0,0 +1,11 @@
+--- src/vhdlcode.l.orig	2015-11-19 06:41:43 UTC
++++ 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==5 && 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/devel/doxygen/files/patch-src_xmlcode.l b/devel/doxygen/files/patch-src_xmlcode.l
new file mode 100644
index 000000000000..4cff4c58f7f7
--- /dev/null
+++ b/devel/doxygen/files/patch-src_xmlcode.l
@@ -0,0 +1,11 @@
+--- src/xmlcode.l.orig	2015-05-31 19:01:12 UTC
++++ 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==5 && 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
+