summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2022-05-14 15:15:51 +0200
committerLars Wendler <polynomial-c@gentoo.org>2022-05-14 15:17:07 +0200
commit4d4e356d33eccb979a1df3fb79009348ecf4a3ea (patch)
tree3a8da4a1e22dec531537ff8cccfd367d737dc1b0
parentsys-apps/gptfdisk: Removed old (diff)
downloadgentoo-4d4e356d33eccb979a1df3fb79009348ecf4a3ea.tar.gz
gentoo-4d4e356d33eccb979a1df3fb79009348ecf4a3ea.tar.bz2
gentoo-4d4e356d33eccb979a1df3fb79009348ecf4a3ea.zip
sys-apps/gptfdisk: Revbump to fix build against recent libuuid
Reported-by: Andreas <alamahant@gmail.com> Thanks-to: Mike Gilbert <floppym@gentoo.org> Closes: https://bugs.gentoo.org/844073 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
-rw-r--r--sys-apps/gptfdisk/files/gptfdisk-1.0.9-libuuid.patch37
-rw-r--r--sys-apps/gptfdisk/gptfdisk-1.0.9-r1.ebuild (renamed from sys-apps/gptfdisk/gptfdisk-1.0.9.ebuild)4
2 files changed, 41 insertions, 0 deletions
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 00000000000..e7a5f68e19e
--- /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 <rodsmith@rodsbooks.com>
+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
index 62367d7e3bb..1972d8a5a78 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