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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7F619158008 for ; Tue, 13 Jun 2023 07:52:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9D589E099C; Tue, 13 Jun 2023 07:52:11 +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 7BC7DE099C for ; Tue, 13 Jun 2023 07:52:11 +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 4B7D433DDA5 for ; Tue, 13 Jun 2023 07:52:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 811778DC for ; Tue, 13 Jun 2023 07:52:08 +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: <1686642709.8fc3c52ac565e36599d32c3e43846cceac8c6e4f.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/gptfdisk/files/, sys-apps/gptfdisk/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/gptfdisk/files/gptfdisk-1.0.9-musl-1.2.4.patch sys-apps/gptfdisk/gptfdisk-1.0.9-r2.ebuild X-VCS-Directories: sys-apps/gptfdisk/files/ sys-apps/gptfdisk/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: 8fc3c52ac565e36599d32c3e43846cceac8c6e4f X-VCS-Branch: master Date: Tue, 13 Jun 2023 07:52:08 +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: 1c250f63-e6ec-45cc-b46a-d6b47f2f9cc7 X-Archives-Hash: 6e2ed7ea7b8e27ab021d2011f9d89347 commit: 8fc3c52ac565e36599d32c3e43846cceac8c6e4f Author: Marek Szuba gentoo org> AuthorDate: Tue Jun 13 07:46:19 2023 +0000 Commit: Marek Szuba gentoo org> CommitDate: Tue Jun 13 07:51:49 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fc3c52a sys-apps/gptfdisk: allow building against musl-1.2.4 Upstream fix backported to 1.0.9 by Violet Purcell inventati.org>. Closes: https://bugs.gentoo.org/906151 Signed-off-by: Marek Szuba gentoo.org> .../gptfdisk/files/gptfdisk-1.0.9-musl-1.2.4.patch | 30 ++++++++++++++++++++++ sys-apps/gptfdisk/gptfdisk-1.0.9-r2.ebuild | 3 ++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/sys-apps/gptfdisk/files/gptfdisk-1.0.9-musl-1.2.4.patch b/sys-apps/gptfdisk/files/gptfdisk-1.0.9-musl-1.2.4.patch new file mode 100644 index 000000000000..6f019d9eec6f --- /dev/null +++ b/sys-apps/gptfdisk/files/gptfdisk-1.0.9-musl-1.2.4.patch @@ -0,0 +1,30 @@ +Upstream: https://sourceforge.net/p/gptfdisk/code/ci/7dfa8984f5a30f313d8675ff6097c8592d636d10/ + +From 7dfa8984f5a30f313d8675ff6097c8592d636d10 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 12 Dec 2022 12:50:07 -0800 +Subject: [PATCH] Use 64bit time_t on linux as well + +Alias 64bit version of stat functions to original functions +we are already passing -D_FILE_OFFSET_BITS=64 in linux Makefile + +Signed-off-by: Khem Raj +--- a/diskio-unix.cc ++++ b/diskio-unix.cc +@@ -37,8 +37,12 @@ + + using namespace std; + +-#ifdef __APPLE__ ++#if defined(__APPLE__) || defined(__linux__) + #define off64_t off_t ++#define stat64 stat ++#define fstat64 fstat ++#define lstat64 lstat ++#define lseek64 lseek + #endif + + // Returns the official "real" name for a shortened version of same. +-- +2.41.0 + diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.9-r2.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.9-r2.ebuild index e7ed4b517d0d..94027ea21f26 100644 --- a/sys-apps/gptfdisk/gptfdisk-1.0.9-r2.ebuild +++ b/sys-apps/gptfdisk/gptfdisk-1.0.9-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -33,6 +33,7 @@ DEPEND=" PATCHES=( "${FILESDIR}/${PN}-1.0.9-libuuid.patch" #844073 "${FILESDIR}/${PN}-1.0.9-popt_segv.patch" #872131 + "${FILESDIR}"/${PN}-1.0.9-musl-1.2.4.patch ) src_prepare() {