diff options
Diffstat (limited to 'source')
| -rwxr-xr-x | source/a/mkinitrd/mkinitrd.SlackBuild | 5 | ||||
| -rw-r--r-- | source/a/mkinitrd/mkinitrd.tempfile.to.mktemp.patch | 19 | ||||
| -rwxr-xr-x | source/l/gtk+3/gtk+3.SlackBuild | 8 | ||||
| -rw-r--r-- | source/l/gtk+3/gtk.fix.missing.version-check.py.diff | 39 | ||||
| -rw-r--r-- | source/l/gtk+3/gtk.meson.build.version.diff | 9 | ||||
| -rwxr-xr-x | source/n/irssi/irssi.SlackBuild | 7 | ||||
| -rw-r--r-- | source/n/irssi/irssi.ctrl-space.diff | 11 |
7 files changed, 83 insertions, 15 deletions
diff --git a/source/a/mkinitrd/mkinitrd.SlackBuild b/source/a/mkinitrd/mkinitrd.SlackBuild index 20965e3a..879e64c0 100755 --- a/source/a/mkinitrd/mkinitrd.SlackBuild +++ b/source/a/mkinitrd/mkinitrd.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mkinitrd VERSION=${VERSION:-1.4.11} BB=1.30.1 -BUILD=${BUILD:-14} +BUILD=${BUILD:-15} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -118,6 +118,9 @@ cp -a $CWD/mkinitrd $PKG/sbin/mkinitrd chown root:root $PKG/sbin/mkinitrd chmod 755 $PKG/sbin/mkinitrd +# Patch to switch to mktemp: +( cd $PKG/sbin ; zcat $CWD/mkinitrd.tempfile.to.mktemp.patch.gz | patch --verbose || exit 1) || exit 1 + mkdir -p $PKG/usr/man/man{5,8} cat $CWD/mkinitrd.conf.5 | gzip -9c > $PKG/usr/man/man5/mkinitrd.conf.5.gz cat $CWD/mkinitrd.8 | gzip -9c > $PKG/usr/man/man8/mkinitrd.8.gz diff --git a/source/a/mkinitrd/mkinitrd.tempfile.to.mktemp.patch b/source/a/mkinitrd/mkinitrd.tempfile.to.mktemp.patch new file mode 100644 index 00000000..3fb199ab --- /dev/null +++ b/source/a/mkinitrd/mkinitrd.tempfile.to.mktemp.patch @@ -0,0 +1,19 @@ +From bbeb9d73191c1c79f5286fd3b1fdb5611fb11301 Mon Sep 17 00:00:00 2001 +From: "Patrick J. Volkerding" <volkerdi@slackware.com> +Date: Sun Apr 26 18:51:23 CDT 2020 +Subject: [PATCH] Switch from tempfile to mktemp + +Use the standard mktemp utility from GNU coreutils rather than the +lesser-known tempfile utility from Debian of yore. + +--- mkinitrd.orig 2019-09-04 23:37:08.000000000 -0500 ++++ mkinitrd 2020-04-26 18:46:22.352636100 -0500 +@@ -235,7 +235,7 @@ + + # Then copy all remaining libs our initrd files link against: + COUNT=1 +- PRFX=$(tempfile --prefix ldd-) ++ PRFX=$(mktemp --suffix -ldd) + TMPFILE=${PRFX}${COUNT} + + find $SOURCE_TREE -type f -exec ldd {} 2>/dev/null \; | unify_libs > $TMPFILE diff --git a/source/l/gtk+3/gtk+3.SlackBuild b/source/l/gtk+3/gtk+3.SlackBuild index cd05ae4c..377b619a 100755 --- a/source/l/gtk+3/gtk+3.SlackBuild +++ b/source/l/gtk+3/gtk+3.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gtk+3 VERSION=${VERSION:-$(echo gtk+-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -77,8 +77,10 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# Fix embedded version number: -zcat $CWD/gtk.meson.build.version.diff.gz | patch -p1 --verbose || exit 1 +# The version-check.py seems to be missing from the top-level directory, but +# since we've checked the version numbers manually we'll just fix things so +# the configure process doesn't try to call it: +zcat $CWD/gtk.fix.missing.version-check.py.diff.gz | patch -p1 --verbose || exit 1 # Configure, build, and install: export CFLAGS="$SLKCFLAGS -DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS" diff --git a/source/l/gtk+3/gtk.fix.missing.version-check.py.diff b/source/l/gtk+3/gtk.fix.missing.version-check.py.diff new file mode 100644 index 00000000..29693232 --- /dev/null +++ b/source/l/gtk+3/gtk.fix.missing.version-check.py.diff @@ -0,0 +1,39 @@ +--- ./Makefile.in.orig 2020-04-27 09:37:05.000000000 -0500 ++++ ./Makefile.in 2020-04-27 13:08:49.593281753 -0500 +@@ -1241,7 +1241,6 @@ + dist-hook: + mkdir $(distdir)/subprojects + cp -p $(srcdir)/subprojects/*.wrap $(distdir)/subprojects +- $(top_srcdir)/check-version.py $(top_srcdir)/configure.ac $(top_srcdir)/meson.build + + distclean-local: + if test "$(srcdir)" = "."; then :; else \ +--- ./meson.build.orig 2020-04-27 09:35:59.000000000 -0500 ++++ ./meson.build 2020-04-27 13:09:29.805285185 -0500 +@@ -987,16 +987,6 @@ + install_dir : join_paths(gtk_datadir, 'gtk-3.0', 'valgrind')) + endif + +-test( +- 'version-check', +- find_program('check-version.py'), +- args: [ +- join_paths(meson.current_source_dir(), 'configure.ac'), +- join_paths(meson.current_source_dir(), 'meson.build'), +- ], +- suite: 'gtk', +-) +- + summary = [ + '', + '------', +--- ./Makefile.am.orig 2020-04-23 12:14:53.000000000 -0500 ++++ ./Makefile.am 2020-04-27 13:08:28.015279911 -0500 +@@ -84,7 +84,6 @@ + dist-hook: + mkdir $(distdir)/subprojects + cp -p $(srcdir)/subprojects/*.wrap $(distdir)/subprojects +- $(top_srcdir)/check-version.py $(top_srcdir)/configure.ac $(top_srcdir)/meson.build + + distclean-local: + if test "$(srcdir)" = "."; then :; else \ diff --git a/source/l/gtk+3/gtk.meson.build.version.diff b/source/l/gtk+3/gtk.meson.build.version.diff deleted file mode 100644 index 4588ea6c..00000000 --- a/source/l/gtk+3/gtk.meson.build.version.diff +++ /dev/null @@ -1,9 +0,0 @@ ---- ./meson.build.orig 2020-04-03 12:07:47.000000000 -0500 -+++ ./meson.build 2020-04-15 14:18:42.838219120 -0500 -@@ -1,5 +1,5 @@ - project('gtk+-3.0', 'c', -- version: '3.24.17', -+ version: '3.24.18', - default_options: [ - 'buildtype=debugoptimized', - 'warning_level=1' diff --git a/source/n/irssi/irssi.SlackBuild b/source/n/irssi/irssi.SlackBuild index 9b949f8f..d462fd78 100755 --- a/source/n/irssi/irssi.SlackBuild +++ b/source/n/irssi/irssi.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016, 2017, 2018, 2020 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -28,7 +28,7 @@ PKG=$TMP/package-irssi VERSION=${VERSION:-$(echo irssi-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} DIRCD=${VERSION} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -78,6 +78,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +# Fix crtl-space killing input with recent glib: +zcat $CWD/irssi.ctrl-space.diff.gz | patch -p1 --verbose || exit 1 + CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/source/n/irssi/irssi.ctrl-space.diff b/source/n/irssi/irssi.ctrl-space.diff new file mode 100644 index 00000000..01b1eab5 --- /dev/null +++ b/source/n/irssi/irssi.ctrl-space.diff @@ -0,0 +1,11 @@ +diff -Naur irssi-1.2.2/src/fe-text/term-terminfo.c irssi-1.2.2.patched/src/fe-text/term-terminfo.c +--- irssi-1.2.2/src/fe-text/term-terminfo.c 2019-08-29 09:48:46.000000000 -0400 ++++ irssi-1.2.2.patched/src/fe-text/term-terminfo.c 2020-04-26 04:15:02.007493067 -0400 +@@ -673,6 +673,7 @@ + static int input_utf8(const unsigned char *buffer, int size, unichar *result) + { + unichar c = g_utf8_get_char_validated((char *)buffer, size); ++ if(*buffer == '\0') c = (unichar)-1; + + switch (c) { + case (unichar)-1: |