From 9e03634d298a015561dfa94c2f6ba892487e3f38 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Sat, 25 Sep 2021 19:32:08 +0000
Subject: Sat Sep 25 19:32:08 UTC 2021

a/coreutils-9.0-x86_64-2.txz:  Rebuilt.
  DIR_COLORS: Add support for .tzst, .zst, .flv, and .m2t extensions.
  Thanks to regdub.
a/elvis-2.2_0-x86_64-8.txz:  Rebuilt.
  Removed elvis.clr.orig. Thanks to ctrlaltca.
d/bison-3.8.2-x86_64-1.txz:  Upgraded.
d/meson-0.59.1-x86_64-1.txz:  Upgraded.
d/subversion-1.14.1-x86_64-4.txz:  Rebuilt.
  Added compile options --with-kwallet and --with-gnome-keyring (the latter was
  already used by default). Thanks to rsts and Windu.
kde/plasma-desktop-5.22.5-x86_64-2.txz:  Rebuilt.
  Removed main.xml.orig. Thanks to ctrlaltca.
l/gst-plugins-bad-free-1.18.5-x86_64-1.txz:  Added.
  These are the "bad" GStreamer plugins that have free enough licenses to ship.
  Thanks to Heinz Wiesinger.
l/gtk4-4.4.0-x86_64-1.txz:  Upgraded.
l/libssh2-1.10.0-x86_64-1.txz:  Upgraded.
n/lynx-2.9.0dev.9-x86_64-1.txz:  Upgraded.
  Based on testing here, this seems stable enough to include. Please let me
  know if there are any new problems.
  lynx.cfg: Add ASSUME_CHARSET:utf-8. Thanks to usr345.
  Removed CHANGES.orig. Thanks to ctrlaltca.
xap/x3270-4.0ga14-x86_64-1.txz:  Upgraded.
xap/xpdf-4.03-x86_64-3.txz:  Rebuilt.
  Removed .orig files. Thanks to ctrlaltca.
---
 source/d/subversion/subversion.SlackBuild | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

(limited to 'source/d/subversion/subversion.SlackBuild')

diff --git a/source/d/subversion/subversion.SlackBuild b/source/d/subversion/subversion.SlackBuild
index a3d59afd6..8725ddbaa 100755
--- a/source/d/subversion/subversion.SlackBuild
+++ b/source/d/subversion/subversion.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2011, 2012, 2015, 2018, 2020  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2015, 2018, 2020, 2021  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -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:-3}
+BUILD=${BUILD:-4}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -98,16 +98,14 @@ CFLAGS="$SLKCFLAGS" \
   --with-lz4=/usr \
   --with-zlib=/usr \
   --with-pic \
+  --with-kwallet \
+  --with-gnome-keyring \
   --build=$ARCH-slackware-linux || exit 1
 
-# Leave this out for now, because having qt5 and KDE4 installed confuses it.
-# We'll look at it again once we have Plasma 5.
-#  --with-kwallet
-
 make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
-make install-tools DESTDIR=$PKG || exit 1
-make install-docs DESTDIR=$PKG || exit 1
+make $NUMJOBS install DESTDIR=$PKG || exit 1
+make $NUMJOBS install-tools DESTDIR=$PKG || exit 1
+make $NUMJOBS install-docs DESTDIR=$PKG || exit 1
 
 ## COMMENTED OUT - this doesn't work with swig > 4.0.0
 ## If something actually needs it, let me know and I'll look at it again.
@@ -125,14 +123,14 @@ make $NUMJOBS swig-pl-lib || exit 1
 make install-swig-pl-lib DESTDIR=$PKG || exit 1
 ( cd subversion/bindings/swig/perl/native
   perl Makefile.PL
-  make install_vendor DESTDIR=$PKG || exit 1
+  make $NUMJOBS install_vendor DESTDIR=$PKG || exit 1
 ) || exit 1
 eval $(perl '-V:archlib')
 mv $PKG/$archlib/perllocal.pod $PKG/$archlib/subversion.pod
 
 # Ruby bindings
 make $NUMJOBS swig-rb || exit 1
-make install-swig-rb DESTDIR=$PKG || exit 1
+make $NUMJOBS install-swig-rb DESTDIR=$PKG || exit 1
 
 # Don't ship .la files:
 rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
-- 
cgit v1.2.3-80-g2a13