Skip to contentSkip to conversation

libyui: update to 3.6.0

PATCH New Oleksandr Kravchuk 1 participant 2 messages Sep 25, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 libyui: update to 3.6.0

---
 ...1-Use-curly-braces-for-MAKE-variable.patch | 32 -------------------
 .../libyui/{libyui_git.bb => libyui_3.6.0.bb} |  4 +--
 2 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 meta-oe/recipes-graphics/libyui/libyui/0001-Use-curly-braces-for-MAKE-variable.patch
 rename meta-oe/recipes-graphics/libyui/{libyui_git.bb => libyui_3.6.0.bb} (89%)
meta-oe/recipes-graphics/libyui/libyui/0001-Use-curly-braces-for-MAKE-variable.patch deleted +0 -32
deleted file mode 100644
index dbe241709..000000000
@@ -1,32 +0,0 @@
-From 4eed37b1a61458fc8e5251f7cb7c6d64e8e9da8d Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Wed, 5 Sep 2018 17:48:09 -0700
-Subject: [PATCH] Use curly braces for MAKE variable
-
-Fixes errors with ninja
-| ninja: error: build.ninja:142: bad $-escape (literal $ must be written as $$)
-
-Upstream-Status: Submitted [https://github.com/libyui/libyui/pull/137]
-Signed-off-by: Khem Raj <[email protected]>
----
- buildtools/LibyuiCommon.cmake | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/buildtools/LibyuiCommon.cmake b/buildtools/LibyuiCommon.cmake
-index cb93307..e6fbefd 100644
---- a/buildtools/LibyuiCommon.cmake
-+++ b/buildtools/LibyuiCommon.cmake
-@@ -122,8 +122,8 @@ MACRO( SET_BUILD_FLAGS )	# setup compiler-flags depending on CMAKE_BUILD_TYPE
-     ENABLE_TESTING()
-     # add a wrapper "tests" target, the builtin "test" cannot be extended :-(
-     ADD_CUSTOM_TARGET(tests
--      $(MAKE)
--      COMMAND $(MAKE) test
-+      ${MAKE}
-+      COMMAND ${MAKE} test
-     )
-   ENDIF ( ENABLE_TESTS OR ENABLE_CODE_COVERAGE)
- 
--- 
-2.18.0
-
meta-oe/recipes-graphics/libyui/libyui_3.6.0.bb renamed from meta-oe/recipes-graphics/libyui/libyui_git.bb +1 -3
similarity index 89%
rename from meta-oe/recipes-graphics/libyui/libyui_git.bb
rename to meta-oe/recipes-graphics/libyui/libyui_3.6.0.bb
index d313fb02d..d8a921925 100644
@@ -7,12 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING.gpl-3;md5=d32239bcb673463ab874e80d47fae504 \
 
 SRC_URI = "git://github.com/libyui/libyui.git \
            file://0001-Fix-build-with-clang.patch \
-           file://0001-Use-curly-braces-for-MAKE-variable.patch \
            file://0001-Use-relative-install-paths-for-CMake.patch \
            "
 
-PV = "3.3.3+git"
-SRCREV = "50672da835ec9d52766320a44a2677e08a24c99c"
+SRCREV = "8459235919f592b1bc099ecf9a947cb6344b6fa5"
 SRCREV_FORMAT = "default"
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/2 libyui-ncurses: udpate to 2.52.0

---
 .../0001-Use-override-consistently.patch      | 147 ------------------
 ...e-in-NCPad-and-fix-param-type-of-Set.patch |  49 ------
 ...curses_git.bb => libyui-ncurses_2.52.0.bb} |   5 +-
 3 files changed, 1 insertion(+), 200 deletions(-)
 delete mode 100644 meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-Use-override-consistently.patch
 delete mode 100644 meta-oe/recipes-graphics/libyui/libyui-ncurses/0002-Define-own-resize-in-NCPad-and-fix-param-type-of-Set.patch
 rename meta-oe/recipes-graphics/libyui/{libyui-ncurses_git.bb => libyui-ncurses_2.52.0.bb} (87%)
meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-Use-override-consistently.patch deleted +0 -147
deleted file mode 100644
index 6d4bdc2ab..000000000
@@ -1,147 +0,0 @@
-From 0acfb67f99fd8d6af323311fee8c08116295b148 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-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 <[email protected]>
----
- 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
-
meta-oe/recipes-graphics/libyui/libyui-ncurses/0002-Define-own-resize-in-NCPad-and-fix-param-type-of-Set.patch deleted +0 -49

49 lines not on this page · raw message

meta-oe/recipes-graphics/libyui/libyui-ncurses_2.52.0.bb renamed from meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb +1 -4
similarity index 87%
rename from meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb
rename to meta-oe/recipes-graphics/libyui/libyui-ncurses_2.52.0.bb
index 18ea2e828..dae5c342d 100644
@@ -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"
 
Signature · 1 line
2.17.1