6 files changed, 46 insertions, 35 deletions
diff --git a/source/a/glibc-zoneinfo/glibc-zoneinfo.SlackBuild b/source/a/glibc-zoneinfo/glibc-zoneinfo.SlackBuild
index 1efc702d..07df3be2 100755
--- a/source/a/glibc-zoneinfo/glibc-zoneinfo.SlackBuild
+++ b/source/a/glibc-zoneinfo/glibc-zoneinfo.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=glibc-zoneinfo
 ZONE_VERSIONS="$(echo tzdata* | cut -f1 -d . | cut -b7-11)"
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -89,7 +89,7 @@ tar xzf $CWD/tzdata?????.tar.gz || exit 1
 
 # Default to more bloated (but more compatible) "fat" format with zic.
 # This was the default prior to tzcode2020b.
-zcat $CWD/zic.default.fat.gz | patch -p1 --verbose || exit 1
+zcat $CWD/zic.default.fat.diff.gz | patch -p1 --verbose || exit 1
 
 chown -R root:root .
 find . \
diff --git a/source/a/glibc-zoneinfo/zic.default.fat b/source/a/glibc-zoneinfo/zic.default.fat.diff
index 62832bb1..62832bb1 100644
--- a/source/a/glibc-zoneinfo/zic.default.fat
+++ b/source/a/glibc-zoneinfo/zic.default.fat.diff
diff --git a/source/d/ccache/ccache.SlackBuild b/source/d/ccache/ccache.SlackBuild
index 905a2046..f5c0f6b2 100755
--- a/source/d/ccache/ccache.SlackBuild
+++ b/source/d/ccache/ccache.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2011, 2017, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2017, 2018, 2020  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -63,13 +63,26 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
-./configure \
-  --prefix=/usr \
-  --mandir=/usr/man \
-  --sysconfdir=/etc || exit 1
-
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
+# Configure, build, and install:
+mkdir cmake-build
+cd cmake-build
+  cmake \
+    -DCMAKE_C_FLAGS="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX="$LIBDIRSUFFIX" \
+    -DDOC_INSTALL_DIR="doc" \
+    -DMAN_INSTALL_DIR=/usr/man \
+    .. || exit 1
+  make $NUMJOBS || make || exit 1
+  make install DESTDIR=$PKG || exit 1
+  # Generate and install man page:
+  ( cd doc
+    make doc-man-page
+    mkdir -p $PKG/usr/man/man1
+    cat Ccache.1 > $PKG/usr/man/man1/ccache.1
+  )
+cd ..
 
 # Compress and link manpages, if any:
 if [ -d $PKG/usr/man ]; then
@@ -88,7 +101,7 @@ fi
 
 mkdir -p $PKG/usr/doc/ccache-$VERSION
 cp -a \
-  *.md *.txt *.html \
+  CONTRIBUTING* *GPL* LICENSE* README* doc/*.md doc/AUTHORS* doc/NEWS* \
   $PKG/usr/doc/ccache-$VERSION
 
 # Strip binaries:
diff --git a/source/l/glib2/glib2.slackware.localtime.diff b/source/l/glib2/glib2.slackware.localtime.diff
index 235632d1..1170e140 100644
--- a/source/l/glib2/glib2.slackware.localtime.diff
+++ b/source/l/glib2/glib2.slackware.localtime.diff
@@ -1,6 +1,7 @@
-From 4ac2d88f3153d8cdaa003601363e71f46820a187 Mon Sep 17 00:00:00 2001
+From 05690c6bdb6751278352fefe96061395de490663 Mon Sep 17 00:00:00 2001
+
 From: Patrick J. Volkerding <volkerdi@slackware.com>
-Date: Tue, 20 Nov 2018 13:26:57 -0600
+Date: Mon, 19 Oct 2020 12:54:57 -0600
 Subject: [PATCH] Also look at /etc/localtime-copied-from
 
 In Slackware, /etc/localtime is a copy of the local timezone file, not a
@@ -12,26 +13,23 @@ systems this will be a symlink to the local timezone file under
 /etc/localtime *is* a symlink first though, since that's an acceptable
 local system modification on Slackware.
 
---- ./glib/gtimezone.c.orig	2018-09-21 09:23:53.000000000 -0500
-+++ ./glib/gtimezone.c	2018-11-20 13:11:31.601643410 -0600
-@@ -440,6 +440,20 @@
+--- ./glib/gtimezone.c.orig	2020-10-19 10:05:31.300005400 -0500
++++ ./glib/gtimezone.c	2020-10-19 13:04:58.796033505 -0500
+@@ -451,6 +451,17 @@
  
-       /* Resolve the actual timezone pointed to by /etc/localtime. */
-       resolved_identifier = g_file_read_link (filename, &read_link_err);
+   /* Resolve the actual timezone pointed to by /etc/localtime. */
+   resolved_identifier = g_file_read_link ("/etc/localtime", &read_link_err);
 +
-+      /* If we didn't get the timezone here (probably because
-+       * /etc/localtime is not a symlink), then we will try again using
-+       * /etc/localtime-copied-from, which on Slackware is a symlink to
-+       * the local timezone file. */
-+      if (resolved_identifier == NULL)
-+        {
-+          filename = g_strdup ("/etc/localtime-copied-from");
-+          g_clear_error (&read_link_err);
-+          resolved_identifier = g_file_read_link (filename, &read_link_err);
-+        }
++  /* If we didn't get the timezone here (probably because
++   * /etc/localtime is not a symlink), then we will try again using
++   * /etc/localtime-copied-from, which on Slackware is a symlink to
++   * the local timezone file. */
++  if (resolved_identifier == NULL)
++    {
++      g_clear_error (&read_link_err);
++      resolved_identifier = g_file_read_link ("/etc/localtime-copied-from", &read_link_err);
++    }
 +
-+      /* Test that we got the resolved_identifier. If not, fall back on the
-+       * last option (/var/db/zoneinfo file, as found on FreeBSD) */
-       if (resolved_identifier == NULL)
-         {
-           gboolean not_a_symlink = g_error_matches (read_link_err,
+   if (resolved_identifier == NULL)
+     {
+       gboolean not_a_symlink = g_error_matches (read_link_err,
diff --git a/source/l/mozjs78/mozjs78.SlackBuild b/source/l/mozjs78/mozjs78.SlackBuild
index a8e304e0..7aa66687 100755
--- a/source/l/mozjs78/mozjs78.SlackBuild
+++ b/source/l/mozjs78/mozjs78.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=mozjs78
 SRCNAME=firefox
-VERSION=78.3.1esr
+VERSION=78.4.0esr
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
diff --git a/source/x/pyxdg/pyxdg.SlackBuild b/source/x/pyxdg/pyxdg.SlackBuild
index d77adf58..46b98039 100755
--- a/source/x/pyxdg/pyxdg.SlackBuild
+++ b/source/x/pyxdg/pyxdg.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=pyxdg
 VERSION=${VERSION:-$(echo ${PKGNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then