From a5a6e494a74ca91943ba9e0831b225ac19b1ee1b Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Mon, 19 Oct 2020 20:16:19 +0000 Subject: Mon Oct 19 20:16:19 UTC 2020 a/glibc-zoneinfo-2020c-noarch-1.txz: Upgraded. This package provides the latest timezone updates. d/ccache-4.0-x86_64-1.txz: Upgraded. Please note that the default cache directory has been changed to $HOME/.cache/ccache and the default config file has been changed to $HOME/.config/ccache/ccache.conf. You'll probably want to move your existing config file if you've set any options, and then clear out the old location of $HOME/.ccache to avoid wasting storage space. d/python-pip-20.2.4-x86_64-1.txz: Upgraded. d/python-setuptools-50.3.2-x86_64-1.txz: Upgraded. l/glib2-2.66.2-x86_64-1.txz: Upgraded. l/mozjs78-78.4.0esr-x86_64-1.txz: Upgraded. l/python-urllib3-1.25.11-x86_64-1.txz: Upgraded. x/pyxdg-0.27-x86_64-1.txz: Upgraded. xap/mozilla-firefox-78.4.0esr-x86_64-1.txz: Upgraded. This is a bugfix release. For more information, see: https://www.mozilla.org/en-US/firefox/78.4.0/releasenotes/ --- source/a/glibc-zoneinfo/glibc-zoneinfo.SlackBuild | 4 +-- source/a/glibc-zoneinfo/zic.default.fat | 11 ------ source/a/glibc-zoneinfo/zic.default.fat.diff | 11 ++++++ source/d/ccache/ccache.SlackBuild | 31 ++++++++++++----- source/l/glib2/glib2.slackware.localtime.diff | 42 +++++++++++------------ source/l/mozjs78/mozjs78.SlackBuild | 2 +- source/x/pyxdg/pyxdg.SlackBuild | 2 +- 7 files changed, 57 insertions(+), 46 deletions(-) delete mode 100644 source/a/glibc-zoneinfo/zic.default.fat create mode 100644 source/a/glibc-zoneinfo/zic.default.fat.diff (limited to 'source') diff --git a/source/a/glibc-zoneinfo/glibc-zoneinfo.SlackBuild b/source/a/glibc-zoneinfo/glibc-zoneinfo.SlackBuild index 1efc702d3..07df3be21 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 deleted file mode 100644 index 62832bb12..000000000 --- a/source/a/glibc-zoneinfo/zic.default.fat +++ /dev/null @@ -1,11 +0,0 @@ ---- ./zic.c.orig 2020-10-03 17:11:18.000000000 -0500 -+++ ./zic.c 2020-10-12 13:03:20.086014967 -0500 -@@ -668,7 +668,7 @@ - } - - #ifndef ZIC_BLOAT_DEFAULT --# define ZIC_BLOAT_DEFAULT "slim" -+# define ZIC_BLOAT_DEFAULT "fat" - #endif - - int diff --git a/source/a/glibc-zoneinfo/zic.default.fat.diff b/source/a/glibc-zoneinfo/zic.default.fat.diff new file mode 100644 index 000000000..62832bb12 --- /dev/null +++ b/source/a/glibc-zoneinfo/zic.default.fat.diff @@ -0,0 +1,11 @@ +--- ./zic.c.orig 2020-10-03 17:11:18.000000000 -0500 ++++ ./zic.c 2020-10-12 13:03:20.086014967 -0500 +@@ -668,7 +668,7 @@ + } + + #ifndef ZIC_BLOAT_DEFAULT +-# define ZIC_BLOAT_DEFAULT "slim" ++# define ZIC_BLOAT_DEFAULT "fat" + #endif + + int diff --git a/source/d/ccache/ccache.SlackBuild b/source/d/ccache/ccache.SlackBuild index 905a20469..f5c0f6b27 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 235632d12..1170e1402 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 -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 a8e304e0d..7aa666878 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 d77adf586..46b980394 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 -- cgit v1.2.3