diff options
author | Khem Raj <raj.khem@gmail.com> | 2018-09-05 19:11:15 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-09-08 13:32:12 -0700 |
commit | 68f46bb93d0f4f83493c5048852b05a00ccd99d2 (patch) | |
tree | f579b1ea3f1a33d02d63b790c14cfeefd41df706 /meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-Use-override-consistently.patch | |
parent | 7ff00ed5b8ce657d14383402716aff219c9eb474 (diff) | |
download | meta-openembedded-68f46bb93d0f4f83493c5048852b05a00ccd99d2.tar.gz |
libyui,libyui-ncurse: Update to latest on git
* Add fixes for building with clang
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-Use-override-consistently.patch')
-rw-r--r-- | meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-Use-override-consistently.patch | 147 |
1 files changed, 147 insertions, 0 deletions
diff --git a/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-Use-override-consistently.patch b/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-Use-override-consistently.patch new file mode 100644 index 000000000..6d4bdc2ab --- /dev/null +++ b/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-Use-override-consistently.patch | |||
@@ -0,0 +1,147 @@ | |||
1 | From 0acfb67f99fd8d6af323311fee8c08116295b148 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 5 Sep 2018 18:21:19 -0700 | ||
4 | Subject: [PATCH 1/2] Use override consistently | ||
5 | |||
6 | Make clang++ happy | ||
7 | error: 'setApplicationTitle' overrides a member function but is not marked 'override' [-Werror,-Winconsistent-missing-over ride] | ||
8 | |||
9 | Upstream-Status: Submitted [https://github.com/libyui/libyui-ncurses/pull/69] | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | src/NCApplication.h | 46 ++++++++++++++++++++++----------------------- | ||
13 | 1 file changed, 23 insertions(+), 23 deletions(-) | ||
14 | |||
15 | diff --git a/src/NCApplication.h b/src/NCApplication.h | ||
16 | index e24c3eb..09e4708 100644 | ||
17 | --- a/src/NCApplication.h | ||
18 | +++ b/src/NCApplication.h | ||
19 | @@ -60,7 +60,7 @@ public: | ||
20 | * Reimplemented from YApplication. | ||
21 | **/ | ||
22 | virtual void setLanguage( const std::string & language, | ||
23 | - const std::string & encoding = std::string() ); | ||
24 | + const std::string & encoding = std::string() ) override; | ||
25 | |||
26 | /** | ||
27 | * Open a directory selection box and prompt the user for an existing | ||
28 | @@ -77,7 +77,7 @@ public: | ||
29 | * Implemented from YApplication. | ||
30 | **/ | ||
31 | virtual std::string askForExistingDirectory( const std::string & startDir, | ||
32 | - const std::string & headline ); | ||
33 | + const std::string & headline ) override; | ||
34 | |||
35 | /** | ||
36 | * Open a file selection box and prompt the user for an existing file. | ||
37 | @@ -97,7 +97,7 @@ public: | ||
38 | **/ | ||
39 | virtual std::string askForExistingFile( const std::string & startWith, | ||
40 | const std::string & filter, | ||
41 | - const std::string & headline ); | ||
42 | + const std::string & headline ) override; | ||
43 | |||
44 | /** | ||
45 | * Open a file selection box and prompt the user for a file to save data | ||
46 | @@ -119,28 +119,28 @@ public: | ||
47 | **/ | ||
48 | virtual std::string askForSaveFileName( const std::string & startWith, | ||
49 | const std::string & filter, | ||
50 | - const std::string & headline ); | ||
51 | + const std::string & headline ) override; | ||
52 | |||
53 | /** | ||
54 | * Beep. | ||
55 | * | ||
56 | * Reimplemented from YApplication. | ||
57 | **/ | ||
58 | - virtual void beep(); | ||
59 | + virtual void beep() override; | ||
60 | |||
61 | /** | ||
62 | * Redraw the screen. | ||
63 | * | ||
64 | * Reimplemented from YApplication. | ||
65 | **/ | ||
66 | - virtual void redrawScreen(); | ||
67 | + virtual void redrawScreen() override; | ||
68 | |||
69 | /** | ||
70 | * Initialize the (text) console keyboard. | ||
71 | * | ||
72 | * Reimplemented from YApplication. | ||
73 | **/ | ||
74 | - virtual void initConsoleKeyboard(); | ||
75 | + virtual void initConsoleKeyboard() override; | ||
76 | |||
77 | /** | ||
78 | * Set the (text) console font according to the current encoding etc. | ||
79 | @@ -152,7 +152,7 @@ public: | ||
80 | const std::string & font, | ||
81 | const std::string & screen_map, | ||
82 | const std::string & unicode_map, | ||
83 | - const std::string & language ); | ||
84 | + const std::string & language ) override; | ||
85 | |||
86 | /** | ||
87 | * Run a shell command (typically an interactive program using NCurses) | ||
88 | @@ -165,7 +165,7 @@ public: | ||
89 | * | ||
90 | * Reimplemented from YApplication. | ||
91 | **/ | ||
92 | - virtual int runInTerminal( const std::string & command ); | ||
93 | + virtual int runInTerminal( const std::string & command ) override; | ||
94 | |||
95 | |||
96 | /// @{ | ||
97 | @@ -183,33 +183,33 @@ public: | ||
98 | // | ||
99 | // All implemented from YApplication. | ||
100 | |||
101 | - virtual int displayWidth(); | ||
102 | - virtual int displayHeight(); | ||
103 | - virtual int displayDepth(); | ||
104 | - virtual long displayColors(); | ||
105 | + virtual int displayWidth() override; | ||
106 | + virtual int displayHeight() override; | ||
107 | + virtual int displayDepth() override; | ||
108 | + virtual long displayColors() override; | ||
109 | |||
110 | - virtual int defaultWidth(); | ||
111 | - virtual int defaultHeight(); | ||
112 | + virtual int defaultWidth() override; | ||
113 | + virtual int defaultHeight() override; | ||
114 | |||
115 | - virtual bool isTextMode() { return true; } | ||
116 | + virtual bool isTextMode() override { return true; } | ||
117 | |||
118 | - virtual bool hasImageSupport() { return false; } | ||
119 | + virtual bool hasImageSupport() override { return false; } | ||
120 | |||
121 | - virtual bool hasIconSupport() { return false; } | ||
122 | + virtual bool hasIconSupport() override { return false; } | ||
123 | |||
124 | - virtual bool hasAnimationSupport() { return false; } | ||
125 | + virtual bool hasAnimationSupport() override { return false; } | ||
126 | |||
127 | - virtual bool hasFullUtf8Support(); | ||
128 | - virtual bool richTextSupportsTable() { return false; } | ||
129 | + virtual bool hasFullUtf8Support() override; | ||
130 | + virtual bool richTextSupportsTable() override { return false; } | ||
131 | |||
132 | - virtual bool leftHandedMouse() { return false; } | ||
133 | + virtual bool leftHandedMouse() override { return false; } | ||
134 | |||
135 | /** | ||
136 | * Set the application title | ||
137 | * | ||
138 | * Reimplemented from YApplication. | ||
139 | **/ | ||
140 | - virtual void setApplicationTitle(const std::string& title); | ||
141 | + virtual void setApplicationTitle(const std::string& title) override; | ||
142 | }; | ||
143 | |||
144 | |||
145 | -- | ||
146 | 2.18.0 | ||
147 | |||