From 9b2263c35d22d77dc913ca980014efc8390305db Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Mon, 31 Dec 2018 21:33:54 +0000
Subject: Mon Dec 31 21:33:54 UTC 2018

a/efibootmgr-17-x86_64-1.txz:  Upgraded.
a/efivar-37-x86_64-1.txz:  Upgraded.
d/cmake-3.13.2-x86_64-2.txz:  Rebuilt.
  Work around build failures with recent doxygen.
d/ruby-2.6.0-x86_64-1.txz:  Upgraded.
  Shared library .so-version bump.
d/subversion-1.11.0-x86_64-2.txz:  Rebuilt.
  Recompiled against ruby-2.6.0.
kde/korundum-4.14.3-x86_64-7.txz:  Rebuilt.
  Recompiled against ruby-2.6.0.
kde/qtruby-4.14.3-x86_64-9.txz:  Rebuilt.
  Recompiled against ruby-2.6.0.
l/gobject-introspection-1.58.3-x86_64-1.txz:  Upgraded.
l/imagemagick-6.9.10_22-x86_64-1.txz:  Upgraded.
l/libssh-0.8.6-x86_64-1.txz:  Upgraded.
n/epic5-2.0.1-x86_64-8.txz:  Rebuilt.
  Recompiled against ruby-2.6.0.
n/tin-2.4.3-x86_64-1.txz:  Upgraded.
n/wireless_tools-30.pre9-x86_64-1.txz:  Upgraded.
x/xterm-341-x86_64-2.txz:  Rebuilt.
  Install xterm app-defaults that resemble the Linux console. Thanks to GazL.
---
 source/d/cmake/cmake.SlackBuild           |  5 ++++-
 source/d/cmake/cmake.doxygen-1.8.15.diff  | 16 ++++++++++++++++
 source/d/subversion/subversion.SlackBuild |  2 +-
 3 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 source/d/cmake/cmake.doxygen-1.8.15.diff

(limited to 'source/d')

diff --git a/source/d/cmake/cmake.SlackBuild b/source/d/cmake/cmake.SlackBuild
index b2075987..9036e4cf 100755
--- a/source/d/cmake/cmake.SlackBuild
+++ b/source/d/cmake/cmake.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=cmake
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -67,6 +67,9 @@ rm -rf $PKGNAM-$VERSION
 tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
 cd $PKGNAM-$VERSION || exit 1
 
+# Work around breakage with doxygen-1.8.15:
+zcat $CWD/cmake.doxygen-1.8.15.diff.gz | patch -p1 --verbose || exit 1
+
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/source/d/cmake/cmake.doxygen-1.8.15.diff b/source/d/cmake/cmake.doxygen-1.8.15.diff
new file mode 100644
index 00000000..ed73290a
--- /dev/null
+++ b/source/d/cmake/cmake.doxygen-1.8.15.diff
@@ -0,0 +1,16 @@
+--- ./Modules/FindDoxygen.cmake.orig	2018-12-13 05:57:40.000000000 -0600
++++ ./Modules/FindDoxygen.cmake	2018-12-31 13:45:34.300895249 -0600
+@@ -708,8 +708,11 @@
+         if(_line MATCHES "([A-Z][A-Z0-9_]+)( *=)(.*)")
+             set(_key "${CMAKE_MATCH_1}")
+             set(_eql "${CMAKE_MATCH_2}")
+-            string(REPLACE ";" "\\\n" _value "${CMAKE_MATCH_3}")
+-            list(APPEND _Doxygen_tpl_params "${_key}${_eql}${_value}")
++            #string(REPLACE ";" "\\\n" _value "${CMAKE_MATCH_3}")
++            #list(APPEND _Doxygen_tpl_params "${_key}${_eql}${_value}")
++            string(REPLACE "\\" "\\\\" _value1 "${CMAKE_MATCH_3}")
++            string(REPLACE ";" "\\\n" _value2 "${_value1}")
++            list(APPEND _Doxygen_tpl_params "${_key}${_eql}${_value2}")
+         endif()
+     endforeach()
+ 
diff --git a/source/d/subversion/subversion.SlackBuild b/source/d/subversion/subversion.SlackBuild
index 33f51f9c..61d0faf2 100755
--- a/source/d/subversion/subversion.SlackBuild
+++ b/source/d/subversion/subversion.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=subversion
 VERSION=${VERSION:-$(echo subversion-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
-- 
cgit v1.2.3