diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2019-09-20 22:51:48 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2019-09-21 08:59:49 +0200 |
| commit | f5ab9bf2e5270c884a30330bb58917f9e93234c2 (patch) | |
| tree | 8ae52e6c5da14f22c580c9b1cc87729311b42d0d /slackware64/l/glib2/glib2.slackware.localtime.diff | |
| parent | 3fb911844eaa3e98d80a8cc6c946202904fe8693 (diff) | |
| download | current-f5ab9bf2e5270c884a30330bb58917f9e93234c2.tar.gz current-f5ab9bf2e5270c884a30330bb58917f9e93234c2.tar.xz | |
Fri Sep 20 22:51:48 UTC 201920190920225148
ap/qpdf-9.0.1-x86_64-1.txz: Upgraded.
l/glibmm-2.62.0-x86_64-1.txz: Upgraded.
l/libusb-1.0.23-x86_64-1.txz: Upgraded.
l/python-urllib3-1.25.5-x86_64-1.txz: Upgraded.
n/bluez-5.51-x86_64-1.txz: Upgraded.
Diffstat (limited to 'slackware64/l/glib2/glib2.slackware.localtime.diff')
| -rw-r--r-- | slackware64/l/glib2/glib2.slackware.localtime.diff | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/slackware64/l/glib2/glib2.slackware.localtime.diff b/slackware64/l/glib2/glib2.slackware.localtime.diff deleted file mode 100644 index 235632d12..000000000 --- a/slackware64/l/glib2/glib2.slackware.localtime.diff +++ /dev/null @@ -1,37 +0,0 @@ -From 4ac2d88f3153d8cdaa003601363e71f46820a187 Mon Sep 17 00:00:00 2001 -From: Patrick J. Volkerding <volkerdi@slackware.com> -Date: Tue, 20 Nov 2018 13:26: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 2018-09-21 09:23:53.000000000 -0500 -+++ ./glib/gtimezone.c 2018-11-20 13:11:31.601643410 -0600 -@@ -440,6 +440,20 @@ - - /* Resolve the actual timezone pointed to by /etc/localtime. */ - 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) -+ { -+ filename = g_strdup ("/etc/localtime-copied-from"); -+ g_clear_error (&read_link_err); -+ resolved_identifier = g_file_read_link (filename, &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, |