From: "Marek Szuba" <marecki@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/gptfdisk/, sys-apps/gptfdisk/files/
Date: Sun, 7 Apr 2024 14:08:51 +0000 (UTC) [thread overview]
Message-ID: <1712498827.cb6fca52f4cbb863b5cb15fd431298374e23633d.marecki@gentoo> (raw)
commit: cb6fca52f4cbb863b5cb15fd431298374e23633d
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 7 14:07:07 2024 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sun Apr 7 14:07:07 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb6fca52
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 <AT> gentoo.org>
.../gptfdisk-1.0.10_utf16-to-utf8-conversion.patch | 19 +++++++++++++++++++
...tfdisk-1.0.10.ebuild => gptfdisk-1.0.10-r1.ebuild} | 1 +
2 files changed, 20 insertions(+)
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
similarity index 95%
rename from sys-apps/gptfdisk/gptfdisk-1.0.10.ebuild
rename to 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() {
next reply other threads:[~2024-04-07 14:08 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-07 14:08 Marek Szuba [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-02-24 11:21 [gentoo-commits] repo/gentoo:master commit in: sys-apps/gptfdisk/, sys-apps/gptfdisk/files/ Petr Vaněk
2023-08-19 16:24 Marek Szuba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1712498827.cb6fca52f4cbb863b5cb15fd431298374e23633d.marecki@gentoo \
--to=marecki@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox