diff --git a/hardware/disk/gptfdisk/actions.py b/hardware/disk/gptfdisk/actions.py index c257a42191..95f6934a18 100644 --- a/hardware/disk/gptfdisk/actions.py +++ b/hardware/disk/gptfdisk/actions.py @@ -13,14 +13,17 @@ def build(): autotools.make() def install(): - pisitools.dobin("cgdisk") - pisitools.dobin("fixparts") - pisitools.dobin("gdisk") - pisitools.dobin("sgdisk") + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + # pisitools.dobin("cgdisk") + # pisitools.dobin("fixparts") + # pisitools.dobin("gdisk") + # pisitools.dobin("sgdisk") - pisitools.doman("cgdisk.8") - pisitools.doman("fixparts.8") - pisitools.doman("gdisk.8") - pisitools.doman("sgdisk.8") + # pisitools.doman("cgdisk.8") + # pisitools.doman("fixparts.8") + # pisitools.doman("gdisk.8") + # pisitools.doman("sgdisk.8") + for bin in shelltools.ls("%s/usr/bin" % get.installDIR()): + pisitools.dosym("/usr/bin/%s" % bin, "/usr/sbin/%s" % bin) pisitools.dodoc("COPYING", "NEWS", "README") diff --git a/hardware/disk/gptfdisk/files/gentoo/gptfdisk-1.0.10_utf16-to-utf8-conversion.patch b/hardware/disk/gptfdisk/files/gentoo/gptfdisk-1.0.10_utf16-to-utf8-conversion.patch new file mode 100644 index 0000000000..f30eb59379 --- /dev/null +++ b/hardware/disk/gptfdisk/files/gentoo/gptfdisk-1.0.10_utf16-to-utf8-conversion.patch @@ -0,0 +1,19 @@ +From ade1729d1ca44b34678653fdf12e787e1afc5fd8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ulrich=20M=C3=BCller?= +Date: Wed, 13 Mar 2024 20:38:37 +0100 +Subject: [PATCH] gptpart.cc: Fix Unicode to UTF-8 conversion in GetDescription + +--- a/gptpart.cc ++++ b/gptpart.cc +@@ -131,7 +131,7 @@ string GPTPart::GetDescription(void) { + } // if + else { + utf8 += (char) ( 0xf0 | ( uni >> 18 ) ) ; +- utf8 += (char) ( 0xe0 | ( ( uni >> 12 ) & 0x3f ) ) ; ++ utf8 += (char) ( 0x80 | ( ( uni >> 12 ) & 0x3f ) ) ; + utf8 += (char) ( 0x80 | ( ( uni >> 6 ) & 0x3f ) ) ; + utf8 += (char) ( 0x80 | ( uni & 0x3f ) ) ; + } // if +-- +2.44.0 + diff --git a/hardware/disk/gptfdisk/files/gentoo/gptfdisk-1.0.9-build_flags.patch b/hardware/disk/gptfdisk/files/gentoo/gptfdisk-1.0.9-build_flags.patch new file mode 100644 index 0000000000..2f92d77f38 --- /dev/null +++ b/hardware/disk/gptfdisk/files/gentoo/gptfdisk-1.0.9-build_flags.patch @@ -0,0 +1,11 @@ +--- a/Makefile ++++ b/Makefile +@@ -66,7 +66,7 @@ + # Default/Linux settings.... + STRIP?=strip + #CXXFLAGS+=-O2 -Wall -D_FILE_OFFSET_BITS=64 -D USE_UTF16 +-CXXFLAGS+=-O2 -Wall -D_FILE_OFFSET_BITS=64 ++CXXFLAGS+=-D_FILE_OFFSET_BITS=64 + LDFLAGS+= + LDLIBS+=-luuid #-licuio -licuuc + FATBINFLAGS= diff --git a/hardware/disk/gptfdisk/files/lfs/gptfdisk-1.0.10-convenience-1.patch.patch b/hardware/disk/gptfdisk/files/lfs/gptfdisk-1.0.10-convenience-1.patch.patch new file mode 100644 index 0000000000..e97e4de4bc --- /dev/null +++ b/hardware/disk/gptfdisk/files/lfs/gptfdisk-1.0.10-convenience-1.patch.patch @@ -0,0 +1,27 @@ +Submitted By: Bruce Dubbs +Date: 2015-10-19 +Initial Package Version: 1.0.1 +Upstream Status: None. BLFS specific. +Origin: BLFS +Description: Updates Makefile enabling parameter passing. + Rediffed for version 1.0.1 +Updates: Rediffed for version 1.0.3 (P. Labastie) + Patch version 2 for version 1.0.3: Removed ICU + and POPT switches, keeping only the + install target (P. Labastie) + +diff -Naur gptfdisk-1.0.3.old/Makefile gptfdisk-1.0.3.new/Makefile +--- gptfdisk-1.0.3.old/Makefile 2017-07-28 03:41:20.000000000 +0200 ++++ gptfdisk-1.0.3.new/Makefile 2018-04-20 10:04:18.896802047 +0200 +@@ -37,6 +37,11 @@ + clean: #no pre-reqs + rm -f core *.o *~ gdisk sgdisk cgdisk fixparts + ++install: gdisk cgdisk sgdisk fixparts ++ install -dm 755 $(DESTDIR)/usr/bin $(DESTDIR)/usr/share/man/man8 ++ install -m755 gdisk cgdisk sgdisk fixparts $(DESTDIR)/usr/bin ++ install -m644 *.8 $(DESTDIR)/usr/share/man/man8 ++ + # what are the source dependencies + depend: $(SRCS) + $(DEPEND) $(SRCS) diff --git a/hardware/disk/gptfdisk/pspec.xml b/hardware/disk/gptfdisk/pspec.xml index ae980c7611..ee4396c653 100644 --- a/hardware/disk/gptfdisk/pspec.xml +++ b/hardware/disk/gptfdisk/pspec.xml @@ -20,7 +20,9 @@ - + gentoo/gptfdisk-1.0.9-build_flags.patch + gentoo/gptfdisk-1.0.10_utf16-to-utf8-conversion.patch + lfs/gptfdisk-1.0.10-convenience-1.patch.patch @@ -36,10 +38,18 @@ /usr/share/man /usr/share/doc /usr/bin + /usr/sbin + + 2024-07-16 + 1.0.10 + Rebuild. + Mustafa Cinasal + muscnsl@gmail.com + 2024-02-21 1.0.10