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 63C7415800A for ; Fri, 14 Jul 2023 09:32:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8F3DFE08BE; Fri, 14 Jul 2023 09:32:57 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 71D49E08BE for ; Fri, 14 Jul 2023 09:32:57 +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 3848E33E695 for ; Fri, 14 Jul 2023 09:32:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2B468ACF for ; Fri, 14 Jul 2023 09:32:54 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1689327003.6cfc3c38d2c83824786e2a63797f9cea9b330023.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/files/, x11-terms/kitty/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-terms/kitty/files/kitty-0.29.0-musl-1.2.4.patch x11-terms/kitty/kitty-0.27.1.ebuild x11-terms/kitty/kitty-0.28.1.ebuild x11-terms/kitty/kitty-0.29.0.ebuild X-VCS-Directories: x11-terms/kitty/ x11-terms/kitty/files/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 6cfc3c38d2c83824786e2a63797f9cea9b330023 X-VCS-Branch: master Date: Fri, 14 Jul 2023 09:32:54 +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: cfebb0a7-c7a7-4ffe-a6c8-98386b068d8d X-Archives-Hash: 4e9ca2d396cce460476b9a23070f7696 commit: 6cfc3c38d2c83824786e2a63797f9cea9b330023 Author: Violet Purcell inventati org> AuthorDate: Fri Jul 14 02:16:36 2023 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Fri Jul 14 09:30:03 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cfc3c38 x11-terms/kitty: Backport fix for musl 1.2.4 Signed-off-by: Violet Purcell inventati.org> Closes: https://github.com/gentoo/gentoo/pull/31872 Signed-off-by: Ionen Wolkens gentoo.org> x11-terms/kitty/files/kitty-0.29.0-musl-1.2.4.patch | 20 ++++++++++++++++++++ x11-terms/kitty/kitty-0.27.1.ebuild | 4 ++++ x11-terms/kitty/kitty-0.28.1.ebuild | 4 ++++ x11-terms/kitty/kitty-0.29.0.ebuild | 4 ++++ 4 files changed, 32 insertions(+) diff --git a/x11-terms/kitty/files/kitty-0.29.0-musl-1.2.4.patch b/x11-terms/kitty/files/kitty-0.29.0-musl-1.2.4.patch new file mode 100644 index 000000000000..f02f425d0d66 --- /dev/null +++ b/x11-terms/kitty/files/kitty-0.29.0-musl-1.2.4.patch @@ -0,0 +1,20 @@ +From https://github.com/kovidgoyal/kitty/commit/90223b5d146828c65179da49c75ce31b304fa1b8 Mon Sep 17 00:00:00 2001 +From: Kovid Goyal +Date: Tue, 11 Jul 2023 09:22:40 +0530 +Subject: [PATCH] Fix compilation against musl + +As usual in C stdlib world. Ill thought out break the world changes. +Sigh. musl no longer defines off64_t. + +Fixes #6441 +--- a/kitty/fast-file-copy.c ++++ b/kitty/fast-file-copy.c +@@ -83,7 +83,7 @@ copy_with_file_range(int infd, int outfd, off_t in_pos, size_t len, FastFileCopy + #ifdef HAS_COPY_FILE_RANGE + unsigned num_of_consecutive_zero_returns = 128; + while (len) { +- off64_t r = in_pos; ++ int64_t r = in_pos; + ssize_t n = copy_file_range(infd, &r, outfd, NULL, len, 0); + if (n < 0) { + if (errno == EAGAIN) continue; diff --git a/x11-terms/kitty/kitty-0.27.1.ebuild b/x11-terms/kitty/kitty-0.27.1.ebuild index 1fa60113f89c..f0f229436c3f 100644 --- a/x11-terms/kitty/kitty-0.27.1.ebuild +++ b/x11-terms/kitty/kitty-0.27.1.ebuild @@ -70,6 +70,10 @@ BDEPEND=" wayland? ( dev-util/wayland-scanner )" [[ ${PV} == 9999 ]] || BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )" +PATCHES=( + "${FILESDIR}/${PN}-0.29.0-musl-1.2.4.patch" +) + QA_FLAGS_IGNORED="usr/bin/kitten" # written in Go src_unpack() { diff --git a/x11-terms/kitty/kitty-0.28.1.ebuild b/x11-terms/kitty/kitty-0.28.1.ebuild index e034994923d5..00cbcf7ed7e4 100644 --- a/x11-terms/kitty/kitty-0.28.1.ebuild +++ b/x11-terms/kitty/kitty-0.28.1.ebuild @@ -70,6 +70,10 @@ BDEPEND=" wayland? ( dev-util/wayland-scanner )" [[ ${PV} == 9999 ]] || BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )" +PATCHES=( + "${FILESDIR}/${PN}-0.29.0-musl-1.2.4.patch" +) + QA_FLAGS_IGNORED="usr/bin/kitten" # written in Go src_unpack() { diff --git a/x11-terms/kitty/kitty-0.29.0.ebuild b/x11-terms/kitty/kitty-0.29.0.ebuild index ca29cc5189de..73a34d22e2c4 100644 --- a/x11-terms/kitty/kitty-0.29.0.ebuild +++ b/x11-terms/kitty/kitty-0.29.0.ebuild @@ -70,6 +70,10 @@ BDEPEND=" wayland? ( dev-util/wayland-scanner )" [[ ${PV} == 9999 ]] || BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )" +PATCHES=( + "${FILESDIR}/${PN}-0.29.0-musl-1.2.4.patch" +) + QA_FLAGS_IGNORED="usr/bin/kitten" # written in Go src_unpack() {