diff options
author | Armin Kuster <akuster808@gmail.com> | 2017-12-28 09:02:11 -0800 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2017-12-30 12:32:34 -0800 |
commit | cae654adc6bfc5de7b8e70ce787664fc06ad7304 (patch) | |
tree | a17561e33cedad765e303d583eea8798897e4a4f /meta-oe/recipes-graphics | |
parent | f5c2f027455266014f201e81a116295d576c7be5 (diff) | |
download | meta-openembedded-contrib-cae654adc6bfc5de7b8e70ce787664fc06ad7304.tar.gz |
libyui-ncurses: new add
Add a new recipe libyui-ncurses, which is a rdepend for dnfdragora.
Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
fixed patch to apply
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-graphics')
-rw-r--r-- | meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-Fix-the-error-of-can-t-find-header-file.patch | 101 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb | 48 |
2 files changed, 149 insertions, 0 deletions
diff --git a/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-Fix-the-error-of-can-t-find-header-file.patch b/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-Fix-the-error-of-can-t-find-header-file.patch new file mode 100644 index 0000000000..045f3cafab --- /dev/null +++ b/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 <zhengrq.fnst@cn.fujitsu.com> +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 <zhengrq.fnst@cn.fujitsu.com> +--- + 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 <ncursesw/curses.h> ++#include <curses.h> + + #define YUILogComponent "ncurses" + #include <yui/YUILog.h> +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 <ncursesw/ncurses.h> ++#include <ncurses.h> + + #include <iosfwd> + #include <string> +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 <yui/YWidget.h> + #include <yui/YMenuItem.h> + +-#include <ncursesw/curses.h> /* curses.h: #define NCURSES_CH_T cchar_t */ ++#include <curses.h> /* curses.h: #define NCURSES_CH_T cchar_t */ + #include <wchar.h> + + #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 <iosfwd> + + #include "ncursesw.h" +-#include <ncursesw/panel.h> ++#include <panel.h> + + 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 <iostream> + #include <stdlib.h> + #include <string.h> +-#include <ncursesw/term.h> ++#include <term.h> + #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 <iosfwd> + +-#include <ncursesw/curses.h> +-#include <ncursesw/etip.h> ++#include <curses.h> ++#include <etip.h> + #include <cstdio> + #include <cstdarg> + #include <climits> +-- +2.7.4 + diff --git a/meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb b/meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb new file mode 100644 index 0000000000..02bcf44363 --- /dev/null +++ b/meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb @@ -0,0 +1,48 @@ +SUMMARY = "Character Based User Interface for libyui" +LICENSE = "LGPLv3" +LIC_FILES_CHKSUM = "file://COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ + file://COPYING.lgpl-2.1;md5=4fbd65380cdd255951079008b364516c \ + " + +SRC_URI = "git://github.com/libyui/libyui-ncurses.git \ + " + +SRC_URI_append_class-target += " file://0001-Fix-the-error-of-can-t-find-header-file.patch" + +PV = "2.48.3+git" +SRCREV = "7b251c2ff541df6139f3d210d0a0a27d042926bd" + +S = "${WORKDIR}/git" + +inherit cmake gettext pkgconfig + +DEPENDS += "boost libyui ncurses" + +BBCLASSEXTEND = "nativesdk" + +do_configure_prepend () { + cd ${S} + git checkout bootstrap.sh + sed -i "s#/usr#${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" bootstrap.sh + ./bootstrap.sh + mkdir -p ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib64/ + cp ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib/libyui.so* ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib64/ + cd - + sed -i "s#\${YPREFIX}#\${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" ${S}/CMakeLists.txt + sed -i "s#/usr#${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" ${PKG_CONFIG_SYSROOT_DIR}${libdir}/cmake/libyui/LibyuiLibraryDepends-release.cmake +} + +do_install_append () { + if [ "${libdir}" = "${base_prefix}/usr/lib" ] && [ -d ${D}/usr/lib64 ]; then + mv ${D}/usr/lib64 ${D}/usr/lib + fi +} + +do_install_append_class-nativesdk () { + mkdir -p ${D}/${base_prefix} + mv ${D}/usr ${D}/${base_prefix} +} + +FILES_${PN} += "${datadir}/*" + +FILES_${PN}-dev += "${libdir}/*" |