From 5b80bfd7bffd4c20d80b7c70a7130529e9a755dd Mon Sep 17 00:00:00 2001 From: ToshikazuOhiwa Date: Mon, 30 Mar 2020 09:24:26 +0900 Subject: agl-basesystem --- ...1-Fix-the-error-of-can-t-find-header-file.patch | 101 ++++++++++++++ .../0001-Use-override-consistently.patch | 147 +++++++++++++++++++++ ...resize-in-NCPad-and-fix-param-type-of-Set.patch | 49 +++++++ .../0003-Simplify-ncurses-finding-module.patch | 35 +++++ 4 files changed, 332 insertions(+) create mode 100644 external/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-Fix-the-error-of-can-t-find-header-file.patch create mode 100644 external/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-Use-override-consistently.patch create mode 100644 external/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0002-Define-own-resize-in-NCPad-and-fix-param-type-of-Set.patch create mode 100644 external/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0003-Simplify-ncurses-finding-module.patch (limited to 'external/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses') diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-Fix-the-error-of-can-t-find-header-file.patch b/external/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-Fix-the-error-of-can-t-find-header-file.patch new file mode 100644 index 00000000..045f3caf --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-Fix-the-error-of-can-t-find-header-file.patch @@ -0,0 +1,101 @@ +From eb0086dc4ea8fe9cda069456287b3a29a2631d30 Mon Sep 17 00:00:00 2001 +From: Zheng Ruoqin +Date: Wed, 13 Dec 2017 16:18:45 +0900 +Subject: [PATCH] Fix the error of can't find header file + +Upstream-Status: Inappropriate [embedded specific] +This fix is just for yocto. + +Signed-off-by: Zheng Ruoqin +--- + src/NCApplication.cc | 2 +- + src/NCstyle.h | 2 +- + src/NCurses.h | 2 +- + src/ncursesp.h | 2 +- + src/ncursesw.cc | 2 +- + src/ncursesw.h | 4 ++-- + 6 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/src/NCApplication.cc b/src/NCApplication.cc +index 5bcf969..510f034 100644 +--- a/src/NCApplication.cc ++++ b/src/NCApplication.cc +@@ -23,7 +23,7 @@ + + /-*/ + +-#include ++#include + + #define YUILogComponent "ncurses" + #include +diff --git a/src/NCstyle.h b/src/NCstyle.h +index a40d5a8..3657917 100644 +--- a/src/NCstyle.h ++++ b/src/NCstyle.h +@@ -25,7 +25,7 @@ + #ifndef NCstyle_h + #define NCstyle_h + +-#include ++#include + + #include + #include +diff --git a/src/NCurses.h b/src/NCurses.h +index a07c6bf..d17d3c3 100644 +--- a/src/NCurses.h ++++ b/src/NCurses.h +@@ -34,7 +34,7 @@ + #include + #include + +-#include /* curses.h: #define NCURSES_CH_T cchar_t */ ++#include /* curses.h: #define NCURSES_CH_T cchar_t */ + #include + + #include "ncursesw.h" +diff --git a/src/ncursesp.h b/src/ncursesp.h +index d478347..2fcfea5 100644 +--- a/src/ncursesp.h ++++ b/src/ncursesp.h +@@ -28,7 +28,7 @@ + #include + + #include "ncursesw.h" +-#include ++#include + + class NCursesPanel : public NCursesWindow + { +diff --git a/src/ncursesw.cc b/src/ncursesw.cc +index 3c771af..bb83210 100644 +--- a/src/ncursesw.cc ++++ b/src/ncursesw.cc +@@ -47,7 +47,7 @@ + #include + #include + #include +-#include ++#include + #undef line + #undef columns + +diff --git a/src/ncursesw.h b/src/ncursesw.h +index d25923a..c140d37 100644 +--- a/src/ncursesw.h ++++ b/src/ncursesw.h +@@ -27,8 +27,8 @@ + + #include + +-#include +-#include ++#include ++#include + #include + #include + #include +-- +2.7.4 + diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-Use-override-consistently.patch b/external/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-Use-override-consistently.patch new file mode 100644 index 00000000..6d4bdc2a --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-Use-override-consistently.patch @@ -0,0 +1,147 @@ +From 0acfb67f99fd8d6af323311fee8c08116295b148 Mon Sep 17 00:00:00 2001 +From: Khem Raj +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 +--- + 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 + diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0002-Define-own-resize-in-NCPad-and-fix-param-type-of-Set.patch b/external/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0002-Define-own-resize-in-NCPad-and-fix-param-type-of-Set.patch new file mode 100644 index 00000000..f65cbe66 --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0002-Define-own-resize-in-NCPad-and-fix-param-type-of-Set.patch @@ -0,0 +1,49 @@ +From 162a0899f1dacd83007c4e82b9034f55610d8c20 Mon Sep 17 00:00:00 2001 +From: Khem Raj +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 +--- + 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 + diff --git a/external/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0003-Simplify-ncurses-finding-module.patch b/external/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0003-Simplify-ncurses-finding-module.patch new file mode 100644 index 00000000..2520ac46 --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0003-Simplify-ncurses-finding-module.patch @@ -0,0 +1,35 @@ +From c2291fe28dc5682f81804941512431642975cf21 Mon Sep 17 00:00:00 2001 +From: Pascal Bach +Date: Mon, 29 Oct 2018 18:17:32 +0100 +Subject: [PATCH] Simplify ncurses finding module + +CMake will automatically look in the right locations, there is no need to +re-implement the logic with a for loop and NO_DEFAULT_PATH. + +It is already done like this to file the headers. + +Upstream-Status: Submitted [https://github.com/libyui/libyui-ncurses/pull/73] +Signed-off-by: Pascal Bach +--- + cmake/Modules/FindCurses6.cmake | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +diff --git a/cmake/Modules/FindCurses6.cmake b/cmake/Modules/FindCurses6.cmake +index 0bf02c3..e298d5d 100644 +--- a/cmake/Modules/FindCurses6.cmake ++++ b/cmake/Modules/FindCurses6.cmake +@@ -5,11 +5,9 @@ + # CURSES6_LIBRARIES - The libraries needed to use Curses6 + # CURSES6_DEFINITIONS - Compiler switches required for using Curses6 + +-FOREACH(path ${CMAKE_LIBRARY_PATH} /usr/${LIB_DIR}) +- FIND_LIBRARY(CURSES6_NCURSESW_LIBRARY NAMES ncursesw PATHS ${path}/ncurses6 ${path} NO_DEFAULT_PATH) +- FIND_LIBRARY(CURSES6_PANELW_LIBRARY NAMES panelw PATHS ${path}/ncurses6 ${path} NO_DEFAULT_PATH) +- FIND_LIBRARY(CURSES6_TINFO_LIBRARY NAMES tinfo PATHS ${path}/ncurses6 ${path} NO_DEFAULT_PATH) +-ENDFOREACH() ++FIND_LIBRARY(CURSES6_NCURSESW_LIBRARY NAMES ncursesw PATH_SUFFIXES ncurses6) ++FIND_LIBRARY(CURSES6_PANELW_LIBRARY NAMES panelw PATH_SUFFIXES ncurses6) ++FIND_LIBRARY(CURSES6_TINFO_LIBRARY NAMES tinfo PATH_SUFFIXES ncurses6) + + SET(CURSES6_LIBRARIES ${CURSES6_NCURSESW_LIBRARY} ${CURSES6_PANELW_LIBRARY}) + # tinfo is optional (in 12.1 is not there) -- cgit 1.2.3-korg