summaryrefslogtreecommitdiff
path: root/source/l/glib2/glib2.slackware.localtime.diff
diff options
context:
space:
mode:
Diffstat (limited to 'source/l/glib2/glib2.slackware.localtime.diff')
-rw-r--r--source/l/glib2/glib2.slackware.localtime.diff35
1 files changed, 0 insertions, 35 deletions
diff --git a/source/l/glib2/glib2.slackware.localtime.diff b/source/l/glib2/glib2.slackware.localtime.diff
deleted file mode 100644
index 1170e140..00000000
--- 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,