Sat Feb 8 21:20:28 UTC 202020200208212028

a/bash-5.0.016-x86_64-1.txz:  Upgraded.
a/kernel-firmware-20200207_6f89735-noarch-1.txz:  Upgraded.
ap/nvme-cli-1.10.1-x86_64-1.txz:  Added.
d/gdb-9.1-x86_64-1.txz:  Upgraded.
l/ConsoleKit2-1.2.1-x86_64-1.txz:  Upgraded.
l/imagemagick-7.0.9_22-x86_64-1.txz:  Upgraded.
l/mozilla-nss-3.50-x86_64-1.txz:  Upgraded.
  Upgraded to nss-3.50 and nspr-4.25.
l/readline-8.0.004-x86_64-1.txz:  Upgraded.
n/libgpg-error-1.37-x86_64-1.txz:  Upgraded.

2 files changed, 12 insertions, 141 deletions

diff --git a/source/d/gdb/gdb.SlackBuild b/source/d/gdb/gdb.SlackBuild
index 8f7947f5..fae55a98 100755
--- a/source/d/gdb/gdb.SlackBuild
+++ b/source/d/gdb/gdb.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=gdb
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -72,18 +72,15 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
-# Currently broken in this version, but keep trying:
-if [ "$VERSION" = "8.3.1" ]; then
-  GUILE_OPTION="--without-guile"
-else
-  # Might as well try it to see if it compiles this time:
-  GUILE_OPTION="--with-guile"
-fi
+# This has been perpetually broken, so we'll default to turning it off:
+GUILE_OPTION=${GUILE_OPTION:"--without-guile"}
 
-# Fix for Python 3.8.x:
-zcat $CWD/gdb.python38.patch.gz | patch -p1 --verbose || exit 1
+# Make a build directory:
+mkdir build-gdb
+cd build-gdb
 
-./configure \
+# Configure:
+../configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
@@ -94,6 +91,7 @@ zcat $CWD/gdb.python38.patch.gz | patch -p1 --verbose || exit 1
   --with-system-zlib \
   --build=$ARCH-slackware-linux || exit 1
 
+# Build and install:
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
@@ -103,6 +101,9 @@ rmdir $PKG/usr/lib${LIBDIRSUFFIX} 2> /dev/null
 rm -f $PKG/usr/info/{annotate*,bfd*,configure*,standards*}
 rm -rf $PKG/usr/include
 
+# Head back out of the build-gdb directory..
+cd ..
+
 mkdir -p $PKG/usr/doc/gdb-$VERSION/gdb
 cp -a COPYING* README $PKG/usr/doc/gdb-$VERSION
 cd gdb
@@ -143,4 +144,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 # Build the package:
 cd $PKG
 /sbin/makepkg -l y -c n $TMP/gdb-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/d/gdb/gdb.python38.patch b/source/d/gdb/gdb.python38.patch
