Merge pull request #1 from lsst/tickets/DM-4891

Update doxygen version
lsst · Sep 19, 2017 · e029824 · e029824
2 parents 323f995 + 4349aea
commit e029824
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 95 deletions.
diff --git a/patches/0001-Correct-version-detectection-for-flex-2.6.patch b/patches/0001-Correct-version-detectection-for-flex-2.6.patch
diff --git a/patches/0001-protected-against-NULL-pointer.patch b/patches/0001-protected-against-NULL-pointer.patch
@@ -0,0 +1,24 @@
+From 0f02761a158a5e9ddbd5801682482af8986dbc35 Mon Sep 17 00:00:00 2001
+From: albert-github <albert.tests@gmail.com>
+Date: Wed, 4 Jan 2017 12:24:55 +0100
+Subject: [PATCH] Bug 776791 - [1.8.13 Regression] Segfault building the
+ breathe docs
+
+Protected against NULL pointer of variable al
+---
+ src/xmlgen.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp
+index fe95c7af5..70e198ae2 100644
+--- a/src/xmlgen.cpp
++++ b/src/xmlgen.cpp
+@@ -620,7 +620,7 @@ static void generateXMLForMember(MemberDef *md,FTextStream &ti,FTextStream &t,De
+     if (md->isInline()) t << "yes"; else t << "no";
+     t << "\"";
+
+-    if (al->refQualifier!=RefQualifierNone)
++    if (al!=0 && al->refQualifier!=RefQualifierNone)
+     {
+       t << " refqual=\"";
+       if (al->refQualifier==RefQualifierLValue) t << "lvalue"; else t << "rvalue";
diff --git a/ups/eupspkg.cfg.sh b/ups/eupspkg.cfg.sh
@@ -0,0 +1,6 @@
+# EupsPkg config file. Sourced by 'eupspkg'
+
+config()
+{
+    cmake . -DCMAKE_INSTALL_PREFIX=${PREFIX}
+}
diff --git a/upstream/doxygen-1.8.13.src.tar.gz b/upstream/doxygen-1.8.13.src.tar.gz
diff --git a/upstream/doxygen-1.8.5.src.tar.gz b/upstream/doxygen-1.8.5.src.tar.gz