commit: a07aaeb69e11d9881bde14bbb34d7c588486206b Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Sun Nov 3 16:44:46 2024 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Sun Nov 3 16:44:46 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a07aaeb6
app-misc/tmux: drop 3.3a-r1 Bug: https://bugs.gentoo.org/900368 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> app-misc/tmux/Manifest | 1 - app-misc/tmux/files/tmux-3.3a-clang.patch | 59 ---------------------- app-misc/tmux/tmux-3.3a-r1.ebuild | 84 ------------------------------- 3 files changed, 144 deletions(-) diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest index f4c797e34a89..39ab58c13e52 100644 --- a/app-misc/tmux/Manifest +++ b/app-misc/tmux/Manifest @@ -1,4 +1,3 @@ -DIST tmux-3.3a.tar.gz 677448 BLAKE2B e835ce0f136175521035a684419f221864edb0a9506d7d68cbc0239b1349e78949ebd96573a9d8651a2df6d99acb433075d6e0c20d7394a53fe6b44bd9e56069 SHA512 29a846df7d93601c42a22f84f606931dc65da1f70b67d351d0425f77ea3affe3e8218b2940d42cd3dadf3cd1aa95032daad3ecb14fbff0f69939d1beae0498c7 DIST tmux-3.4.tar.gz 707213 BLAKE2B 2b1990b95d7439702e9287402d9828d4ecab573202c099aa482969c047b540d4b899f79d87587fc712e727d9cebf5fa7393512087e469fc355b4a30b1894e229 SHA512 bd3880211d99d8ee15947000abf8a1832fdfa48b29b2df81b66d5969cf3f4e64e746f984f6139bfc57e3ebee7fe8dc7cbb6bccb779307607de6c376969fecbff DIST tmux-3.5.tar.gz 715322 BLAKE2B 6c257e7c3b2f49ae2a54dd28c8d89d4832ad1eb3a49e800ff83a03fd4e620bdee695845b1c272cff25f0805502c1309e9d14faae6ca3fb4d4f050d9abf4aeae9 SHA512 bb3ca1ae8b330c3efc8fcbe8a65a40f78beadaf08c79265f6377c4187d26028e485e5404b832bbea16b170fd9bbdf2f1554d67dd3b1289e183fca19df460b695 DIST tmux-3.5a.tar.gz 715619 BLAKE2B 2314bc127f805071c9f2fe28be549b0948042a153aa68d997efc1dc0d6eba198b04aa16932d0a84b03250567100fb81c464919fcc8ba98660d3d0750ff5fe879 SHA512 2383e99aec2dcdb1d899793d5ecab40a68b921194f84770d3f4d19712bfc85590657a99d2a9a7bec36d4ba5ab39fa713f13937b0acad3b61cd9b2302dba61d43 diff --git a/app-misc/tmux/files/tmux-3.3a-clang.patch b/app-misc/tmux/files/tmux-3.3a-clang.patch deleted file mode 100644 index e292e698f310..000000000000 --- a/app-misc/tmux/files/tmux-3.3a-clang.patch +++ /dev/null @@ -1,59 +0,0 @@ -https://github.com/tmux/tmux/pull/3332 - -From 1b4c87de0249242309f10684761698aa880b80a5 Mon Sep 17 00:00:00 2001 -From: Marvin Schmidt <[email protected]> -Date: Tue, 13 Sep 2022 03:25:00 +0200 -Subject: [PATCH 1/2] compat/systemd: Include <string.h> for strerror - -Recent compilers are getting stricter about function declarations being -known during compilation and e.g. clang-15 now errors out if a function -signature is not found: - -> compat/systemd.c:56:49: error: call to undeclared library function 'strerror' with type 'char *(int)'; ISO C99 and -> later do not support implicit function declarations [-Wimplicit-function-declaration] -> xasprintf(cause, "systemd socket error (%s)", strerror(errno)); -> ^ -> compat/systemd.c:56:49: note: include the header <string.h> or explicitly provide a declaration for 'strerror' -> 1 warning and 1 error generated. - -Provide the declaration of `strerror` by including `<string.h>` to fix -this ---- a/compat/systemd.c -+++ b/compat/systemd.c -@@ -16,6 +16,7 @@ - * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -+#include <string.h> - #include <sys/types.h> - #include <sys/un.h> - - -From 1e7ef02c52f2f8a67ab05d8a1c3fec9f4ccb7ea0 Mon Sep 17 00:00:00 2001 -From: Marvin Schmidt <[email protected]> -Date: Tue, 13 Sep 2022 03:34:01 +0200 -Subject: [PATCH 2/2] compat/systemd: Use socklen_t instead of int to fix - warning - -clang-15 warns about the pointer passed to `getsockname()` being of -different signedness then the parameter declaration: - -> compat/systemd.c:46:47: warning: passing 'int *' to parameter of type 'socklen_t *' (aka 'unsigned int *') -> converts between pointers to integer types with different sign [-Wpointer-sign] -> if (getsockname(fd, (struct sockaddr *)&sa, &addrlen) == -1) -> ^~~~~~~~ -> /usr/x86_64-pc-linux-musl/include/sys/socket.h:391:73: note: passing argument to parameter here -> int getsockname (int, struct sockaddr *__restrict, socklen_t *__restrict); -> ^ ---- a/compat/systemd.c -+++ b/compat/systemd.c -@@ -30,7 +30,7 @@ systemd_create_socket(int flags, char **cause) - int fds; - int fd; - struct sockaddr_un sa; -- int addrlen = sizeof sa; -+ socklen_t addrlen = sizeof sa; - - fds = sd_listen_fds(0); - if (fds > 1) { /* too many file descriptors */ - diff --git a/app-misc/tmux/tmux-3.3a-r1.ebuild b/app-misc/tmux/tmux-3.3a-r1.ebuild deleted file mode 100644 index 3c45540fcfa4..000000000000 --- a/app-misc/tmux/tmux-3.3a-r1.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic - -DESCRIPTION="Terminal multiplexer" -HOMEPAGE="https://tmux.github.io/"; -if [[ ${PV} == 9999 ]] ; then - inherit git-r3 - SRC_URI="https://raw.githubusercontent.com/przepompownia/tmux-bash-completion/678a27616b70c649c6701cae9cd8c92b58cc051b/completions/tmux -> tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b" - EGIT_REPO_URI="https://github.com/tmux/tmux.git"; -else - SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz"; - if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" - fi - S="${WORKDIR}/${P/_/-}" -fi - -LICENSE="ISC" -SLOT="0" -IUSE="debug selinux systemd utempter vim-syntax" - -DEPEND=" - dev-libs/libevent:= - sys-libs/ncurses:= - systemd? ( sys-apps/systemd:= ) - utempter? ( sys-libs/libutempter ) - kernel_Darwin? ( dev-libs/libutf8proc:= ) -" - -BDEPEND=" - virtual/pkgconfig - app-alternatives/yacc -" - -RDEPEND=" - ${DEPEND} - selinux? ( sec-policy/selinux-screen ) - vim-syntax? ( app-vim/vim-tmux ) -" - -DOCS=( CHANGES README ) - -PATCHES=( - "${FILESDIR}"/${PN}-2.4-flags.patch - "${FILESDIR}"/${P}-clang.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # bug 438558 - # 1.7 segfaults when entering copy mode if compiled with -Os - replace-flags -Os -O2 - - local myeconfargs=( - --sysconfdir="${EPREFIX}"/etc - $(use_enable debug) - $(use_enable systemd) - $(use_enable utempter) - - # For now, we only expose this for macOS, because - # upstream strongly encourage it. I'm not sure it's - # needed on Linux right now. - $(use_enable kernel_Darwin utf8proc) - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - - einstalldocs - - dodoc example_tmux.conf - docompress -x /usr/share/doc/${PF}/example_tmux.conf -}
