Sat Oct 27 18:22:46 UTC 201820181027182246

d/rust-1.30.0-x86_64-1.txz:  Upgraded.
l/gdbm-1.18.1-x86_64-1.txz:  Upgraded.
l/imagemagick-6.9.10_14-x86_64-1.txz:  Upgraded.
l/mozilla-nss-3.40-x86_64-1.txz:  Upgraded.
x/libevdev-1.6.0-x86_64-1.txz:  Upgraded.

6 files changed, 18 insertions, 33 deletions

diff --git a/source/d/rust/rust.SlackBuild b/source/d/rust/rust.SlackBuild
index bc84333be..cfc085ddb 100755
--- a/source/d/rust/rust.SlackBuild
+++ b/source/d/rust/rust.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=rust
 SRCNAM="${PKGNAM}c"
-VERSION=${VERSION:-1.29.2}
+VERSION=${VERSION:-1.30.0}
 BUILD=${BUILD:-1}
 
 # Set this to YES to build with the system LLVM, or NO to use the bundled LLVM.
@@ -34,9 +34,9 @@ BUILD=${BUILD:-1}
 SYSTEM_LLVM=${SYSTEM_LLVM:-NO}
 
 # Bootstrap variables (might not be kept updated for latest Rust):
-RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.28.0}
-RSTAGE0_DIR=${RSTAGE0_DIR:-2018-08-02}
-CSTAGE0_VERSION=${CSTAGE0_VERSION:-0.29.0}
+RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.29.2}
+RSTAGE0_DIR=${RSTAGE0_DIR:-2018-10-12}
+CSTAGE0_VERSION=${CSTAGE0_VERSION:-0.30.0}
 CSTAGE0_DIR=${CSTAGE0_DIR:-$RSTAGE0_DIR}
 
 # Automatically determine the architecture we're building on:
@@ -52,6 +52,11 @@ if [ -z "$ARCH" ]; then
 fi
 unset MARCH
 
+# For compiling i686 under an x86_64 kernel:
+if [ "$(uname -m)" = "x86_64" -a "$(file -L /usr/bin/gcc | grep 80386 | grep 32-bit)" != "" ]; then
+  ARCH=i686
+fi
+
 # 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.
diff --git a/source/d/rust/rust.url b/source/d/rust/rust.url
index c4ac64ad2..c6e448fe9 100644
--- a/source/d/rust/rust.url
+++ b/source/d/rust/rust.url
@@ -1,5 +1,5 @@
 # Source code (repacked to .tar.xz):
-lftpget https://static.rust-lang.org/dist/rustc-1.29.2-src.tar.gz
+lftpget https://static.rust-lang.org/dist/rustc-1.30.0-src.tar.gz
 gzip -d rustc-*tar.gz
 plzip -9 -v rustc-*tar
 
@@ -12,12 +12,12 @@ plzip -9 -v rustc-*tar
 exit 0
 
 # i686 bootstrap:
-lftpget https://static.rust-lang.org/dist/2018-08-02/cargo-0.29.0-i686-unknown-linux-gnu.tar.gz
-lftpget https://static.rust-lang.org/dist/2018-08-02/rust-std-1.28.0-i686-unknown-linux-gnu.tar.gz
-lftpget https://static.rust-lang.org/dist/2018-08-02/rustc-1.28.0-i686-unknown-linux-gnu.tar.gz
+lftpget https://static.rust-lang.org/dist/2018-10-12/cargo-0.30.0-i686-unknown-linux-gnu.tar.gz
+lftpget https://static.rust-lang.org/dist/2018-10-12/rust-std-1.29.2-i686-unknown-linux-gnu.tar.gz
+lftpget https://static.rust-lang.org/dist/2018-10-12/rustc-1.29.2-i686-unknown-linux-gnu.tar.gz
 
 # x86_64 bootstrap:
-lftpget https://static.rust-lang.org/dist/2018-08-02/cargo-0.29.0-x86_64-unknown-linux-gnu.tar.gz
-lftpget https://static.rust-lang.org/dist/2018-08-02/rust-std-1.28.0-x86_64-unknown-linux-gnu.tar.gz
-lftpget https://static.rust-lang.org/dist/2018-08-02/rustc-1.28.0-x86_64-unknown-linux-gnu.tar.gz
+lftpget https://static.rust-lang.org/dist/2018-10-12/cargo-0.30.0-x86_64-unknown-linux-gnu.tar.gz
+lftpget https://static.rust-lang.org/dist/2018-10-12/rust-std-1.29.2-x86_64-unknown-linux-gnu.tar.gz
+lftpget https://static.rust-lang.org/dist/2018-10-12/rustc-1.29.2-x86_64-unknown-linux-gnu.tar.gz
 
diff --git a/source/l/imagemagick/ImageMagick.fix.overloading.error.diff b/source/l/imagemagick/ImageMagick.fix.overloading.error.diff
deleted file mode 100644
index 0306390fd..000000000
--- a/source/l/imagemagick/ImageMagick.fix.overloading.error.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./Magick++/lib/Magick++/Color.h.orig	2018-08-28 07:31:12.000000000 -0500
-+++ ./Magick++/lib/Magick++/Color.h	2018-09-20 21:57:14.555014712 -0500
-@@ -122,11 +122,12 @@
-     {
-       return (static_cast<double>(quantum_)/QuantumRange);
-     }
--#endif
-+#else
-     static double scaleQuantumToDouble(const double quantum_)
-     {
-       return (quantum_/QuantumRange);
-     }
-+#endif
- 
-   protected:
- 
diff --git a/source/l/imagemagick/imagemagick.SlackBuild b/source/l/imagemagick/imagemagick.SlackBuild
index 0741fbb2b..cf231ac5d 100755
--- a/source/l/imagemagick/imagemagick.SlackBuild
+++ b/source/l/imagemagick/imagemagick.SlackBuild
@@ -103,10 +103,6 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-# Fix an error that only occurs on 32-bit, but I'm pretty sure that this
-# needed an #else in there:
-zcat $CWD/ImageMagick.fix.overloading.error.diff.gz | patch -p1 --verbose || exit 1
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/source/l/mozilla-nss/mozilla-nss.SlackBuild b/source/l/mozilla-nss/mozilla-nss.SlackBuild
index 1ae458540..6f19308e7 100755
--- a/source/l/mozilla-nss/mozilla-nss.SlackBuild
+++ b/source/l/mozilla-nss/mozilla-nss.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=mozilla-nss
 SRCNAM=nss
-VERSION=${VERSION:-3.39}
+VERSION=${VERSION:-3.40}
 NSPR=${NSPR:-4.20}
 BUILD=${BUILD:-1}
 
diff --git a/source/x/libevdev/libevdev.SlackBuild b/source/x/libevdev/libevdev.SlackBuild
index 642fb5e72..6ef77bdc5 100755
--- a/source/x/libevdev/libevdev.SlackBuild
+++ b/source/x/libevdev/libevdev.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libevdev
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in