From 6aa6ed8ad8738ff626989c44d74e34576e7f51e5 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Sat, 10 Aug 2019 04:55:27 +0000
Subject: Sat Aug 10 04:55:27 UTC 2019

a/kernel-generic-4.19.66-x86_64-1.txz:  Upgraded.
a/kernel-huge-4.19.66-x86_64-1.txz:  Upgraded.
a/kernel-modules-4.19.66-x86_64-1.txz:  Upgraded.
ap/amp-0.7.6-x86_64-3.txz:  Rebuilt.
  Patched to clean up the code for a modern compiler and to not use overly
  aggressive optimizations that can lead to crashes. Thanks to Labinnah.
d/doxygen-1.8.16-x86_64-1.txz:  Upgraded.
d/kernel-headers-4.19.66-x86-1.txz:  Upgraded.
d/scons-3.1.1-x86_64-1.txz:  Upgraded.
k/kernel-source-4.19.66-noarch-1.txz:  Upgraded.
n/NetworkManager-1.20.0-x86_64-1.txz:  Upgraded.
n/wpa_supplicant-2.9-x86_64-1.txz:  Upgraded.
x/libinput-1.14.0-x86_64-1.txz:  Upgraded.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.
---
 source/d/doxygen/doxygen.9468ede.diff | 52 -----------------------------------
 source/d/doxygen/doxygen.SlackBuild   |  5 +---
 source/d/doxygen/doxygen.url          |  1 +
 3 files changed, 2 insertions(+), 56 deletions(-)
 delete mode 100644 source/d/doxygen/doxygen.9468ede.diff
 create mode 100644 source/d/doxygen/doxygen.url

(limited to 'source/d')

diff --git a/source/d/doxygen/doxygen.9468ede.diff b/source/d/doxygen/doxygen.9468ede.diff
deleted file mode 100644
index b189a85af..000000000
--- 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();
-
diff --git a/source/d/doxygen/doxygen.SlackBuild b/source/d/doxygen/doxygen.SlackBuild
index a13503346..d01b89050 100755
--- a/source/d/doxygen/doxygen.SlackBuild
+++ b/source/d/doxygen/doxygen.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=doxygen
 VERSION=${VERSION:-$(basename $(echo doxygen-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) .src)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -76,9 +76,6 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-# Revert patch that leads to segfaults:
-zcat $CWD/doxygen.9468ede.diff.gz | patch -p1 -R --verbose || exit 1
-
 mkdir build
 cd build
   cmake \
diff --git a/source/d/doxygen/doxygen.url b/source/d/doxygen/doxygen.url
new file mode 100644
index 000000000..1f74849ea
--- /dev/null
+++ b/source/d/doxygen/doxygen.url
@@ -0,0 +1 @@
+http://www.doxygen.org/download.html
-- 
cgit v1.2.3