diff options
Diffstat (limited to 'source/a')
| -rw-r--r-- | source/a/gpm/gpm-1.20.1-weak-wgetch.patch | 14 | ||||
| -rwxr-xr-x | source/a/gpm/gpm.SlackBuild | 30 | ||||
| -rw-r--r-- | source/a/gpm/gpm.configure.diff | 23 | ||||
| -rwxr-xr-x | source/a/util-linux/util-linux.SlackBuild | 4 |
4 files changed, 28 insertions, 43 deletions
diff --git a/source/a/gpm/gpm-1.20.1-weak-wgetch.patch b/source/a/gpm/gpm-1.20.1-weak-wgetch.patch index 2546e17f7..cf10ee6b2 100644 --- a/source/a/gpm/gpm-1.20.1-weak-wgetch.patch +++ b/source/a/gpm/gpm-1.20.1-weak-wgetch.patch @@ -1,5 +1,5 @@ ---- gpm-1.20.1/src/lib/libcurses.c.weak-wgetch 2002-12-24 17:57:16.000000000 -0500 -+++ gpm-1.20.1/src/lib/libcurses.c 2004-03-22 15:51:24.000000000 -0500 +--- ./src/lib/libcurses.c.orig 2012-10-26 16:21:38.000000000 -0500 ++++ ./src/lib/libcurses.c 2024-03-27 14:48:08.842064533 -0500 @@ -41,7 +41,12 @@ #endif /* HAVE_NCURSES_CURSES_H */ #endif /* HAVE_NCURSES_H */ @@ -14,13 +14,3 @@ int Gpm_Wgetch(WINDOW *win) { ---- gpm-1.20.1/configure.ac.weak-wgetch 2004-03-22 15:49:51.000000000 -0500 -+++ gpm-1.20.1/configure.ac 2004-03-22 15:51:24.000000000 -0500 -@@ -115,7 +115,7 @@ - AC_CHECK_LIB($i, wgetch,,,$TERMLIBS) - else :; fi - done -- SHARED_LIBS="$LIBS $TERMLIBS -lc" -+ SHARED_LIBS="-lc" - LIBS=$SAVELIBS ;; - esac diff --git a/source/a/gpm/gpm.SlackBuild b/source/a/gpm/gpm.SlackBuild index 767d7f352..d2f27c7f5 100755 --- a/source/a/gpm/gpm.SlackBuild +++ b/source/a/gpm/gpm.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gpm VERSION=1.20.7 -BUILD=${BUILD:-9} +BUILD=${BUILD:-10} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -80,36 +80,20 @@ zcat $CWD/gpm-1.20.5-close-fds.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/gpm-1.20.1-select-1.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/gpm.types.diff.gz | patch -p1 --verbose || exit 1 zcat $CWD/gpm.gcc7.diff.gz | patch -p1 --verbose || exit 1 - -sh autogen.sh - -# This is *supposed* to prevent linking libgpm.so with -lncurses, -# but for some reason it doesn't have the desired effect here. -# Any ideas? The patch is supposed to resolve a circular dependency -# between libgpm.so and libncurses.so. I don't notice any ill effects -# here, but perhaps the problem would occur if prelinking was used. -# Also, ncurses has not shown an ldd link to libgpm for several releases, -# so perhaps any problem that existed was fixed on their end. -# NOTE: Since this isn't preventing gpm from linking to ncurses, I'm -# commenting this patch out until we understand better if it's even -# useful for anything. Half a patch seems worse than no patch. -#zcat $CWD/gpm-1.20.1-weak-wgetch.patch.gz | patch -p1 --verbose || exit 1 - -# Since we aren't installing any Emacs Lisp files anyway, just brutally -# hack around this failing part of ./configure. This may be a brittle -# solution, so if it doesn't apply just go ahead and try without this -# patch and see if it's working or not. zcat $CWD/gpm.configure.diff.gz | patch -p1 --verbose || exit 1 -# Since we just patched configure.ac, run this again to carry the change -# into configure: -autoconf +# This patch is supposed to resolve a circular dependency between libgpm.so +# and libncurses.so: +zcat $CWD/gpm-1.20.1-weak-wgetch.patch.gz | patch -p1 --verbose || exit 1 + +sh autogen.sh CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --libdir=/usr/lib${LIBDIRSUFFIX} \ + --without-curses \ --build=$ARCH-slackware-linux || exit 1 make || exit 1 diff --git a/source/a/gpm/gpm.configure.diff b/source/a/gpm/gpm.configure.diff index fd25767f2..3dedb8907 100644 --- a/source/a/gpm/gpm.configure.diff +++ b/source/a/gpm/gpm.configure.diff @@ -1,16 +1,25 @@ ---- ./configure.ac.orig 2024-01-20 13:18:14.607950073 -0600 -+++ ./configure.ac 2024-01-20 13:19:06.734947190 -0600 -@@ -63,12 +63,7 @@ - ELISP="emacs/t-mouse.el emacs/t-mouse.elc" - fi - +--- ./configure.ac.footer.orig 2012-10-26 16:21:38.000000000 -0500 ++++ ./configure.ac.footer 2024-03-27 14:43:34.948058406 -0500 +@@ -49,22 +49,6 @@ + AC_PATH_PROG(MAKEINFO,makeinfo,no) + AC_PATH_PROG(DIFF,diff,no) + AC_PATH_PROG(SED,sed,no) +-AC_PATH_PROG(emacs,emacs,no) +- +-if test ${ac_cv_path_emacs} = no ; then +- EMACS=: +- ELISP= +-else +- EMACS=${ac_cv_path_emacs} +- ELISP="emacs/t-mouse.el emacs/t-mouse.elc" +-fi +- -if test $EMACS != : ; then - ITZ_PATH_SITE_LISP - lispdir=${itz_cv_path_site_lisp} -else - lispdir='${datadir}/emacs/site-lisp' -fi -+lispdir='${datadir}/emacs/site-lisp' # Header-checks AC_CHECK_HEADERS(syslog.h linux/input.h linux/joystick.h ncurses.h ncurses/curses.h curses.h) diff --git a/source/a/util-linux/util-linux.SlackBuild b/source/a/util-linux/util-linux.SlackBuild index 35858a799..767804a2f 100755 --- a/source/a/util-linux/util-linux.SlackBuild +++ b/source/a/util-linux/util-linux.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=util-linux VERSION=${VERSION:-$(echo util-linux*.tar.xz | cut -d - -f 3 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} ADJTIMEXVERS=1.29 SETSERIALVERS=2.17 @@ -119,6 +119,8 @@ else SHIP_SU=NO LOGIN_OPTIONS="--disable-login" fi +# Put any PAM modules in the proper directory: +sed -i "s|securelibdir = \$(libdir)/security|securelibdir = /lib${LIBDIRSUFFIX}/security|g" pam_lastlog2/src/Makemodule.am # Changing the fdisk -l output (this was done prior to util-linux-ng) broke # our installation scripts, so we have changed the name of partition type |