summaryrefslogtreecommitdiffstats
path: root/source/d/automake
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2022-02-21 20:21:38 +0000
committer Eric Hameleers <alien@slackware.com>2022-02-22 06:59:43 +0100
commit32fa88b60c4d872b057e9e7651b351d54affa40e (patch)
tree9adf4cc6cac2f4aa1f78e1b45a8d3ce786412423 /source/d/automake
parentd5740c2f619f72d61555bb6bef595aa0172ba60f (diff)
downloadcurrent-32fa88b60c4d872b057e9e7651b351d54affa40e.tar.gz
current-32fa88b60c4d872b057e9e7651b351d54affa40e.tar.xz
Mon Feb 21 20:21:38 UTC 202220220221202138
a/aaa_glibc-solibs-2.35-x86_64-1.txz: Upgraded. a/kernel-firmware-20220218_c53073d-noarch-1.txz: Upgraded. ap/flac-1.3.4-x86_64-1.txz: Upgraded. This update fixes overflow issues with encoding and decoding. For more information, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-0499 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-0561 (* Security fix *) ap/ksh93-1.0_20220219_bc6c5dbd-x86_64-1.txz: Upgraded. ap/mariadb-10.6.7-x86_64-2.txz: Rebuilt. Removed dangling symlink. ap/vim-8.2.4428-x86_64-1.txz: Upgraded. Patched ctags for glibc-2.35. Thanks to nobodino. d/autoconf-2.71-noarch-1.txz: Upgraded. d/automake-1.16.5-noarch-1.txz: Upgraded. d/binutils-2.38-x86_64-2.txz: Rebuilt. Fixed the SlackBuild to not run autoconf in the libiberty and intl subdirectories. It doesn't work with the latest autoconf, and there doesn't seem to be any need for it anyway. d/cmake-3.22.2-x86_64-1.txz: Upgraded. d/meson-0.61.2-x86_64-1.txz: Upgraded. d/rcs-5.10.0-x86_64-4.txz: Rebuilt. Patched for glibc-2.35. Thanks to nobodino. d/scons-4.3.0-x86_64-1.txz: Upgraded. e/emacs-27.2-x86_64-2.txz: Rebuilt. Patched for glibc-2.35. Thanks to nobodino. kde/digikam-7.5.0-x86_64-2.txz: Rebuilt. Recompiled against jasper-3.0.2. kde/wacomtablet-20220124_dd28b27-x86_64-1.txz: Upgraded. l/LibRaw-0.20.2-x86_64-4.txz: Rebuilt. Recompiled against jasper-3.0.2. l/accountsservice-22.07.5-x86_64-1.txz: Upgraded. l/dconf-editor-3.38.3-x86_64-2.txz: Rebuilt. Fixed build errors with meson. l/expat-2.4.6-x86_64-1.txz: Upgraded. l/fuse-2.9.9-x86_64-4.txz: Rebuilt. Patched for glibc-2.35. Thanks to nobodino. l/gcr-3.40.0-x86_64-2.txz: Rebuilt. Fixed build errors with meson. l/gdk-pixbuf2-2.42.6-x86_64-2.txz: Rebuilt. Fixed meson options. l/gdk-pixbuf2-xlib-2.40.2-x86_64-4.txz: Rebuilt. Fixed meson options. l/gegl-0.4.34-x86_64-3.txz: Rebuilt. Recompiled against jasper-3.0.2. l/glade-3.38.2-x86_64-6.txz: Rebuilt. Fixed build errors with meson. Removed duplicated 'da' from help/LINGUAS. l/glibc-2.35-x86_64-1.txz: Upgraded. l/glibc-i18n-2.35-x86_64-1.txz: Upgraded. l/glibc-profile-2.35-x86_64-1.txz: Upgraded. l/gobject-introspection-1.71.0-x86_64-1.txz: Upgraded. This update was needed to solve failing tests with the new meson. l/gtk+2-2.24.33-x86_64-3.txz: Rebuilt. Changed build/host to $ARCH-slackware-linux-gnu. l/gtk4-4.4.1-x86_64-2.txz: Rebuilt. Fixed meson options. l/gvfs-1.48.1-x86_64-2.txz: Rebuilt. Fixed build errors with meson. l/imagemagick-7.1.0_26-x86_64-1.txz: Upgraded. l/jasper-3.0.2-x86_64-1.txz: Upgraded. Shared library .so-version bump. l/json-glib-1.6.6-x86_64-2.txz: Rebuilt. Fixed meson options. l/libsecret-0.20.5-x86_64-1.txz: Upgraded. l/netpbm-10.97.04-x86_64-1.txz: Upgraded. l/qt5-5.15.3_20211130_014c375b-x86_64-3.txz: Rebuilt. Patched for glibc-2.35. Thanks to nobodino. Recompiled against jasper-3.0.2. l/shared-mime-info-2.1-x86_64-4.txz: Rebuilt. Fixed build errors with meson. n/gpgme-1.17.0-x86_64-1.txz: Upgraded. n/ntp-4.2.8p15-x86_64-9.txz: Rebuilt. Patched for glibc-2.35. Thanks to nobodino. x/libinput-1.19.3-x86_64-2.txz: Rebuilt. Recompiled against libwacom-2.1.0. x/libva-2.14.0-x86_64-1.txz: Upgraded. x/libva-utils-2.14.0-x86_64-1.txz: Upgraded. x/libwacom-2.1.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. x/motif-2.3.8-x86_64-6.txz: Rebuilt. Fixed build with LEXLIB="-lfl". x/vulkan-sdk-1.2.176.1-x86_64-3.txz: Rebuilt. Patched for glibc-2.35. Thanks to nobodino. x/xf86-input-wacom-1.0.0-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.24.0-x86_64-3.txz: Rebuilt. Fixed build errors with meson. xap/vim-gvim-8.2.4428-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/d/automake')
-rwxr-xr-xsource/d/automake/automake.SlackBuild7
-rw-r--r--source/d/automake/automake.python.3.10.diff22
2 files changed, 2 insertions, 27 deletions
diff --git a/source/d/automake/automake.SlackBuild b/source/d/automake/automake.SlackBuild
index 6fbc3b063..21915f799 100755
--- a/source/d/automake/automake.SlackBuild
+++ b/source/d/automake/automake.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2008, 2009, 2012, 2015, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2012, 2015, 2018, 2022 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=automake
VERSION=${VERSION:-$(echo automake-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-1}
# Note: the package is _built_ as 'noarch'
# Automatically determine architecture for build & packaging:
@@ -63,9 +63,6 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
-# Python detection fix for 3.10:
-zcat $CWD/automake.python.3.10.diff.gz | patch -p1 --verbose || exit 1
-
./configure \
--prefix=/usr \
--mandir=/usr/man \
diff --git a/source/d/automake/automake.python.3.10.diff b/source/d/automake/automake.python.3.10.diff
deleted file mode 100644
index 02dd7348f..000000000
--- a/source/d/automake/automake.python.3.10.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- ./m4/python.m4.orig 2020-01-01 13:43:28.000000000 -0600
-+++ ./m4/python.m4 2021-10-15 11:40:40.523668203 -0500
-@@ -86,12 +86,14 @@
- m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])])
- else
-
-- dnl Query Python for its version number. Getting [:3] seems to be
-- dnl the best way to do this; it's what "site.py" does in the standard
-- dnl library.
--
-+ dnl Query Python for its version number. Although site.py simply uses
-+ dnl sys.version[:3], printing that failed with Python 3.10, since the
-+ dnl trailing zero was eliminated. So now we output just the major
-+ dnl and minor version numbers, as numbers. Apparently the tertiary
-+ dnl version is not of interest.
-+ dnl
- AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],
-- [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`])
-+ [am_cv_python_version=`$PYTHON -c "import sys; print ('%u.%u' % sys.version_info[[:2]])"`])
- AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
-
- dnl Use the values of $prefix and $exec_prefix for the corresponding