diff options
Diffstat (limited to 'app-misc/dfshow')
| -rw-r--r-- | app-misc/dfshow/dfshow-0.9.1_beta-r2.ebuild (renamed from app-misc/dfshow/dfshow-0.9.1_beta-r1.ebuild) | 28 | ||||
| -rw-r--r-- | app-misc/dfshow/files/dfshow-0.9.1_beta-use-PKG_CHECK_MODULES-for-ncurses-libconfig.patch | 82 | ||||
| -rw-r--r-- | app-misc/dfshow/metadata.xml | 5 |
3 files changed, 109 insertions, 6 deletions
diff --git a/app-misc/dfshow/dfshow-0.9.1_beta-r1.ebuild b/app-misc/dfshow/dfshow-0.9.1_beta-r2.ebuild index 883ebd7c7fee..dc9ffb493c9b 100644 --- a/app-misc/dfshow/dfshow-0.9.1_beta-r1.ebuild +++ b/app-misc/dfshow/dfshow-0.9.1_beta-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools bash-completion-r1 +inherit autotools bash-completion-r1 flag-o-matic MY_PV="${PV//_beta/-beta}" DESCRIPTION="DF-SHOW is a Unix-like rewrite of some of the applications from DF-EDIT" @@ -19,15 +19,33 @@ DEPEND="dev-libs/libconfig:= sys-libs/ncurses:0= " RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-0.9.1_beta-use-PKG_CHECK_MODULES-for-ncurses-libconfig.patch +) src_prepare() { default - sed -i 's/LDADD = -lncursesw -lm -lconfig/LDADD = -lncursesw -lm -lconfig -ltinfow/' Makefile.am || - die "sed in Makefile.am failed" + + if [[ ${CHOST} == *-darwin* ]] ; then + # Standard on macOS + # No real motivation to push libtool upstream just for this + append-ldflags -Wl,-undefined -Wl,dynamic_lookup + fi eautoreconf } +src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/854726 + # https://github.com/roberthawdon/dfshow/issues/172 + filter-lto + + default +} + src_install() { default diff --git a/app-misc/dfshow/files/dfshow-0.9.1_beta-use-PKG_CHECK_MODULES-for-ncurses-libconfig.patch b/app-misc/dfshow/files/dfshow-0.9.1_beta-use-PKG_CHECK_MODULES-for-ncurses-libconfig.patch new file mode 100644 index 000000000000..44fc11b34ca2 --- /dev/null +++ b/app-misc/dfshow/files/dfshow-0.9.1_beta-use-PKG_CHECK_MODULES-for-ncurses-libconfig.patch @@ -0,0 +1,82 @@ +From a8185ad9270db54b9e0c66002e7ceebdc264af19 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Fri, 30 Apr 2021 04:49:26 +0100 +Subject: [PATCH] Use PKG_CHECK_MODULES for ncurses, libconfig + +It's not always clear how to link against ncurses +and the choices before us are: +1) use a convoluted chain of autoconf checks +2) use pkg-config (this commit) +3) guess and hardcode the most popular values + +This is an iteration of a previous change [0] by a +Gentoo contributor which landed upstream. + +The previous change ended up doing 3) which is fine +but doesn't always work in strange situations. Gentoo +_usually_ builds 'split tinfo' on Linux but this isn't +guaranteed. + +This change now uses PKG_CHECK_MODULES which uses +pkg-config behind the scenes to query ncurses +for the correct way to build & link against it. + +(We do the same thing for libconfig too.) + +[0] https://github.com/roberthawdon/dfshow/pull/115 +--- + Makefile.am | 13 ++++--------- + configure.ac | 5 +++-- + 2 files changed, 7 insertions(+), 11 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 048ded5..6dcaa1f 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -4,21 +4,16 @@ dfshowconfdir = $(sysconfdir) + dfshowdatadir = $(datadir)/dfshow + + AM_CFLAGS = -DSYSCONFIG=\"$(dfshowconfdir)\" -DDATADIR=\"$(dfshowdatadir)\" -D_XOPEN_SOURCE_EXTENDED -fno-common ++AM_CFLAGS += $(ncurses_CFLAGS) $(libconfig_CFLAGS) + +-LDADD = -lm -lconfig +- +-if DARWIN +-LDADD += -lncurses +-else +-LDADD += -lncursesw +-endif ++LDADD = -lm $(ncurses_LIBS) $(libconfig_LIBS) + + if LINUX +-LDADD += -lacl -ltinfo ++LDADD += -lacl + endif + + if HURD +-LDADD += -lacl -ltinfo ++LDADD += -lacl + endif + + if SELINUX +diff --git a/configure.ac b/configure.ac +index f185b69..8acf1ab 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -32,10 +32,11 @@ AC_CHECK_FUNCS(acl_get facl_get acl_set facl_set) + + AC_CHECK_MEMBERS([struct stat.st_author]) + AC_CHECK_HEADERS([stdio.h limits.h signal.h ctype.h wctype.h getopt.h sys/types.h sys/stat.h dirent.h fcntl.h pwd.h string.h stdlib.h unistd.h time.h sys/statvfs.h libgen.h errno.h wchar.h hurd.h math.h sys/sysmacros.h regex.h utime.h sys/xattr.h acl/libacl.h stdint.h]) +-AC_CHECK_HEADERS(ncurses.h, , AC_MSG_ERROR(ncurses header (ncurses.h) not found. You may need to install an ncurses development package.)) +-AC_CHECK_HEADERS(libconfig.h, , AC_MSG_ERROR(libconfig header (libconfig.h) not found. You may need to install a libconfig development package.)) + AC_CHECK_HEADERS(sys/acl.h, , AC_MSG_ERROR(libacl header (sys/acl.h) not found. You may need to install a libacl development package.)) + ++PKG_CHECK_MODULES([ncurses], [ncursesw ncurses]) ++PKG_CHECK_MODULES([libconfig], [libconfig]) ++ + AC_ARG_WITH([selinux], AS_HELP_STRING([--with-selinux], [Build with selinux library (default: disabled)])) + AC_ARG_ENABLE([move-between-devices], AS_HELP_STRING([--enable-move-between-devices], [Enable moving objects between mounted devices (default: disabled)])) + +-- +2.31.1 + diff --git a/app-misc/dfshow/metadata.xml b/app-misc/dfshow/metadata.xml index 8a953cf29241..26b60019bb23 100644 --- a/app-misc/dfshow/metadata.xml +++ b/app-misc/dfshow/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <longdescription lang="en"> @@ -7,4 +7,7 @@ the applications from Larry Kroeker's DF-EDIT (Directory File Editor) for MS-DOS and PC-DOS systems, based on the Version 2.3d release from 1986. </longdescription> + <upstream> + <remote-id type="github">roberthawdon/dfshow</remote-id> + </upstream> </pkgmetadata> |