diff options
| author |   Marek Szuba <marecki@gentoo.org> | 2024-04-07 15:07:07 +0100 |
|---|---|---|
| committer | Marek Szuba <marecki@gentoo.org> | 2024-04-07 15:07:07 +0100 |
| commit | cb6fca52f4cbb863b5cb15fd431298374e23633d (patch) | |
| tree | 2c9e5a34086290a946bcdd2031cfe8186637fc61 /sys-apps/gptfdisk | |
| parent | media-sound/easyeffects: add 7.1.6 (diff) | |
| download | gentoo-cb6fca52f4cbb863b5cb15fd431298374e23633d.tar.gz gentoo-cb6fca52f4cbb863b5cb15fd431298374e23633d.tar.bz2 gentoo-cb6fca52f4cbb863b5cb15fd431298374e23633d.zip | |
sys-apps/gptfdisk: fix UTF-16LE to UTF-8 conversion for partition names
Given the timing of the release of 1.0.10 I assumed it would have
already been incorporated upstream, turns out I was wrong though. Thanks
for the heads-up, ulm!
Bug: https://bugs.gentoo.org/926949
Signed-off-by: Marek Szuba <marecki@gentoo.org>
Diffstat (limited to 'sys-apps/gptfdisk')
| -rw-r--r-- | sys-apps/gptfdisk/files/gptfdisk-1.0.10_utf16-to-utf8-conversion.patch | 19 | ||||
| -rw-r--r-- | sys-apps/gptfdisk/gptfdisk-1.0.10-r1.ebuild (renamed from sys-apps/gptfdisk/gptfdisk-1.0.10.ebuild) | 1 |
2 files changed, 20 insertions, 0 deletions
diff --git a/sys-apps/gptfdisk/files/gptfdisk-1.0.10_utf16-to-utf8-conversion.patch b/sys-apps/gptfdisk/files/gptfdisk-1.0.10_utf16-to-utf8-conversion.patch new file mode 100644 index 000000000000..f30eb593799f --- /dev/null +++ b/sys-apps/gptfdisk/files/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?= <ulm@gentoo.org> +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/sys-apps/gptfdisk/gptfdisk-1.0.10.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.10-r1.ebuild index 980f14022408..e1986b2d8214 100644 --- a/sys-apps/gptfdisk/gptfdisk-1.0.10.ebuild +++ b/sys-apps/gptfdisk/gptfdisk-1.0.10-r1.ebuild @@ -32,6 +32,7 @@ DEPEND=" PATCHES=( "${FILESDIR}"/${PN}-1.0.9-build_flags.patch + "${FILESDIR}"/${PN}-1.0.10_utf16-to-utf8-conversion.patch ) src_prepare() { |