deleted file mode 100644
index 96b3ad4a..00000000
--- a/source/d/gdb/gdb.python38.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From b6484282f85bf7f11451b2441599c241d302ad9d Mon Sep 17 00:00:00 2001
-From: Raul Tambre <raul@tambre.ee>
-Date: Sat, 4 May 2019 15:48:17 -0400
-Subject: [PATCH] Fix incorrect use of 'is' operator for comparison in
- python/lib/gdb/command/prompt.py
-
-The 'is' operator is not meant to be used for comparisons. It currently working
-is an implementation detail of CPython.  CPython 3.8 has added a SyntaxWarning
-for this.
-
-diff --git a/gdb/python/lib/gdb/command/prompt.py b/gdb/python/lib/gdb/command/prompt.py
-index 3d662a7..04b9e49 100644
---- a/gdb/python/lib/gdb/command/prompt.py
-+++ b/gdb/python/lib/gdb/command/prompt.py
-@@ -45,7 +45,7 @@ The currently defined substitutions are:
-         self.hook_set = False
- 
-     def get_show_string (self, pvalue):
--        if self.value is not '':
-+        if self.value:
-            return "The extended prompt is: " + self.value
-         else:
-            return "The extended prompt is not set."
-@@ -57,7 +57,7 @@ The currently defined substitutions are:
-         return ""
- 
-     def before_prompt_hook(self, current):
--        if self.value is not '':
-+        if self.value:
-             return gdb.prompt.substitute_prompt(self.value)
-         else:
-             return None
-
-From d9c4ba536c522b8dc2194d4100270a159be7894a Mon Sep 17 00:00:00 2001
-From: Sergio Durigan Junior <sergiodj@redhat.com>
-Date: Sun, 25 Aug 2019 12:10:35 -0400
-Subject: [PATCH] Use raw strings on gdb.python/py-xmethods.exp (and fix Python
- 3.8's "SyntaxWarning: invalid escape sequence")
-
-The way unrecognized escape sequences are handled has changed in
-Python 3.8: users now see a SyntaxWarning message, which will
-eventually become a SyntaxError in future versions of Python:
-
-  (gdb) source /blabla/gdb.python/py-xmethods/py-xmethods.py
-  /blabla/gdb.python/py-xmethods/py-xmethods.py:204: SyntaxWarning: invalid escape seque
-  nce \+
-    'operator\+',
-  /blabla/gdb.python/py-xmethods/py-xmethods.py:211: SyntaxWarning: invalid escape seque
-  nce \+
-    'operator\+\+',
-
-One of our testcases, gdb.python/py-xmethods.exp, contains strings in
-the form of "operator\+".  This is not recognized by Python, but is
-still needed by the testsuite to work properly.  The solution is
-simple: we just have to make sure these strings are marked as
-raw (i.e, r"").  This is what this patch does.  I took the opportunity
-to also convert other strings to raw, which, in two cases, allowed the
-removal of an extra backslash.
-
-I tested this using Python 3.7 and Python 3.8, and everything works
-fine.
-
-I think I could push this as obvious, but decided to send it to
-gdb-patches just in case.
-
-gdb/testsuite/ChangeLog:
-2019-08-26  Sergio Durigan Junior  <sergiodj@redhat.com>
-
-	* gdb.python/py-xmethods.exp: Use raw strings when passing
-	arguments to SimpleXMethodMatcher.
-
-diff --git a/gdb/testsuite/gdb.python/py-xmethods.py b/gdb/testsuite/gdb.python/py-xmethods.py
-index 587842d7360..cea48b80d8c 100644
---- a/gdb/testsuite/gdb.python/py-xmethods.py
-+++ b/gdb/testsuite/gdb.python/py-xmethods.py
-@@ -199,34 +199,34 @@ def match(self, class_type, method_name):
- 
- 
- global_dm_list = [
--    SimpleXMethodMatcher('A_plus_A',
--                         '^dop::A$',
--                         'operator\+',
-+    SimpleXMethodMatcher(r'A_plus_A',
-+                         r'^dop::A$',
-+                         r'operator\+',
-                          A_plus_A,
-                          # This is a replacement, hence match the arg type
-                          # exactly!
-                          type_A.const().reference()),
--    SimpleXMethodMatcher('plus_plus_A',
--                         '^dop::A$',
--                         'operator\+\+',
-+    SimpleXMethodMatcher(r'plus_plus_A',
-+                         r'^dop::A$',
-+                         r'operator\+\+',
-                          plus_plus_A),
--    SimpleXMethodMatcher('A_geta',
--                         '^dop::A$',
--                         '^geta$',
-+    SimpleXMethodMatcher(r'A_geta',
-+                         r'^dop::A$',
-+                         r'^geta$',
-                          A_geta),
--    SimpleXMethodMatcher('A_getarrayind',
--                         '^dop::A$',
--                         '^getarrayind$',
-+    SimpleXMethodMatcher(r'A_getarrayind',
-+                         r'^dop::A$',
-+                         r'^getarrayind$',
-                          A_getarrayind,
-                          type_int),
--    SimpleXMethodMatcher('A_indexoper',
--                         '^dop::A$',
--                         'operator\\[\\]',
-+    SimpleXMethodMatcher(r'A_indexoper',
-+                         r'^dop::A$',
-+                         r'operator\[\]',
-                          A_indexoper,
-                          type_int),
--    SimpleXMethodMatcher('B_indexoper',
--                         '^dop::B$',
--                         'operator\\[\\]',
-+    SimpleXMethodMatcher(r'B_indexoper',
-+                         r'^dop::B$',
-+                         r'operator\[\]',
-                          B_indexoper,
-                          type_int)
- ]
-