mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-05-21 15:13:27 +00:00
libyui-ncurses: udpate to 2.52.0
Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Oleksandr Kravchuk
Khem Raj
parent
b544304c7c
commit
13e0f3364e
@ -1,147 +0,0 @@
|
||||
From 0acfb67f99fd8d6af323311fee8c08116295b148 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Wed, 5 Sep 2018 18:21:19 -0700
|
||||
Subject: [PATCH 1/2] Use override consistently
|
||||
|
||||
Make clang++ happy
|
||||
error: 'setApplicationTitle' overrides a member function but is not marked 'override' [-Werror,-Winconsistent-missing-over ride]
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/libyui/libyui-ncurses/pull/69]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
src/NCApplication.h | 46 ++++++++++++++++++++++-----------------------
|
||||
1 file changed, 23 insertions(+), 23 deletions(-)
|
||||
|
||||
diff --git a/src/NCApplication.h b/src/NCApplication.h
|
||||
index e24c3eb..09e4708 100644
|
||||
--- a/src/NCApplication.h
|
||||
+++ b/src/NCApplication.h
|
||||
@@ -60,7 +60,7 @@ public:
|
||||
* Reimplemented from YApplication.
|
||||
**/
|
||||
virtual void setLanguage( const std::string & language,
|
||||
- const std::string & encoding = std::string() );
|
||||
+ const std::string & encoding = std::string() ) override;
|
||||
|
||||
/**
|
||||
* Open a directory selection box and prompt the user for an existing
|
||||
@@ -77,7 +77,7 @@ public:
|
||||
* Implemented from YApplication.
|
||||
**/
|
||||
virtual std::string askForExistingDirectory( const std::string & startDir,
|
||||
- const std::string & headline );
|
||||
+ const std::string & headline ) override;
|
||||
|
||||
/**
|
||||
* Open a file selection box and prompt the user for an existing file.
|
||||
@@ -97,7 +97,7 @@ public:
|
||||
**/
|
||||
virtual std::string askForExistingFile( const std::string & startWith,
|
||||
const std::string & filter,
|
||||
- const std::string & headline );
|
||||
+ const std::string & headline ) override;
|
||||
|
||||
/**
|
||||
* Open a file selection box and prompt the user for a file to save data
|
||||
@@ -119,28 +119,28 @@ public:
|
||||
**/
|
||||
virtual std::string askForSaveFileName( const std::string & startWith,
|
||||
const std::string & filter,
|
||||
- const std::string & headline );
|
||||
+ const std::string & headline ) override;
|
||||
|
||||
/**
|
||||
* Beep.
|
||||
*
|
||||
* Reimplemented from YApplication.
|
||||
**/
|
||||
- virtual void beep();
|
||||
+ virtual void beep() override;
|
||||
|
||||
/**
|
||||
* Redraw the screen.
|
||||
*
|
||||
* Reimplemented from YApplication.
|
||||
**/
|
||||
- virtual void redrawScreen();
|
||||
+ virtual void redrawScreen() override;
|
||||
|
||||
/**
|
||||
* Initialize the (text) console keyboard.
|
||||
*
|
||||
* Reimplemented from YApplication.
|
||||
**/
|
||||
- virtual void initConsoleKeyboard();
|
||||
+ virtual void initConsoleKeyboard() override;
|
||||
|
||||
/**
|
||||
* Set the (text) console font according to the current encoding etc.
|
||||
@@ -152,7 +152,7 @@ public:
|
||||
const std::string & font,
|
||||
const std::string & screen_map,
|
||||
const std::string & unicode_map,
|
||||
- const std::string & language );
|
||||
+ const std::string & language ) override;
|
||||
|
||||
/**
|
||||
* Run a shell command (typically an interactive program using NCurses)
|
||||
@@ -165,7 +165,7 @@ public:
|
||||
*
|
||||
* Reimplemented from YApplication.
|
||||
**/
|
||||
- virtual int runInTerminal( const std::string & command );
|
||||
+ virtual int runInTerminal( const std::string & command ) override;
|
||||
|
||||
|
||||
/// @{
|
||||
@@ -183,33 +183,33 @@ public:
|
||||
//
|
||||
// All implemented from YApplication.
|
||||
|
||||
- virtual int displayWidth();
|
||||
- virtual int displayHeight();
|
||||
- virtual int displayDepth();
|
||||
- virtual long displayColors();
|
||||
+ virtual int displayWidth() override;
|
||||
+ virtual int displayHeight() override;
|
||||
+ virtual int displayDepth() override;
|
||||
+ virtual long displayColors() override;
|
||||
|
||||
- virtual int defaultWidth();
|
||||
- virtual int defaultHeight();
|
||||
+ virtual int defaultWidth() override;
|
||||
+ virtual int defaultHeight() override;
|
||||
|
||||
- virtual bool isTextMode() { return true; }
|
||||
+ virtual bool isTextMode() override { return true; }
|
||||
|
||||
- virtual bool hasImageSupport() { return false; }
|
||||
+ virtual bool hasImageSupport() override { return false; }
|
||||
|
||||
- virtual bool hasIconSupport() { return false; }
|
||||
+ virtual bool hasIconSupport() override { return false; }
|
||||
|
||||
- virtual bool hasAnimationSupport() { return false; }
|
||||
+ virtual bool hasAnimationSupport() override { return false; }
|
||||
|
||||
- virtual bool hasFullUtf8Support();
|
||||
- virtual bool richTextSupportsTable() { return false; }
|
||||
+ virtual bool hasFullUtf8Support() override;
|
||||
+ virtual bool richTextSupportsTable() override { return false; }
|
||||
|
||||
- virtual bool leftHandedMouse() { return false; }
|
||||
+ virtual bool leftHandedMouse() override { return false; }
|
||||
|
||||
/**
|
||||
* Set the application title
|
||||
*
|
||||
* Reimplemented from YApplication.
|
||||
**/
|
||||
- virtual void setApplicationTitle(const std::string& title);
|
||||
+ virtual void setApplicationTitle(const std::string& title) override;
|
||||
};
|
||||
|
||||
|
||||
--
|
||||
2.18.0
|
||||
|
||||
@ -1,49 +0,0 @@
|
||||
From 162a0899f1dacd83007c4e82b9034f55610d8c20 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Wed, 5 Sep 2018 19:01:51 -0700
|
||||
Subject: [PATCH 2/2] Define own resize in NCPad and fix param type of
|
||||
SetLabel()
|
||||
|
||||
Explicitly override resize() to avoid conflicts from NCursesWindow
|
||||
definition since there is another resize definition as well
|
||||
|
||||
Fixes
|
||||
src/NCPad.h:164:18: error: 'NCPad::resize' hides overloaded virtual function [-Werror,-Woverloaded-virtual]
|
||||
|
||||
NCTablePad.h:132:18: error: 'NCTableTag::SetLabel' hides overloaded virtual function [-Werror,-Woverloaded-virtual]
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/libyui/libyui-ncurses/pull/69]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
src/NCPad.h | 1 +
|
||||
src/NCTablePad.h | 2 +-
|
||||
2 files changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/NCPad.h b/src/NCPad.h
|
||||
index 328c4aa..d8fb324 100644
|
||||
--- a/src/NCPad.h
|
||||
+++ b/src/NCPad.h
|
||||
@@ -162,6 +162,7 @@ public:
|
||||
virtual void Destwin( NCursesWindow * dwin );
|
||||
|
||||
virtual void resize( wsze nsze );
|
||||
+ virtual int resize( int lines, int columns ) { return NCursesWindow::resize(lines, columns );}
|
||||
virtual void wRecoded();
|
||||
virtual void setDirty() { dirty = true; }
|
||||
|
||||
diff --git a/src/NCTablePad.h b/src/NCTablePad.h
|
||||
index c450529..3756796 100644
|
||||
--- a/src/NCTablePad.h
|
||||
+++ b/src/NCTablePad.h
|
||||
@@ -129,7 +129,7 @@ public:
|
||||
|
||||
virtual ~NCTableTag() {}
|
||||
|
||||
- virtual void SetLabel( const NCstring & ) { /*NOOP*/; }
|
||||
+ virtual void SetLabel( const NClabel & ) { /*NOOP*/; }
|
||||
|
||||
virtual void DrawAt( NCursesWindow & w, const wrect at,
|
||||
NCTableStyle & tableStyle,
|
||||
--
|
||||
2.18.0
|
||||
|
||||
@ -5,15 +5,12 @@ LIC_FILES_CHKSUM = "file://COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
|
||||
"
|
||||
|
||||
SRC_URI = "git://github.com/libyui/libyui-ncurses.git \
|
||||
file://0001-Use-override-consistently.patch \
|
||||
file://0002-Define-own-resize-in-NCPad-and-fix-param-type-of-Set.patch \
|
||||
file://0003-Simplify-ncurses-finding-module.patch \
|
||||
"
|
||||
|
||||
SRC_URI_append_class-target = " file://0001-Fix-the-error-of-can-t-find-header-file.patch"
|
||||
|
||||
PV = "2.48.3+git${SRCPV}"
|
||||
SRCREV = "c941b32246e8b2952fce4fd5743f8e318222ab98"
|
||||
SRCREV = "d5b64b6291b6f292871ad5c6df25c4f6896f7d50"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user