<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/be575ebe055b5a454512b74735451aa36a414c5d">https://github.com/macports/macports-ports/commit/be575ebe055b5a454512b74735451aa36a414c5d</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new be575eb doxygen: update to version 1.8.13
</span>be575eb is described below
<span style='display:block; white-space:pre;color:#808000;'>commit be575ebe055b5a454512b74735451aa36a414c5d
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Thu Jan 5 13:15:55 2017 -0600
<span style='display:block; white-space:pre;color:#404040;'> doxygen: update to version 1.8.13
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove obsolete patch files
</span>---
textproc/doxygen/Portfile | 12 +--
.../8c51120ad55b440b738ef0b96f8169d84a7ae88a.patch | 109 ---------------------
.../a8c73cdbe37cc53c398002d20e94037552a8fb55.patch | 37 -------
.../cf936efb8ae99dd297b6afb9c6a06beb81f5b0fb.patch | 105 --------------------
textproc/doxygen/files/fix_dumb_cxxflags.patch | 7 +-
textproc/doxygen/files/patch-src-portable_c.c.diff | 12 ++-
6 files changed, 15 insertions(+), 267 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/doxygen/Portfile b/textproc/doxygen/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d7dbd74..e9ea1ae 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/doxygen/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/doxygen/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,7 @@ PortSystem 1.0
</span> PortGroup cmake 1.0
name doxygen
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.8.10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.8.13
</span> categories textproc devel
maintainers css openmaintainer
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,8 +35,8 @@ master_sites http://ftp.stack.nl/pub/users/dimitri/ \
</span> distfiles ${distname}.src${extract.suffix}
checksums ${distname}.src${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 be064f0e8f00e6e20ed7c128f595e7010be1f23a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 cedf78f6d213226464784ecb999b54515c97eab8a2f9b82514292f837cf88b93
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 00f6f8baeead8c3d99eabe1d61ffefa4e48af1f9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 af667887bd7a87dc0dbf9ac8d86c96b552dfb8ca9c790ed1cbffaa6131573f6b
</span>
depends_build-append bin:perl:perl5 \
bin:python2.7:python27 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,10 +48,7 @@ depends_lib port:libpng \
</span> port:libiconv
patchfiles patch-src-portable_c.c.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fix_dumb_cxxflags.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cf936efb8ae99dd297b6afb9c6a06beb81f5b0fb.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8c51120ad55b440b738ef0b96f8169d84a7ae88a.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a8c73cdbe37cc53c398002d20e94037552a8fb55.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fix_dumb_cxxflags.patch
</span>
# see #50342
configure.args-append -DPython_ADDITIONAL_VERSIONS=2.7
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/doxygen/files/8c51120ad55b440b738ef0b96f8169d84a7ae88a.patch b/textproc/doxygen/files/8c51120ad55b440b738ef0b96f8169d84a7ae88a.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ce50d99..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/doxygen/files/8c51120ad55b440b738ef0b96f8169d84a7ae88a.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,109 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 8c51120ad55b440b738ef0b96f8169d84a7ae88a Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Dimitri van Heesch <dimitri@stack.nl>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sun, 22 Nov 2015 13:58:59 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Support flex-2.6.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream-Status: Backport [https://github.com/doxygen/doxygen/commit/8c51120ad55b440b738ef0b96f8169d84a7ae88a]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/code.l | 4 ++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/commentscan.l | 4 ++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/fortrancode.l | 6 +++---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/pycode.l | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/vhdlcode.l | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/xmlcode.l | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 6 files changed, 10 insertions(+), 10 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/code.l b/src/code.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 25719af..f014924 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./src/code.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./src/code.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3700,7 +3700,7 @@ void codeFreeScanner()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern "C" { // some bogus code to keep the compiler happy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void codeYYdummy() { yy_flex_realloc(0,0); }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#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!"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif YY_FLEX_MAJOR_VERISON<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#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)."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/commentscan.l b/src/commentscan.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2629857..ffed075 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./src/commentscan.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./src/commentscan.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1128,7 +1128,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // but we need to know the position in the input buffer where this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // rule matched.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // for flex 2.5.33+ we should use YY_CURRENT_BUFFER_LVALUE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if YY_FLEX_MINOR_VERSION>5 || YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if YY_FLEX_MAJOR_VERSION>=2 && (YY_FLEX_MINOR_VERSION>5 || (YY_FLEX_MINOR_VERSION==5 && YY_FLEX_SUBMINOR_VERSION>=33))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- inputPosition=prevPosition + (int)(yy_bp - yy_current_buffer->yy_ch_buf);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1190,7 +1190,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_memberGroupHeader.resize(0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- parseMore=TRUE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- needNewEntry = TRUE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if YY_FLEX_MINOR_VERSION>5 || YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if YY_FLEX_MAJOR_VERSION>=2 && (YY_FLEX_MINOR_VERSION>5 || (YY_FLEX_MINOR_VERSION==5 && YY_FLEX_SUBMINOR_VERSION>=33))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf) + strlen(yytext);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- inputPosition=prevPosition + (int)(yy_bp - yy_current_buffer->yy_ch_buf) + strlen(yytext);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/fortrancode.l b/src/fortrancode.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 352912b..82e78c1 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./src/fortrancode.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./src/fortrancode.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1302,11 +1302,11 @@ void parseFortranCode(CodeOutputInterface &od,const char *className,const QCStri
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if !defined(YY_FLEX_SUBMINOR_VERSION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(YY_FLEX_SUBMINOR_VERSION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern "C" { // some bogus code to keep the compiler happy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- void fortrancodeYYdummy() { yy_flex_realloc(0,0); }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void fortrancodeYYdummy() { yy_flex_realloc(0,0); }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif YY_FLEX_MAJOR_VERSION<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #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!"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern "C" { // some bogus code to keep the compiler happy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/pycode.l b/src/pycode.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index f58f7c1..2b2a668 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./src/pycode.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./src/pycode.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1503,7 +1503,7 @@ void parsePythonCode(CodeOutputInterface &od,const char * /*className*/,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern "C" { // some bogus code to keep the compiler happy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void pycodeYYdummy() { yy_flex_realloc(0,0); }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif YY_FLEX_MAJOR_VERISON<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #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)."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/vhdlcode.l b/src/vhdlcode.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 6957048..e4ae0e7 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./src/vhdlcode.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./src/vhdlcode.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1613,7 +1613,7 @@ void codeFreeVhdlScanner()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern "C" { // some bogus code to keep the compiler happy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void vhdlcodeYYdummy() { yy_flex_realloc(0,0); }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif YY_FLEX_MAJOR_VERSION<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #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!"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/xmlcode.l b/src/xmlcode.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2bef4a0..fd36ebb 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./src/xmlcode.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./src/xmlcode.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -407,7 +407,7 @@ void resetXmlCodeParserState()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern "C" { // some bogus code to keep the compiler happy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void xmlcodeYYdummy() { yy_flex_realloc(0,0); }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif YY_FLEX_MAJOR_VERSION<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #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)."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/doxygen/files/a8c73cdbe37cc53c398002d20e94037552a8fb55.patch b/textproc/doxygen/files/a8c73cdbe37cc53c398002d20e94037552a8fb55.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e7a6dac..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/doxygen/files/a8c73cdbe37cc53c398002d20e94037552a8fb55.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,37 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From a8c73cdbe37cc53c398002d20e94037552a8fb55 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: lameventanas <lameventanas@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 25 Nov 2015 20:18:54 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fixed preprocessor macros for flex version check
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream-Status: Backport [https://github.com/doxygen/doxygen/commit/a8c73cdbe37cc53c398002d20e94037552a8fb55]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/code.l | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/pycode.l | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 2 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/code.l b/src/code.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index f014924..5b8a084 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./src/code.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./src/code.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3700,7 +3700,7 @@ void codeFreeScanner()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern "C" { // some bogus code to keep the compiler happy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void codeYYdummy() { yy_flex_realloc(0,0); }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif YY_FLEX_MAJOR_VERISON<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif YY_FLEX_MAJOR_VERSION<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #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)."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/pycode.l b/src/pycode.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2b2a668..c3219d9 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./src/pycode.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./src/pycode.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1503,7 +1503,7 @@ void parsePythonCode(CodeOutputInterface &od,const char * /*className*/,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern "C" { // some bogus code to keep the compiler happy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void pycodeYYdummy() { yy_flex_realloc(0,0); }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif YY_FLEX_MAJOR_VERISON<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif YY_FLEX_MAJOR_VERSION<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #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)."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/doxygen/files/cf936efb8ae99dd297b6afb9c6a06beb81f5b0fb.patch b/textproc/doxygen/files/cf936efb8ae99dd297b6afb9c6a06beb81f5b0fb.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3ef7923..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/doxygen/files/cf936efb8ae99dd297b6afb9c6a06beb81f5b0fb.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,105 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From cf936efb8ae99dd297b6afb9c6a06beb81f5b0fb Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Heiko Becker <heirecka@exherbo.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Thu, 19 Nov 2015 12:00:54 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Support flex-2.6.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream-Status: Backport [https://github.com/doxygen/doxygen/commit/cf936efb8ae99dd297b6afb9c6a06beb81f5b0fb]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The version checks only considered YY_FLEX_SUBMINOR_VERSION and did not
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-take YY_FLEX_MINOR_VERSION into account, which made them fail with
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-flex-2.6.0.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/code.l | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/commentscan.l | 4 ++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/fortrancode.l | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/pycode.l | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/vhdlcode.l | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/xmlcode.l | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 6 files changed, 7 insertions(+), 7 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/code.l b/src/code.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3323580..25719af 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./src/code.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./src/code.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3700,7 +3700,7 @@ void codeFreeScanner()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern "C" { // some bogus code to keep the compiler happy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void codeYYdummy() { yy_flex_realloc(0,0); }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif YY_FLEX_SUBMINOR_VERSION<33
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #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!"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/commentscan.l b/src/commentscan.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index cf892a0..2629857 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./src/commentscan.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./src/commentscan.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1128,7 +1128,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // but we need to know the position in the input buffer where this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // rule matched.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // for flex 2.5.33+ we should use YY_CURRENT_BUFFER_LVALUE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if YY_FLEX_MINOR_VERSION>5 || YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- inputPosition=prevPosition + (int)(yy_bp - yy_current_buffer->yy_ch_buf);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1190,7 +1190,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_memberGroupHeader.resize(0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- parseMore=TRUE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- needNewEntry = TRUE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if YY_FLEX_MINOR_VERSION>5 || YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf) + strlen(yytext);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- inputPosition=prevPosition + (int)(yy_bp - yy_current_buffer->yy_ch_buf) + strlen(yytext);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/fortrancode.l b/src/fortrancode.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index fb91a83..352912b 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./src/fortrancode.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./src/fortrancode.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1306,7 +1306,7 @@ void parseFortranCode(CodeOutputInterface &od,const char *className,const QCStri
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern "C" { // some bogus code to keep the compiler happy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void fortrancodeYYdummy() { yy_flex_realloc(0,0); }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif YY_FLEX_SUBMINOR_VERSION<33
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #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!"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern "C" { // some bogus code to keep the compiler happy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/pycode.l b/src/pycode.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3c41a69..f58f7c1 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./src/pycode.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./src/pycode.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1503,7 +1503,7 @@ void parsePythonCode(CodeOutputInterface &od,const char * /*className*/,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern "C" { // some bogus code to keep the compiler happy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void pycodeYYdummy() { yy_flex_realloc(0,0); }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif YY_FLEX_SUBMINOR_VERSION<33
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #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)."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/vhdlcode.l b/src/vhdlcode.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 369ae48..6957048 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./src/vhdlcode.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./src/vhdlcode.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1613,7 +1613,7 @@ void codeFreeVhdlScanner()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern "C" { // some bogus code to keep the compiler happy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void vhdlcodeYYdummy() { yy_flex_realloc(0,0); }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif YY_FLEX_SUBMINOR_VERSION<33
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #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!"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/xmlcode.l b/src/xmlcode.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 15b5d7e..2bef4a0 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./src/xmlcode.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./src/xmlcode.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -407,7 +407,7 @@ void resetXmlCodeParserState()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern "C" { // some bogus code to keep the compiler happy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void xmlcodeYYdummy() { yy_flex_realloc(0,0); }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif YY_FLEX_SUBMINOR_VERSION<33
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #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)."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/doxygen/files/fix_dumb_cxxflags.patch b/textproc/doxygen/files/fix_dumb_cxxflags.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index c320a2d..0b86540 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/doxygen/files/fix_dumb_cxxflags.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/doxygen/files/fix_dumb_cxxflags.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2016-01-14 09:32:04.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2016-01-14 09:32:15.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,7 +39,6 @@ if (use_libclang)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2016-11-29 02:14:16.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2017-01-05 13:00:17.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,8 +40,6 @@
</span> endif()
if (${CMAKE_SYSTEM} MATCHES "Darwin")
- set(CMAKE_CXX_FLAGS "-Wno-deprecated-register -mmacosx-version-min=10.5 ${CMAKE_CXX_FLAGS}")
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(CMAKE_C_FLAGS "-Wno-deprecated-register -mmacosx-version-min=10.5 ${CMAKE_C_FLAGS}")
</span> find_library(CORESERVICES_LIB CoreServices)
set(EXTRA_LIBS ${CORESERVICES_LIB})
endif()
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/doxygen/files/patch-src-portable_c.c.diff b/textproc/doxygen/files/patch-src-portable_c.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index dc22f64..e5d2f15 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/doxygen/files/patch-src-portable_c.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/doxygen/files/patch-src-portable_c.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream-Status: Inappropriate [configuration]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/portable_c.c.orig 2014-10-19 09:39:17.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/portable_c.c 2015-07-03 20:24:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,9 +1,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/portable_c.c.orig 2016-05-10 14:51:52.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/portable_c.c 2017-01-05 12:57:39.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,12 +1,12 @@
</span> -#if (defined(__APPLE__) || defined(macintosh)) && !defined(DMG_BUILD)
+//#if (defined(__APPLE__) || defined(macintosh)) && !defined(DMG_BUILD)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // this hack doesn't seem to be needed on El Captain (10.11)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_11
</span> // define this before including iconv.h to avoid a mapping of
// iconv_open and friends to libicon_open (done by mac ports),
// while the symbols without 'lib' are linked from /usr/lib/libiconv
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,6 +13,6 @@ Upstream-Status: Inappropriate [configuration]
</span> -#endif
+//#define LIBICONV_PLUG
+//#endif
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span> #include <iconv.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- // These functions are implemented in a C file, because there are different
</span></pre><pre style='margin:0'>
</pre>