From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5FABE158041 for ; Wed, 3 Apr 2024 17:41:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8E6E6E2AD1; Wed, 3 Apr 2024 17:41:40 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6D7E8E2AD0 for ; Wed, 3 Apr 2024 17:41:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AAAD134317B for ; Wed, 3 Apr 2024 17:41:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 16CB914C3 for ; Wed, 3 Apr 2024 17:41:38 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1712166081.9f74a7f6ec5679c8361e93ee8c4eeeedc92dc140.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/the_silver_searcher/files/, sys-apps/the_silver_searcher/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/the_silver_searcher/files/the_silver_searcher-2.2.0-no_lfs64.patch sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild X-VCS-Directories: sys-apps/the_silver_searcher/ sys-apps/the_silver_searcher/files/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: 9f74a7f6ec5679c8361e93ee8c4eeeedc92dc140 X-VCS-Branch: master Date: Wed, 3 Apr 2024 17:41:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1e31481e-f096-4ecf-8541-351bf6a44ab8 X-Archives-Hash: b933fae2947e477a1332f949adb831ca commit: 9f74a7f6ec5679c8361e93ee8c4eeeedc92dc140 Author: Marek Szuba gentoo org> AuthorDate: Wed Apr 3 17:39:38 2024 +0000 Commit: Marek Szuba gentoo org> CommitDate: Wed Apr 3 17:41:21 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f74a7f6 sys-apps/the_silver_searcher: phase out LFS64 interfaces Closes: https://bugs.gentoo.org/908582 Signed-off-by: Marek Szuba gentoo.org> .../files/the_silver_searcher-2.2.0-no_lfs64.patch | 41 ++++++++++++++++++++++ .../the_silver_searcher-2.2.0_p20201217-r1.ebuild | 3 +- 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/sys-apps/the_silver_searcher/files/the_silver_searcher-2.2.0-no_lfs64.patch b/sys-apps/the_silver_searcher/files/the_silver_searcher-2.2.0-no_lfs64.patch new file mode 100644 index 000000000000..62925a7fb1f0 --- /dev/null +++ b/sys-apps/the_silver_searcher/files/the_silver_searcher-2.2.0-no_lfs64.patch @@ -0,0 +1,41 @@ +LFS64 interfaces are now generally considered deprecated, and are no longer +available in MUSL since version 1.2.4. + +--- a/src/zfile.c ++++ b/src/zfile.c +@@ -4,7 +4,7 @@ + #include + + #ifdef __CYGWIN__ +-typedef _off64_t off64_t; ++typedef _off64_t off_t; + #endif + + #include +@@ -331,14 +331,14 @@ + } + + static int +-zfile_seek(void *cookie_, off64_t *offset_, int whence) { ++zfile_seek(void *cookie_, off_t *offset_, int whence) { + struct zfile *cookie = cookie_; +- off64_t new_offset = 0, offset = *offset_; ++ off_t new_offset = 0, offset = *offset_; + + if (whence == SEEK_SET) { + new_offset = offset; + } else if (whence == SEEK_CUR) { +- new_offset = (off64_t)cookie->logic_offset + offset; ++ new_offset = (off_t)cookie->logic_offset + offset; + } else { + /* SEEK_END not ok */ + return -1; +@@ -348,7 +348,7 @@ + return -1; + + /* Backward seeks to anywhere but 0 are not ok */ +- if (new_offset < (off64_t)cookie->logic_offset && new_offset != 0) { ++ if (new_offset < (off_t)cookie->logic_offset && new_offset != 0) { + return -1; + } + diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild index 68675d7bc043..1b9f8c8a60bb 100644 --- a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild +++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -30,6 +30,7 @@ DOCS="README.md" PATCHES=( "${FILESDIR}"/${PN}-2.1.0-lzma.patch + "${FILESDIR}"/${PN}-2.2.0-no_lfs64.patch ) src_prepare() {