From b595b3d8f623b3c668d13768cde5e711a78f6485 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Fri, 4 Jan 2019 21:44:44 +0000 Subject: Fri Jan 4 21:44:44 UTC 2019 a/hwdata-0.319-noarch-1.txz: Upgraded. d/doxygen-1.8.14-x86_64-3.txz: Upgraded. Reverted (for now) to avoid segfault in doxygen-1.8.15. l/libwpg-0.3.3-x86_64-1.txz: Upgraded. l/libxml2-2.9.9-x86_64-1.txz: Upgraded. l/libxslt-1.1.33-x86_64-1.txz: Upgraded. l/python-pillow-5.4.0-x86_64-1.txz: Upgraded. x/xterm-342-x86_64-1.txz: Upgraded. testing/packages/wpa_supplicant-2.7-x86_64-3.txz: Rebuilt. Apply TLSv1 patch from Debian and make some config changes to fix WPA2-Enterprise. Once we have some testing results on this we'll consider moving it back into the main tree. Thanks to gablek. --- source/d/doxygen/doxygen.9468ede.diff | 52 +++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 source/d/doxygen/doxygen.9468ede.diff (limited to 'source/d/doxygen/doxygen.9468ede.diff') diff --git a/source/d/doxygen/doxygen.9468ede.diff b/source/d/doxygen/doxygen.9468ede.diff new file mode 100644 index 000000000..b189a85af --- /dev/null +++ b/source/d/doxygen/doxygen.9468ede.diff @@ -0,0 +1,52 @@ +From 9468ede259153cf79eb8d61635389744e9a2ee7d Mon Sep 17 00:00:00 2001 +From: Dimitri van Heesch +Date: Sun, 29 Oct 2017 11:47:48 +0100 +Subject: [PATCH] Bug 789168 - Increasing access of inherited C++ members with + 'using...' is not recognized by Doxygen + +--- + src/doxygen.cpp | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/src/doxygen.cpp b/src/doxygen.cpp +index d3554cffd..ec97d4354 100644 +--- a/src/doxygen.cpp ++++ b/src/doxygen.cpp +@@ -2112,9 +2112,8 @@ static void findUsingDeclImports(EntryNav *rootNav) + (rootNav->parent()->section()&Entry::COMPOUND_MASK) // in a class/struct member + ) + { +- //printf("Found using declaration %s at line %d of %s inside section %x\n", +- // root->name.data(),root->startLine,root->fileName.data(), +- // root->parent->section); ++ //printf("Found using declaration %s inside section %x\n", ++ // rootNav->name().data(), rootNav->parent()->section()); + QCString fullName=removeRedundantWhiteSpace(rootNav->parent()->name()); + fullName=stripAnonymousNamespaceScope(fullName); + fullName=stripTemplateSpecifiersFromScope(fullName); +@@ -2130,7 +2129,7 @@ static void findUsingDeclImports(EntryNav *rootNav) + ClassDef *bcd = getResolvedClass(cd,0,scope); // todo: file in fileScope parameter + if (bcd) + { +- //printf("found class %s\n",bcd->name().data()); ++ //printf("found class %s memName=%s\n",bcd->name().data(),memName.data()); + MemberNameInfoSDict *mndict=bcd->memberNameInfoSDict(); + if (mndict) + { +@@ -11181,7 +11180,6 @@ void parseInput() + g_s.end(); + + g_s.begin("Searching for members imported via using declarations...\n"); +- findUsingDeclImports(rootNav); + // this should be after buildTypedefList in order to properly import + // used typedefs + findUsingDeclarations(rootNav); +@@ -11249,6 +11247,7 @@ void parseInput() + g_s.begin("Searching for member function documentation...\n"); + findObjCMethodDefinitions(rootNav); + findMemberDocumentation(rootNav); // may introduce new members ! ++ findUsingDeclImports(rootNav); // may introduce new members ! + + transferRelatedFunctionDocumentation(); + transferFunctionDocumentation(); + -- cgit v1.2.3-79-gdb01