diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2019-09-19 22:48:58 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2019-09-20 08:59:47 +0200 |
commit | 3fb911844eaa3e98d80a8cc6c946202904fe8693 (patch) | |
tree | b614a5a6e02c370bd4824e86980b7b8c9ab442de /slackware64/l/glib2/glib2.slackware.localtime.diff | |
parent | a580cc0d3e082bb499f39ba917b24149bdb68ac7 (diff) | |
download | current-3fb911844eaa3e98d80a8cc6c946202904fe8693.tar.gz current-3fb911844eaa3e98d80a8cc6c946202904fe8693.tar.xz |
Thu Sep 19 22:48:58 UTC 201920190919224858
Thanks to Robby Workman for helping upgrade the GTK stack!
a/kernel-generic-4.19.74-x86_64-1.txz: Upgraded.
a/kernel-huge-4.19.74-x86_64-1.txz: Upgraded.
a/kernel-modules-4.19.74-x86_64-1.txz: Upgraded.
d/kernel-headers-4.19.74-x86-1.txz: Upgraded.
d/vala-0.46.1-x86_64-1.txz: Upgraded.
k/kernel-source-4.19.74-noarch-1.txz: Upgraded.
l/adwaita-icon-theme-3.34.0-noarch-1.txz: Upgraded.
l/at-spi2-atk-2.34.0-x86_64-1.txz: Upgraded.
l/at-spi2-core-2.34.0-x86_64-1.txz: Upgraded.
l/atk-2.34.1-x86_64-1.txz: Upgraded.
l/dconf-0.34.0-x86_64-1.txz: Upgraded.
l/dconf-editor-3.34.1-x86_64-1.txz: Upgraded.
l/fuse3-3.6.2-x86_64-1.txz: Added.
This is required by gvfs and sshfs.
l/glib-networking-2.62.0-x86_64-1.txz: Upgraded.
l/glib2-2.62.0-x86_64-1.txz: Upgraded.
l/gnome-themes-extra-3.28-x86_64-1.txz: Added.
l/gnome-themes-standard-3.22.3-x86_64-2.txz: Removed.
Upstream has renamed this to gnome-themes-extra.
l/gobject-introspection-1.62.0-x86_64-1.txz: Upgraded.
l/gsettings-desktop-schemas-3.34.0-x86_64-1.txz: Upgraded.
l/gvfs-1.42.0-x86_64-1.txz: Upgraded.
l/imagemagick-6.9.10_65-x86_64-1.txz: Upgraded.
l/librsvg-2.46.0-x86_64-1.txz: Upgraded.
l/libsoup-2.68.1-x86_64-1.txz: Upgraded.
l/pygobject3-3.34.0-x86_64-1.txz: Upgraded.
l/python-packaging-19.2-x86_64-1.txz: Upgraded.
l/vte-0.58.0-x86_64-1.txz: Upgraded.
n/bind-9.14.6-x86_64-1.txz: Upgraded.
n/sshfs-3.5.2-x86_64-1.txz: Upgraded.
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'slackware64/l/glib2/glib2.slackware.localtime.diff')
-rw-r--r-- | slackware64/l/glib2/glib2.slackware.localtime.diff | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/slackware64/l/glib2/glib2.slackware.localtime.diff b/slackware64/l/glib2/glib2.slackware.localtime.diff new file mode 100644 index 000000000..235632d12 --- /dev/null +++ b/slackware64/l/glib2/glib2.slackware.localtime.diff @@ -0,0 +1,37 @@ +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, |