diff options
Diffstat (limited to 'source/l')
-rwxr-xr-x | source/l/glib2/glib2.SlackBuild | 3 | ||||
-rw-r--r-- | source/l/glib2/glib2.slackware.localtime.diff | 35 | ||||
-rwxr-xr-x | source/l/mozilla-nss/mozilla-nss.SlackBuild | 2 |
3 files changed, 1 insertions, 39 deletions
diff --git a/source/l/glib2/glib2.SlackBuild b/source/l/glib2/glib2.SlackBuild index 0b9f287c0..cc9d58976 100755 --- a/source/l/glib2/glib2.SlackBuild +++ b/source/l/glib2/glib2.SlackBuild @@ -77,9 +77,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# Get the local timezone link from /etc/localtime-copied-from: -zcat $CWD/glib2.slackware.localtime.diff.gz | patch -p1 --verbose || exit 1 - # Allow the slightly older version of gtk-doc to avoid bundling a newer one: zcat $CWD/glib.allow.gtk-doc-1.32.diff.gz | patch -p1 --verbose || exit 1 diff --git a/source/l/glib2/glib2.slackware.localtime.diff b/source/l/glib2/glib2.slackware.localtime.diff deleted file mode 100644 index 1170e1402..000000000 --- a/source/l/glib2/glib2.slackware.localtime.diff +++ /dev/null @@ -1,35 +0,0 @@ -From 05690c6bdb6751278352fefe96061395de490663 Mon Sep 17 00:00:00 2001 - -From: Patrick J. Volkerding <volkerdi@slackware.com> -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 -symlink to it, but the latest glib expects a symlink (because that's been -demanded by systemd and guess-who). So, if we find that /etc/localtime is -not a symlink, consider /etc/localtime-copied-from next. On Slackware -systems this will be a symlink to the local timezone file under -/usr/share/zoneinfo. We still want to consider the possibility that -/etc/localtime *is* a symlink first though, since that's an acceptable -local system modification on Slackware. - ---- ./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 ("/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) -+ { -+ g_clear_error (&read_link_err); -+ resolved_identifier = g_file_read_link ("/etc/localtime-copied-from", &read_link_err); -+ } -+ - if (resolved_identifier == NULL) - { - gboolean not_a_symlink = g_error_matches (read_link_err, diff --git a/source/l/mozilla-nss/mozilla-nss.SlackBuild b/source/l/mozilla-nss/mozilla-nss.SlackBuild index a8a465c4c..c3ac7086c 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.59} +VERSION=${VERSION:-3.60} NSPR=${NSPR:-4.29} BUILD=${BUILD:-1} |