deleted file mode 100644
@@ -1,99 +0,0 @@
-From e301f7dd650c9e56f954a7c49661d938079e1a9b Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex@linutronix.de>
-Date: Mon, 25 Oct 2021 17:27:51 +0200
-Subject: [PATCH] gptcurses: correct ncurses 6.3 errors
-
-Upstream-Status: Submitted [by email to rodsmith@rodsbooks.com]
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
----
- gptcurses.cc | 28 ++++++++++++++--------------
- 1 file changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/gptcurses.cc b/gptcurses.cc
-index d0de024..70be999 100644
---- a/gptcurses.cc
-+++ b/gptcurses.cc
-@@ -235,22 +235,22 @@ Space* GPTDataCurses::ShowSpace(int spaceNum, int lineNum) {
- ClearLine(lineNum);
- if (space->partNum == -1) { // space is empty
- move(lineNum, 12);
-- printw(BytesToIeee((space->lastLBA - space->firstLBA + 1), blockSize).c_str());
-+ printw("%s",BytesToIeee((space->lastLBA - space->firstLBA + 1), blockSize).c_str());
- move(lineNum, 24);
-- printw("free space");
-+ printw("%s","free space");
- } else { // space holds a partition
- move(lineNum, 3);
- printw("%d", space->partNum + 1);
- move(lineNum, 12);
-- printw(BytesToIeee((space->lastLBA - space->firstLBA + 1), blockSize).c_str());
-+ printw("%s",BytesToIeee((space->lastLBA - space->firstLBA + 1), blockSize).c_str());
- move(lineNum, 24);
-- printw(space->origPart->GetTypeName().c_str());
-+ printw("%s",space->origPart->GetTypeName().c_str());
- move(lineNum, 50);
- #ifdef USE_UTF16
- space->origPart->GetDescription().extract(0, 39, temp, 39);
-- printw(temp);
-+ printw("%s",temp);
- #else
-- printw(space->origPart->GetDescription().c_str());
-+ printw("%s",space->origPart->GetDescription().c_str());
- #endif
- } // if/else
- } // if
-@@ -267,10 +267,10 @@ int GPTDataCurses::DisplayParts(int selected) {
-
- move(lineNum++, 0);
- theLine = "Part. # Size Partition Type Partition Name";
-- printw(theLine.c_str());
-+ printw("%s",theLine.c_str());
- move(lineNum++, 0);
- theLine = "----------------------------------------------------------------";
-- printw(theLine.c_str());
-+ printw("%s",theLine.c_str());
- numToShow = LINES - RESERVED_TOP - RESERVED_BOTTOM;
- pageNum = selected / numToShow;
- for (i = pageNum * numToShow; i <= (pageNum + 1) * numToShow - 1; i++) {
-@@ -284,7 +284,7 @@ int GPTDataCurses::DisplayParts(int selected) {
- } else {
- currentSpace = ShowSpace(i, lineNum);
- move(lineNum++, 0);
-- printw(">");
-+ printw("%s",">");
- }
- DisplayOptions(i);
- retval = selected;
-@@ -632,7 +632,7 @@ void GPTDataCurses::DisplayOptions(char selectedKey) {
- } // if/else
- } // for
- move(LINES - 1, (COLS - optionDesc.length()) / 2);
-- printw(optionDesc.c_str());
-+ printw("%s",optionDesc.c_str());
- currentKey = selectedKey;
- } // if
- } // GPTDataCurses::DisplayOptions()
-@@ -744,11 +744,11 @@ void GPTDataCurses::DrawMenu(void) {
-
- clear();
- move(0, (COLS - title.length()) / 2);
-- printw(title.c_str());
-+ printw("%s",title.c_str());
- move(2, (COLS - drive.length()) / 2);
-- printw(drive.c_str());
-+ printw("%s",drive.c_str());
- move(3, (COLS - size.str().length()) / 2);
-- printw(size.str().c_str());
-+ printw("%s",size.str().c_str());
- DisplayParts(currentSpaceNum);
- } // DrawMenu
-
-@@ -798,7 +798,7 @@ void PromptToContinue(void) {
- void Report(string theText) {
- clear();
- move(0, 0);
-- printw(theText.c_str());
-+ printw("%s", theText.c_str());
- move(LINES - 2, (COLS - 29) / 2);
- printw("Press any key to continue....");
- cbreak();
similarity index 88%
rename from meta/recipes-devtools/fdisk/gptfdisk_1.0.8.bb
rename to meta/recipes-devtools/fdisk/gptfdisk_1.0.9.bb
@@ -9,9 +9,8 @@ DEPENDS = "util-linux"
SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${PV}/${BP}.tar.gz \
file://0001-gptcurses-correctly-include-curses.h.patch \
- file://0001-gptcurses-correct-ncurses-6.3-errors.patch \
"
-SRC_URI[sha256sum] = "95d19856f004dabc4b8c342b2612e8d0a9eebdd52004297188369f152e9dc6df"
+SRC_URI[sha256sum] = "dafead2693faeb8e8b97832b23407f6ed5b3219bc1784f482dd855774e2d50c2"
UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/gptfdisk/files/gptfdisk/"
UPSTREAM_CHECK_REGEX = "/gptfdisk/(?P<pver>(\d+[\.\-_]*)+)/"
0001-gptcurses-correct-ncurses-6.3-errors.patch removed since it's included in 1.0.9. Changelog: =========== - Added support for aligning partitions' end points. This feature affects the default partition size when using n in gdisk; it affects the default partition size in cgdisk; and it's activated by the new -I option in sgdisk. See the programs' respective man pages for details. This feature is intended to help with LUKS2 encryption, which reacts badly to partitions that are not sized as exact multiples of the encryption block size. - Added several new partition type codes: FreeBSD nandfs (0xa506) Apple APFS Pre-Boot (0xaf0b) Apple APFS Recovery (0xaf0c) ChromeOS firmware (0x7f03) ChromeOS mini-OS (0x7f04) ChromeOS hibernate (0x7f05) U-Boot boot loader (0xb000) 27 (!) codes for Fuchsia (0xf100 to 0xf11a) - Added the ability to build sgdisk and cgdisk for Windows. - Added a check for too-small disks (most likely to be an issue when trying to use a too-small disk image); program now aborts if this happens. - Removed stray debugging code that caused partNum is x to be printed when changing a partition's name with sgdisk. - Fixed build problems with recent versions of ncurses. - Fixed bug that caused cgdisk to report incorrect partition attributes. Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> --- ...gptcurses-correct-ncurses-6.3-errors.patch | 99 ------------------- .../{gptfdisk_1.0.8.bb => gptfdisk_1.0.9.bb} | 3 +- 2 files changed, 1 insertion(+), 101 deletions(-) delete mode 100644 meta/recipes-devtools/fdisk/gptfdisk/0001-gptcurses-correct-ncurses-6.3-errors.patch rename meta/recipes-devtools/fdisk/{gptfdisk_1.0.8.bb => gptfdisk_1.0.9.bb} (88%)