Mon May 28 19:12:29 UTC 201820180528191229

a/pkgtools-15.0-noarch-13.txz:  Rebuilt.
  installpkg: default line length for --terselength is the number of columns.
  removepkg: added --terse mode.
  upgradepkg: default line length for --terselength is the number of columns.
  upgradepkg: accept -option in addition to --option.
ap/vim-8.1.0026-x86_64-1.txz:  Upgraded.
d/bison-3.0.5-x86_64-1.txz:  Upgraded.
e/emacs-26.1-x86_64-1.txz:  Upgraded.
kde/kopete-4.14.3-x86_64-8.txz:  Rebuilt.
  Recompiled against libidn-1.35.
n/conntrack-tools-1.4.5-x86_64-1.txz:  Upgraded.
n/libnetfilter_conntrack-1.0.7-x86_64-1.txz:  Upgraded.
n/libnftnl-1.1.0-x86_64-1.txz:  Upgraded.
n/links-2.16-x86_64-2.txz:  Rebuilt.
  Rebuilt to enable X driver for -g mode.
n/lynx-2.8.9dev.19-x86_64-1.txz:  Upgraded.
n/nftables-0.8.5-x86_64-1.txz:  Upgraded.
n/p11-kit-0.23.11-x86_64-1.txz:  Upgraded.
n/ulogd-2.0.7-x86_64-1.txz:  Upgraded.
n/whois-5.3.1-x86_64-1.txz:  Upgraded.
xap/network-manager-applet-1.8.12-x86_64-1.txz:  Upgraded.
xap/vim-gvim-8.1.0026-x86_64-1.txz:  Upgraded.

3 files changed, 104 insertions, 30 deletions

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 <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 2a4a07338..ce86b9f4a 100755
--- a/source/d/doxygen/doxygen.SlackBuild
+++ b/source/d/doxygen/doxygen.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2018  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,24 +20,34 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
 
-VERSION=${VERSION:-$(basename $(echo doxygen-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev) .src)}
-BUILD=${BUILD:-1}
+PKGNAM=doxygen
+VERSION=${VERSION:-$(basename $(echo doxygen-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) .src)}
+BUILD=${BUILD:-3}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
+    i?86) export ARCH=i586 ;;
     arm*) export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
        *) export ARCH=$( uname -m ) ;;
   esac
 fi
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+  exit 0
+fi
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -50,7 +60,6 @@ else
   LIBDIRSUFFIX=""
 fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-doxygen
 
@@ -58,8 +67,8 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf doxygen-$VERSION
-tar xvf $CWD/doxygen-${VERSION}.src.tar.?z* || exit 1
-cd doxygen-$VERSION
+tar xvf $CWD/doxygen-${VERSION}.src.tar.?z || exit 1
+cd doxygen-$VERSION || exit 1
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -67,25 +76,38 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-QTDIR=/usr/lib${LIBDIRSUFFIX}/qt \
-./configure \
-  --shared \
-  --release \
-  --prefix /usr \
-  --docdir /usr/doc/doxygen-$VERSION \
-  --with-doxywizard
-
-make $NUMJOBS || make || exit 1
-make install INSTALL=$PKG/usr DOCDIR=$PKG/usr/doc/doxygen-$VERSION
-make install_docs INSTALL=$PKG/usr DOCDIR=$PKG/usr/doc/doxygen-$VERSION
+# Revert patch that leads to segfaults:
+zcat $CWD/doxygen.9468ede.diff.gz | patch -p1 -R --verbose || exit 1
+
+mkdir build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DDOC_INSTALL_DIR:STRING="/doc/doxygen-$VERSION" \
+    -Dbuild_app=yes \
+    -Dbuild_doc=yes \
+    -Dbuild_parse=yes \
+    -Dbuild_search=yes \
+    -Dbuild_wizard=yes \
+    -Dbuild_xmlparser=yes \
+    -Duse_sqlite3=yes \
+    -G "Unix Makefiles" .. || exit 1
+  make $NUMJOBS || make || exit 1
+  make $NUMJOBS docs || make docs || exit 1
+  make install DESTDIR=$PKG || exit 1
+cd ..
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
-# If there are misplaced man pages, fix that:
-mv $PKG/usr/*.1 $PKG/usr/man/man1
+# Fix manpage location
+mv $PKG/usr/share/man $PKG/usr/man
+
+# Removed unused /usr/share
+rmdir $PKG/usr/share 2>/dev/null
 
 # Compress and if needed symlink the man pages:
 if [ -d $PKG/usr/man ]; then
diff --git a/source/d/doxygen/slack-desc b/source/d/doxygen/slack-desc
index df95eb7b4..8220d232f 100644
--- a/source/d/doxygen/slack-desc
+++ b/source/d/doxygen/slack-desc
@@ -1,17 +1,17 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# The "handy ruler" below makes it easier to edit a package description. Line
 # up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
 # customary to leave one space after the ':'.
 
        |-----handy-ruler------------------------------------------------------|
 doxygen: doxygen (documentation generator)
 doxygen:
 doxygen: Doxygen is a documentation system for C++, C, Java, IDL, and to some
-doxygen: extent PHP and C#.  Doxygen generates project documentation using
+doxygen: extent PHP and C#. Doxygen generates project documentation using
 doxygen: special documentation blocks in the source code, easing the process of
-doxygen: keeping docs and code in sync.  Doxygen produces documentation in
+doxygen: keeping docs and code in sync. Doxygen produces documentation in
 doxygen: several output formats, including HTML, LaTeX, man pages, RTF, XML,
 doxygen: compressed HTML, PostScript, and PDF.
 doxygen: