commit: 075e0f7ae4782eb7d25140455d30af48cc32c253
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 24 16:41:42 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Nov 24 16:53:02 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=075e0f7a
sys-apps/less: backport procfs fix to 608
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-apps/less/files/less-608-procfs.patch | 45 ++++++++++++++++++++++
.../less/{less-608.ebuild => less-608-r1.ebuild} | 12 ++++++
2 files changed, 57 insertions(+)
diff --git a/sys-apps/less/files/less-608-procfs.patch
b/sys-apps/less/files/less-608-procfs.patch
new file mode 100644
index 000000000000..4f66322b8123
--- /dev/null
+++ b/sys-apps/less/files/less-608-procfs.patch
@@ -0,0 +1,45 @@
+From 03f011f219a6d6068c4ccd07dbd8dcd50641ff10 Mon Sep 17 00:00:00 2001
+From: Mark Nudelman <[email protected]>
+Date: Tue, 20 Sep 2022 12:32:30 -0700
+Subject: [PATCH] Fix reading procfs files on Linux: bad detection of
+ HAVE_PROCFS.
+
+diff --git a/ch.c b/ch.c
+index bfad09c7..fcf136b9 100644
+--- a/ch.c
++++ b/ch.c
+@@ -28,6 +28,9 @@ extern ino_t curr_ino;
+
+ #if HAVE_PROCFS
+ #include <sys/statfs.h>
++#if HAVE_LINUX_MAGIC_H
++#include <linux/magic.h>
++#endif
+ #endif
+
+ typedef POSITION BLOCKNUM;
+diff --git a/configure.ac b/configure.ac
+index f7c64814..b10adce9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -37,7 +37,7 @@ AC_SEARCH_LIBS([regcmp], [gen intl PW])
+
+ # Checks for header files.
+ AC_HEADER_STDC
+-AC_CHECK_HEADERS([ctype.h errno.h fcntl.h limits.h stdio.h stdlib.h string.h
termcap.h termio.h termios.h time.h unistd.h values.h sys/ioctl.h sys/stream.h
wctype.h])
++AC_CHECK_HEADERS([ctype.h errno.h fcntl.h limits.h stdio.h stdlib.h string.h
termcap.h termio.h termios.h time.h unistd.h values.h linux/magic.h sys/ioctl.h
sys/stream.h wctype.h])
+
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_HEADER_STAT
+@@ -271,7 +271,10 @@ AC_TRY_COMPILE([#include <sys/types.h>
+ [struct stat s; dev_t dev = s.st_dev; ino_t ino = s.st_ino;],
+ [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_STAT_INO)], [AC_MSG_RESULT(no)])
+ AC_MSG_CHECKING(for procfs)
+-AC_TRY_COMPILE([#include <sys/statfs.h>],
++AC_TRY_COMPILE([#include <sys/statfs.h>
++#if HAVE_LINUX_MAGIC_H
++#include <linux/magic.h>
++#endif],
+ [struct statfs s; s.f_type = PROC_SUPER_MAGIC; (void) fstatfs(0,&s); ],
+ [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_PROCFS)], [AC_MSG_RESULT(no)])
+
diff --git a/sys-apps/less/less-608.ebuild b/sys-apps/less/less-608-r1.ebuild
similarity index 89%
rename from sys-apps/less/less-608.ebuild
rename to sys-apps/less/less-608-r1.ebuild
index a10cea4792b3..0c48837e70b3 100644
--- a/sys-apps/less/less-608.ebuild
+++ b/sys-apps/less/less-608-r1.ebuild
@@ -2,6 +2,10 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+WANT_AUTOMAKE=none
+WANT_LIBTOOL=none
+
+inherit autotools
DESCRIPTION="Excellent text file viewer"
HOMEPAGE="http://www.greenwoodsoftware.com/less/";
@@ -17,6 +21,14 @@ DEPEND=">=app-misc/editor-wrapper-3
pcre? ( dev-libs/libpcre2 )"
RDEPEND="${DEPEND}"
+src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}/less-608-procfs.patch"
+ )
+ default
+ eautoreconf
+}
+
src_configure() {
export ac_cv_lib_ncursesw_initscr=$(usex unicode)
export ac_cv_lib_ncurses_initscr=$(usex !unicode)
