Date: Saturday, April 16, 2022 @ 05:35:44 Author: foutrelis Revision: 442715
upgpkg: gptfdisk 1.0.9-1: new upstream release Added: gptfdisk/trunk/util-linux-2.38.patch Modified: gptfdisk/trunk/PKGBUILD -----------------------+ PKGBUILD | 9 ++++++--- util-linux-2.38.patch | 25 +++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-04-16 03:59:33 UTC (rev 442714) +++ PKGBUILD 2022-04-16 05:35:44 UTC (rev 442715) @@ -3,7 +3,7 @@ # Contributor: Hokum <hokum_at_mail_dot_ru> pkgname=gptfdisk -pkgver=1.0.8 +pkgver=1.0.9 pkgrel=1 pkgdesc="A text-mode partitioning tool that works on GUID Partition Table (GPT) disks" arch=('x86_64') @@ -13,11 +13,14 @@ provides=("gdisk=$pkgver") conflicts=('gdisk') replaces=('gdisk') -source=(https://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) -sha256sums=('95d19856f004dabc4b8c342b2612e8d0a9eebdd52004297188369f152e9dc6df') +source=(https://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz + util-linux-2.38.patch) +sha256sums=('dafead2693faeb8e8b97832b23407f6ed5b3219bc1784f482dd855774e2d50c2' + 'c014a1054c597fb9afb06e7cd4c91a038d887e66dd36aba26a68494ea0f41a43') prepare() { cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i ../util-linux-2.38.patch # https://sourceforge.net/p/gptfdisk/discussion/939590/thread/bc29ca06f8/ sed -i '/^#include /s:ncursesw/::' gptcurses.cc Added: util-linux-2.38.patch =================================================================== --- util-linux-2.38.patch (rev 0) +++ util-linux-2.38.patch 2022-04-16 05:35:44 UTC (rev 442715) @@ -0,0 +1,25 @@ +From 127e40dcc2d62ad693cb4e03e1182d0a227d85e1 Mon Sep 17 00:00:00 2001 +From: Evangelos Foutras <evange...@foutrelis.com> +Date: Sat, 16 Apr 2022 08:24:58 +0300 +Subject: [PATCH] Fix uuid/uuid.h detection with util-linux 2.38 + +util-linux commit 10f5f79485964ab52272ebe79c3b0047b1f84d82 changed the +header guard in uuid/uuid.h from _UUID_UUID_H to _UL_LIBUUID_UUID_H as +the former was too generic; fix guid.cc to also look for the new name. +--- + guid.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +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);