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 AF97F158090 for ; Sat, 14 May 2022 13:17:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DB6B7E092F; Sat, 14 May 2022 13:17:15 +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 BAB36E092F for ; Sat, 14 May 2022 13:17:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 76C6E341779 for ; Sat, 14 May 2022 13:17:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F3C68463 for ; Sat, 14 May 2022 13:17:12 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1652534227.4d4e356d33eccb979a1df3fb79009348ecf4a3ea.polynomial-c@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-libuuid.patch sys-apps/gptfdisk/gptfdisk-1.0.9-r1.ebuild sys-apps/gptfdisk/gptfdisk-1.0.9.ebuild X-VCS-Directories: sys-apps/gptfdisk/ sys-apps/gptfdisk/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 4d4e356d33eccb979a1df3fb79009348ecf4a3ea X-VCS-Branch: master Date: Sat, 14 May 2022 13:17:12 +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: b8dc2025-5d1f-41b7-9ba9-3e4a36b35fc7 X-Archives-Hash: 8f077bc0911bf4272a89510e2694bd2f commit: 4d4e356d33eccb979a1df3fb79009348ecf4a3ea Author: Lars Wendler gentoo org> AuthorDate: Sat May 14 13:15:51 2022 +0000 Commit: Lars Wendler gentoo org> CommitDate: Sat May 14 13:17:07 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d4e356d sys-apps/gptfdisk: Revbump to fix build against recent libuuid Reported-by: Andreas gmail.com> Thanks-to: Mike Gilbert gentoo.org> Closes: https://bugs.gentoo.org/844073 Signed-off-by: Lars Wendler gentoo.org> .../gptfdisk/files/gptfdisk-1.0.9-libuuid.patch | 37 ++++++++++++++++++++++ ...fdisk-1.0.9.ebuild => gptfdisk-1.0.9-r1.ebuild} | 4 +++ 2 files changed, 41 insertions(+) diff --git a/sys-apps/gptfdisk/files/gptfdisk-1.0.9-libuuid.patch b/sys-apps/gptfdisk/files/gptfdisk-1.0.9-libuuid.patch new file mode 100644 index 000000000000..e7a5f68e19ee --- /dev/null +++ b/sys-apps/gptfdisk/files/gptfdisk-1.0.9-libuuid.patch @@ -0,0 +1,37 @@ +From e67faca2c0ca955f56cbd22e90941cdcbdc12597 Mon Sep 17 00:00:00 2001 +From: Rod Smith +Date: Sat, 16 Apr 2022 09:32:04 -0400 +Subject: [PATCH] Updated guid.cc to deal with minor change in libuuid + +--- + NEWS | 3 +++ + guid.cc | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/NEWS b/NEWS +index c7add56..3d90d9a 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,3 +1,6 @@ ++ ++- Updated guid.cc to deal with minor change in libuuid. ++ + 1.0.9 (4/14/2022): + ------------------ + +diff --git a/guid.cc b/guid.cc +index 1e73ab7..d3e4fd5 100644 +--- a/guid.cc ++++ b/guid.cc +@@ -141,7 +141,7 @@ void GUIDData::Zero(void) { + void GUIDData::Randomize(void) { + int i, uuidGenerated = 0; + +-#ifdef _UUID_UUID_H ++#if defined (_UUID_UUID_H) || defined (_UL_LIBUUID_UUID_H) + uuid_generate(uuidData); + ReverseBytes(&uuidData[0], 4); + ReverseBytes(&uuidData[4], 2); +-- +2.36.1 + diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.9.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.9-r1.ebuild similarity index 95% rename from sys-apps/gptfdisk/gptfdisk-1.0.9.ebuild rename to sys-apps/gptfdisk/gptfdisk-1.0.9-r1.ebuild index 62367d7e3bbc..1972d8a5a783 100644 --- a/sys-apps/gptfdisk/gptfdisk-1.0.9.ebuild +++ b/sys-apps/gptfdisk/gptfdisk-1.0.9-r1.ebuild @@ -30,6 +30,10 @@ DEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}/${P}-libuuid.patch" #844073 +) + src_prepare() { default