summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2020-01-03 16:13:06 +0100
committerJeroen Roovers <jer@gentoo.org>2020-01-03 16:14:45 +0100
commit4bab6569878f89180d50a40524a675712b0cec2a (patch)
treecd5f446bcddc5573f6a000965c03ee793559ec50 /sys-block/parted
parentdev-libs/libuv: Old (diff)
downloadgentoo-4bab6569878f89180d50a40524a675712b0cec2a.tar.gz
gentoo-4bab6569878f89180d50a40524a675712b0cec2a.tar.bz2
gentoo-4bab6569878f89180d50a40524a675712b0cec2a.zip
sys-block/parted: Reintroduce PED_ASSERT with correct assertion
Package-Manager: Portage-2.3.84, Repoman-2.3.20 Bug: https://bugs.gentoo.org/704704 Fixes: 1af57544e419afdbc54cb6dc76e053593e4bb088 Signed-off-by: Jeroen Roovers <jer@gentoo.org>
Diffstat (limited to 'sys-block/parted')
-rw-r--r--sys-block/parted/files/parted-3.3-atari.patch2
-rw-r--r--sys-block/parted/parted-3.3-r2.ebuild (renamed from sys-block/parted/parted-3.3-r1.ebuild)0
2 files changed, 1 insertions, 1 deletions
diff --git a/sys-block/parted/files/parted-3.3-atari.patch b/sys-block/parted/files/parted-3.3-atari.patch
index 41771d02d4e..af9c488d48d 100644
--- a/sys-block/parted/files/parted-3.3-atari.patch
+++ b/sys-block/parted/files/parted-3.3-atari.patch
@@ -5,7 +5,7 @@
PED_ASSERT (sizeof (AtariRawTable) == 512);
/* GNU Libc doesn't support NULL instead of the locale name */
- PED_ASSERT ((atr_c_locale = newlocale(LC_ALL_MASK, "C", NULL)) != NULL);
-+ atr_c_locale = newlocale(LC_ALL_MASK, "C", NULL);
++ PED_ASSERT ((atr_c_locale = newlocale(LC_ALL_MASK, "C", (locale_t) 0)) != (locale_t) 0);
ped_disk_type_register (&atari_disk_type);
}
diff --git a/sys-block/parted/parted-3.3-r1.ebuild b/sys-block/parted/parted-3.3-r2.ebuild
index 4f2c019b732..4f2c019b732 100644
--- a/sys-block/parted/parted-3.3-r1.ebuild
+++ b/sys-block/parted/parted-3.3-r2.ebuild