diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2018-12-29 23:13:15 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-12-30 08:59:46 +0100 |
commit | 527328c5da0d2375ca5dfc2a053c9fe328839918 (patch) | |
tree | d2773d407aba234712f864db90e15c99a9e08da5 /source/d/doxygen/doxygen.9468ede.diff | |
parent | 1e1c447e2ef274f8b3733ba21570e74c3bc757b7 (diff) | |
download | current-527328c5da0d2375ca5dfc2a053c9fe328839918.tar.gz |
Sat Dec 29 23:13:15 UTC 201820181229231315
a/kernel-generic-4.19.13-x86_64-1.txz: Upgraded.
a/kernel-huge-4.19.13-x86_64-1.txz: Upgraded.
a/kernel-modules-4.19.13-x86_64-1.txz: Upgraded.
d/doxygen-1.8.15-x86_64-1.txz: Upgraded.
d/kernel-headers-4.19.13-x86-1.txz: Upgraded.
k/kernel-source-4.19.13-noarch-1.txz: Upgraded.
FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER y -> n
l/libsecret-0.18.7-x86_64-1.txz: Upgraded.
n/wpa_supplicant-2.6-x86_64-6.txz: Upgraded.
It seems we're not the only ones with broken WPA2-Enterprise support
with wpa_supplicant-2.7, so we'll fix it the same way as everyone else -
by reverting to wpa_supplicant-2.6 for now.
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
testing/packages/wpa_supplicant-2.7-x86_64-2.txz: Upgraded.
Applied a patch from Gentoo to allow building CONFIG_IEEE80211X=y without
the experimental CONFIG_FILS=y option.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/d/doxygen/doxygen.9468ede.diff')
-rw-r--r-- | source/d/doxygen/doxygen.9468ede.diff | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/source/d/doxygen/doxygen.9468ede.diff b/source/d/doxygen/doxygen.9468ede.diff deleted file mode 100644 index b189a85a..00000000 --- a/source/d/doxygen/doxygen.9468ede.diff +++ /dev/null @@ -1,52 +0,0 @@ -From 9468ede259153cf79eb8d61635389744e9a2ee7d Mon Sep 17 00:00:00 2001 -From: Dimitri van Heesch <dimitri@stack.nl> -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(); - |