commit: 0bf5477633a6a83e1d90666fad2187a1dc608eea Author: Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de> AuthorDate: Tue Nov 1 15:36:10 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Nov 22 06:49:03 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bf54776
app-text/multitail: version bump to 7.0.0 - fix build for clang16 - fix build for LTO's -Werror=lto-type-mismatch Closes: https://bugs.gentoo.org/874102 Closes: https://bugs.gentoo.org/855017 Signed-off-by: Pascal Jäger <pascal.jaeger <AT> leimstift.de> Closes: https://github.com/gentoo/gentoo/pull/28089 Signed-off-by: Sam James <sam <AT> gentoo.org> app-text/multitail/Manifest | 1 + .../files/multitail-7.0.0-fix-clang16-build.patch | 34 ++++++++++++ .../multitail-7.0.0-fix-lto-type-mismatch.patch | 29 ++++++++++ .../multitail/files/multitail-7.0.0-gentoo.patch | 32 +++++++++++ app-text/multitail/multitail-7.0.0.ebuild | 63 ++++++++++++++++++++++ 5 files changed, 159 insertions(+) diff --git a/app-text/multitail/Manifest b/app-text/multitail/Manifest index 3b7bdb9651a2..d4f71baea304 100644 --- a/app-text/multitail/Manifest +++ b/app-text/multitail/Manifest @@ -1 +1,2 @@ DIST multitail-6.4.2.tgz 155757 BLAKE2B aba6fea993e0d91071bddcf6d06767773ad6ea6054436dbd8a7163553b1cdfc03040362b87e9b2d31f8fe2165f213c718904f9295d3ab2076707cabf423ae681 SHA512 668c453372ba1e4013aa5191c697bdcaad82c84732841c120a506bee063d2134941e93aed63f96e5aeeb6045829a13aba012f9514dbd9520ab4f1b9b75b42dbd +DIST multitail-7.0.0.tar.gz 152425 BLAKE2B 1afbee9501926b860bd063768e6d20b7e6fe97b7ca8eaeb279639f3ef4f32d3c694650e2471abab067add04fbd1ce7b94dfc2f709baca460e9a36a34cb0746d2 SHA512 325abc2ec3e55f274b8f080c54e878ee301af1df5761def95b5fee0abe65cc999a2db0184e1d7a7378c048b1766e03f9553262d3bba88c8fad87c4952d1d59ae diff --git a/app-text/multitail/files/multitail-7.0.0-fix-clang16-build.patch b/app-text/multitail/files/multitail-7.0.0-fix-clang16-build.patch new file mode 100644 index 000000000000..1c706e0d0236 --- /dev/null +++ b/app-text/multitail/files/multitail-7.0.0-fix-clang16-build.patch @@ -0,0 +1,34 @@ +Clang16 will not suppert implicit int and implicit function declarations. +This patch makes the source code ready for clang16. +See also: https://bugs.gentoo.org/870412 + +Bug: https://bugs.gentoo.org/874102 + +This patch is already merged upstream, see: https://github.com/folkertvanheusden/multitail/pull/10 + +Signed-off-by: Pascal Jäger <[email protected]> + +--- a/misc.c ++++ b/misc.c +@@ -477,7 +477,7 @@ void heartbeat(void) + mydoupdate(); + } + +-void do_check_for_mail() ++void do_check_for_mail(dtime_t time) + { + if (check_for_mail > 0 && mail_spool_file != NULL) + { +diff --git a/misc.h b/misc.h +index febf11a..5566519 100644 +--- a/misc.h ++++ b/misc.h +@@ -1,5 +1,7 @@ ++#import "mt.h" ++ + void info(void); + void statistics_menu(void); + void heartbeat(void); +-void do_check_for_mail(); ++void do_check_for_mail(dtime_t time); + void store_statistics(proginfo *cur, dtime_t now); diff --git a/app-text/multitail/files/multitail-7.0.0-fix-lto-type-mismatch.patch b/app-text/multitail/files/multitail-7.0.0-fix-lto-type-mismatch.patch new file mode 100644 index 000000000000..6ad621dd540e --- /dev/null +++ b/app-text/multitail/files/multitail-7.0.0-fix-lto-type-mismatch.patch @@ -0,0 +1,29 @@ +Fix mismatching declarations so build does not fail with -Werror=lto-type-mismatch + +Bug: https://bugs.gentoo.org/855017 + +This patch is already merged upstream, see: https://github.com/folkertvanheusden/multitail/pull/10 + +Signed-off-by: Pascal Jäger <[email protected]> + +--- a/globals.c ++++ b/globals.c +@@ -81,7 +81,7 @@ double heartbeat_t = 0.0; + off64_t msf_prev_size = 0; + + dtime_t msf_last_check = 0; +-dtime_t mt_started; ++time_t mt_started; + + pid_t children_list[MAX_N_SPAWNED_PROCESSES]; + pid_t tail_proc = 0; /* process used by checker-proc */ +--- a/selbox.h ++++ b/selbox.h +@@ -1,4 +1,6 @@ +-int selection_box(void **list, char *needs_mark, int nlines, char type, int what_help, char *heading); ++#include "mt.h" ++ ++int selection_box(void **list, char *needs_mark, int nlines, selbox_type_t type, int what_help, char *heading); + int select_window(int what_help, char *heading); + proginfo * select_subwindow(int f_index, int what_help, char *heading); + char * select_file(char *input, int what_help); diff --git a/app-text/multitail/files/multitail-7.0.0-gentoo.patch b/app-text/multitail/files/multitail-7.0.0-gentoo.patch new file mode 100644 index 000000000000..5219334abbe0 --- /dev/null +++ b/app-text/multitail/files/multitail-7.0.0-gentoo.patch @@ -0,0 +1,32 @@ +Gentoo splits off tinfo from ncurses, so we need to ask pkg-config here what the user has on the system. + +Signed-off-by: Pascal Jäger <[email protected]> + +--- a/Makefile ++++ b/Makefile +@@ -24,10 +24,10 @@ ifeq ($(PLATFORM),Darwin) + LDFLAGS+=-lpanel $(NCURSES_LIB) -lutil -lm + else + ifeq ($(UTF8_SUPPORT),yes) +- LDFLAGS+=-lpanelw -lncursesw -lutil -lm ++ LIBS+=$(shell $(PKG_CONFIG) --libs ncursesw panelw) -lutil -lm + CPPFLAGS+=-DUTF8_SUPPORT + else +- LDFLAGS+=-lpanel -lncurses -lutil -lm ++ LIBS+=$(shell $(PKG_CONFIG) --libs ncurses panel) -lutil -lm + endif + endif + +@@ -40,10 +40,10 @@ DEPENDS:= $(OBJS:%.o=%.d) + all: multitail + + multitail: $(OBJS) +- $(CC) $(OBJS) $(LDFLAGS) -o multitail ++ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(OBJS) -o multitail $(LIBS) + + ccmultitail: $(OBJS) +- ccmalloc --no-wrapper -Wextra $(CC) $(OBJS) $(LDFLAGS) -o ccmultitail ++ ccmalloc --no-wrapper $(CC) $(CFLAGS) $(LDFLAGS) -Wall -W $(OBJS) -o ccmultitail $(LIBS) + + install: multitail + mkdir -p $(DESTDIR)$(PREFIX)/bin diff --git a/app-text/multitail/multitail-7.0.0.ebuild b/app-text/multitail/multitail-7.0.0.ebuild new file mode 100644 index 000000000000..63fce453c73e --- /dev/null +++ b/app-text/multitail/multitail-7.0.0.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic optfeature toolchain-funcs + +DESCRIPTION="Tail with multiple windows" +HOMEPAGE="http://www.vanheusden.com/multitail/ https://github.com/folkertvanheusden/multitail/"; +SRC_URI="https://github.com/folkertvanheusden/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="debug examples unicode" + +RDEPEND="sys-libs/ncurses:=[unicode(+)?]" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-7.0.0-gentoo.patch + "${FILESDIR}"/${PN}-7.0.0-fix-clang16-build.patch + "${FILESDIR}"/${PN}-7.0.0-fix-lto-type-mismatch.patch +) + +src_prepare() { + cmake_src_prepare + # cmake looks for licence.txt to install it, which does not exist in the package + cp LICENSE license.txt || die +} + +src_configure() { + local mycmakeargs=( + -DUTF8_SUPPORT=$(usex unicode) + ) + CMAKE_BUILD_TYPE=$(usex debug Debug) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + insinto /etc + doins multitail.conf + + rm -rf "${ED}"/usr/{ect,etc} || die + rm -rf "${ED}"/usr/share/doc/multitail-VERSION=6.4.3 || die + + DOCS=( readme.txt thanks.txt ) + HTML_DOCS=( manual.html ) + einstalldocs + + if use examples; then + docinto examples + dodoc conversion-scripts/colors-example.{pl,sh} conversion-scripts/convert-{geoip,simple}.pl + fi +} + +pkg_postinst() { + optfeature "send a buffer to the X clipboard" x11-misc/xclip +}
