diff options
Diffstat (limited to 'source/a')
| -rwxr-xr-x | source/a/gpm/gpm.SlackBuild | 10 | ||||
| -rw-r--r-- | source/a/gpm/gpm.configure.diff | 28 |
2 files changed, 21 insertions, 17 deletions
diff --git a/source/a/gpm/gpm.SlackBuild b/source/a/gpm/gpm.SlackBuild index f5a6ded8b..767d7f352 100755 --- a/source/a/gpm/gpm.SlackBuild +++ b/source/a/gpm/gpm.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2013, 2014, 2018, 2021, 2023 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2013, 2014, 2018, 2021, 2023, 2024 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -95,16 +95,16 @@ sh autogen.sh # 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 just patched configure.ac, run this again to carry the change -# into configure: -autoconf - # 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 + CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/source/a/gpm/gpm.configure.diff b/source/a/gpm/gpm.configure.diff index 7b3578e9a..fd25767f2 100644 --- a/source/a/gpm/gpm.configure.diff +++ b/source/a/gpm/gpm.configure.diff @@ -1,12 +1,16 @@ ---- ./configure.orig 2023-09-28 14:00:16.498715386 -0500 -+++ ./configure 2023-09-28 14:00:55.205713245 -0500 -@@ -12426,8 +12426,7 @@ - then : - printf %s "(cached) " >&6 - else $as_nop -- eval itz_cv_path_site_lisp=`${EMACS} -batch -l ${srcdir}/exec.el -exec "(mapcar 'print load-path)" 2>/dev/null | --sed -e '/^$/d' | sed -n -e 2p` -+ eval - case x${itz_cv_path_site_lisp} in - x*site-lisp*) ;; - x*) itz_cv_path_site_lisp='${datadir}/emacs/site-lisp' ;; +--- ./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 + +-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) |