From 6a9a0e2d44fbe8b1680f61506d8639693f16f1ce Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 27 Feb 2020 14:31:46 -0800 Subject: [PATCH] gptfdisk: update to 1.0.5 Removed upstreamed patches. Refresh remaining one. Signed-off-by: Rosen Penev --- utils/gptfdisk/Makefile | 6 ++-- .../010-gptcurses-Add-missing-header.patch | 27 ------------------ .../020-support-Flush-cout-in-GetYN.patch | 28 ------------------- .../030-support-flush-cout-in-GetNumber.patch | 28 ------------------- ...040-support-flush-cout-in-ReadString.patch | 27 ------------------ ...ome-extra-flushes-before-getline-cin.patch | 24 ++++++++-------- 6 files changed, 15 insertions(+), 125 deletions(-) delete mode 100644 utils/gptfdisk/patches/010-gptcurses-Add-missing-header.patch delete mode 100644 utils/gptfdisk/patches/020-support-Flush-cout-in-GetYN.patch delete mode 100644 utils/gptfdisk/patches/030-support-flush-cout-in-GetNumber.patch delete mode 100644 utils/gptfdisk/patches/040-support-flush-cout-in-ReadString.patch diff --git a/utils/gptfdisk/Makefile b/utils/gptfdisk/Makefile index 1e5549f67..029baa5ee 100644 --- a/utils/gptfdisk/Makefile +++ b/utils/gptfdisk/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gptfdisk -PKG_VERSION:=1.0.4 -PKG_RELEASE:=2 +PKG_VERSION:=1.0.5 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/$(PKG_NAME) -PKG_HASH:=b663391a6876f19a3cd901d862423a16e2b5ceaa2f4a3b9bb681e64b9c7ba78d +PKG_HASH:=0e7d3987cd0488ecaf4b48761bc97f40b1dc089e5ff53c4b37abe30bc67dcb2f PKG_MAINTAINER:=Alif M. Ahmad PKG_LICENSE:=GPL-2.0-or-later diff --git a/utils/gptfdisk/patches/010-gptcurses-Add-missing-header.patch b/utils/gptfdisk/patches/010-gptcurses-Add-missing-header.patch deleted file mode 100644 index 08a77a562..000000000 --- a/utils/gptfdisk/patches/010-gptcurses-Add-missing-header.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 9e6016b07ff6d1de5143d3dfefb58fb4268a78e1 Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Mon, 7 Oct 2019 15:34:43 -0700 -Subject: [PATCH 1/4] gptcurses: Add missing header - -Needed with uClibc++ as it doesn't implicitly include it. - -Signed-off-by: Rosen Penev ---- - gptcurses.cc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/gptcurses.cc b/gptcurses.cc -index 3e9b240..4ebfde1 100644 ---- a/gptcurses.cc -+++ b/gptcurses.cc -@@ -19,6 +19,7 @@ - * - */ - -+#include - #include - #include - #include --- -2.17.1 - diff --git a/utils/gptfdisk/patches/020-support-Flush-cout-in-GetYN.patch b/utils/gptfdisk/patches/020-support-Flush-cout-in-GetYN.patch deleted file mode 100644 index 21f29a9cc..000000000 --- a/utils/gptfdisk/patches/020-support-Flush-cout-in-GetYN.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 5542b160fa73e5e81e83c2d8dd1b79c3023094ee Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Mon, 7 Oct 2019 15:36:31 -0700 -Subject: [PATCH 2/4] support: Flush cout in GetYN - -uClibc++ does not implicitly flush cout before getline. - -Signed-off-by: Rosen Penev ---- - support.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/support.cc b/support.cc -index d47965a..5ab8a23 100644 ---- a/support.cc -+++ b/support.cc -@@ -101,7 +101,7 @@ char GetYN(void) { - do { - if ( again ) { cout << "Your option? " ; } - again = 1 ; -- cout << "(Y/N): "; -+ cout << "(Y/N): " << flush; - line = ReadString(); - response = toupper(line[0]); - } while ((response != 'Y') && (response != 'N')); --- -2.17.1 - diff --git a/utils/gptfdisk/patches/030-support-flush-cout-in-GetNumber.patch b/utils/gptfdisk/patches/030-support-flush-cout-in-GetNumber.patch deleted file mode 100644 index 326be8487..000000000 --- a/utils/gptfdisk/patches/030-support-flush-cout-in-GetNumber.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 31d1f45cd63ec142fc559ea4f8a70bd4a1151c42 Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Mon, 7 Oct 2019 15:39:14 -0700 -Subject: [PATCH 3/4] support: flush cout in GetNumber - -uClibc++ does not implicitly do this before getline. - -Signed-off-by: Rosen Penev ---- - support.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/support.cc b/support.cc -index 5ab8a23..1107993 100644 ---- a/support.cc -+++ b/support.cc -@@ -73,7 +73,7 @@ uint64_t GetNumber(uint64_t low, uint64_t high, uint64_t def, const string & pro - - if (low != high) { // bother only if low and high differ... - do { -- cout << prompt; -+ cout << prompt << flush; - cin.getline(line, 255); - if (!cin.good()) - exit(5); --- -2.17.1 - diff --git a/utils/gptfdisk/patches/040-support-flush-cout-in-ReadString.patch b/utils/gptfdisk/patches/040-support-flush-cout-in-ReadString.patch deleted file mode 100644 index 2e0e271aa..000000000 --- a/utils/gptfdisk/patches/040-support-flush-cout-in-ReadString.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 185f73b1084936f85beddd4523a302cb1f906234 Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Mon, 7 Oct 2019 15:41:53 -0700 -Subject: [PATCH 4/4] support: flush cout in ReadString - -uClibc++ does not implicitly do this. - -Signed-off-by: Rosen Penev ---- - support.cc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/support.cc b/support.cc -index 1107993..891caad 100644 ---- a/support.cc -+++ b/support.cc -@@ -55,6 +55,7 @@ string ReadString(void) { - string ReadString(void) { - string inString; - -+ cout << flush; - getline(cin, inString); - if (!cin.good()) - exit(5); --- -2.17.1 - diff --git a/utils/gptfdisk/patches/050-Add-some-extra-flushes-before-getline-cin.patch b/utils/gptfdisk/patches/050-Add-some-extra-flushes-before-getline-cin.patch index e42e26f51..1ad8332c8 100644 --- a/utils/gptfdisk/patches/050-Add-some-extra-flushes-before-getline-cin.patch +++ b/utils/gptfdisk/patches/050-Add-some-extra-flushes-before-getline-cin.patch @@ -30,7 +30,7 @@ diff --git a/gptcurses.cc b/gptcurses.cc index 4ebfde1..ca6f4ea 100644 --- a/gptcurses.cc +++ b/gptcurses.cc -@@ -418,7 +418,7 @@ void GPTDataCurses::Verify(void) { +@@ -422,7 +422,7 @@ void GPTDataCurses::Verify(void) { def_prog_mode(); endwin(); GPTData::Verify(); @@ -39,7 +39,7 @@ index 4ebfde1..ca6f4ea 100644 cin.get(junk); reset_prog_mode(); refresh(); -@@ -816,7 +816,7 @@ void ShowTypes(void) { +@@ -820,7 +820,7 @@ void ShowTypes(void) { def_prog_mode(); endwin(); tempType.ShowAllTypes(LINES - 3); @@ -52,20 +52,20 @@ diff --git a/parttypes.cc b/parttypes.cc index cd225d1..6c2c8c6 100644 --- a/parttypes.cc +++ b/parttypes.cc -@@ -524,7 +524,7 @@ void PartType::ShowAllTypes(int maxLines) const { - if (thisType->next) { - cout << "\n"; - if ((maxLines > 0) && (lineCount++ % maxLines) == 0) { -- cout << "Press the key to see more codes: "; -+ cout << "Press the key to see more codes: " << flush; - getline(cin, line); - } // if reached screen line limit - } // if there's another entry following this one +@@ -530,7 +530,7 @@ void PartType::ShowAllTypes(int maxLines) const { + + cout.unsetf(ios::uppercase); + if (maxLines > 0) { +- cout << "Type search string, or to show all codes: "; ++ cout << "Type search string, or to show all codes: " << flush; + matchString = ToLower(ReadString()); + } // if + while (thisType != NULL) { diff --git a/support.cc b/support.cc index 891caad..645ef5d 100644 --- a/support.cc +++ b/support.cc -@@ -123,7 +123,7 @@ uint64_t GetSectorNum(uint64_t low, uint64_t high, uint64_t def, uint64_t sSize, +@@ -127,7 +127,7 @@ uint64_t GetSectorNum(uint64_t low, uint64_t high, uint64_t def, uint64_t sSize, char line[255]; do {