From 722c88c5d842f50f2dc81ddc41ad6e636eb8de71 Mon Sep 17 00:00:00 2001 From: brl Date: Tue, 12 Dec 2017 15:33:59 -0500 Subject: [PATCH] A couple of extra packages --- .../setcolors/0001-Fix-CC-in-makefile.patch | 25 ++++++++++++ .../setcolors/setcolors_1.0.0.bb | 38 +++++++++++++++++++ ...0001-prefix-needed-for-ncurses-check.patch | 27 +++++++++++++ meta-citadel/recipes-support/vifm/vifm_0.9.bb | 14 +++++++ 4 files changed, 104 insertions(+) create mode 100644 meta-citadel/recipes-support/setcolors/setcolors/0001-Fix-CC-in-makefile.patch create mode 100644 meta-citadel/recipes-support/setcolors/setcolors_1.0.0.bb create mode 100644 meta-citadel/recipes-support/vifm/vifm/0001-prefix-needed-for-ncurses-check.patch create mode 100644 meta-citadel/recipes-support/vifm/vifm_0.9.bb diff --git a/meta-citadel/recipes-support/setcolors/setcolors/0001-Fix-CC-in-makefile.patch b/meta-citadel/recipes-support/setcolors/setcolors/0001-Fix-CC-in-makefile.patch new file mode 100644 index 0000000..e655bbd --- /dev/null +++ b/meta-citadel/recipes-support/setcolors/setcolors/0001-Fix-CC-in-makefile.patch @@ -0,0 +1,25 @@ +From f1b77e89867d2856bdfe38ca34771e27c2c1d26a Mon Sep 17 00:00:00 2001 +From: brl +Date: Fri, 8 Dec 2017 22:31:23 -0500 +Subject: [PATCH] Fix CC in makefile + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 7a9cc3e..1f5f278 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,7 +1,7 @@ + PREFIX=/usr/local + + setcolors: setcolors.c +- gcc -Wall setcolors.c -o setcolors ++ $(CC) $(CFLAGS) $(LDFLAGS) -Wall setcolors.c -o setcolors + + install: setcolors setcolors.1 + install -Dm 755 setcolors "${DESTDIR}${PREFIX}/bin/setcolors" +-- +2.14.3 + diff --git a/meta-citadel/recipes-support/setcolors/setcolors_1.0.0.bb b/meta-citadel/recipes-support/setcolors/setcolors_1.0.0.bb new file mode 100644 index 0000000..de86bdc --- /dev/null +++ b/meta-citadel/recipes-support/setcolors/setcolors_1.0.0.bb @@ -0,0 +1,38 @@ +# Recipe created by recipetool +# This is the basis of a recipe and may need further editing in order to be fully functional. +# (Feel free to remove these comments when editing.) + +# WARNING: the following LICENSE and LIC_FILES_CHKSUM values are best guesses - it is +# your responsibility to verify that the values are complete and correct. +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c9aca5676b62f802a1f83ad9be3359d4" + +SRC_URI = "https://github.com/EvanPurkhiser/linux-vt-setcolors/archive/v${PV}.tar.gz \ + file://0001-Fix-CC-in-makefile.patch \ + " +SRC_URI[md5sum] = "789b4dc02d1c4f509b3b01450c7ef980" +SRC_URI[sha256sum] = "ccad9aac5732faab749e8f6f6b40746ce44afec5633374aa77c8e3ac2a8eef42" + +S = "${WORKDIR}/linux-vt-${PN}-${PV}" +# NOTE: this is a Makefile-only piece of software, so we cannot generate much of the +# recipe automatically - you will need to examine the Makefile yourself and ensure +# that the appropriate arguments are passed in. + +do_configure () { + # Specify any needed configure commands here + : +} + +EXTRA_OEMAKE = "PREFIX=/usr" +do_compile () { + + # You will almost certainly need to add additional arguments here + oe_runmake +} + +do_install () { + install -Dm 755 setcolors ${D}/${bindir}/setcolors + install -d ${D}/${datadir}/setcolors + cp -R --no-preserve=ownership example-colors/ ${D}/${datadir}/setcolors +} + diff --git a/meta-citadel/recipes-support/vifm/vifm/0001-prefix-needed-for-ncurses-check.patch b/meta-citadel/recipes-support/vifm/vifm/0001-prefix-needed-for-ncurses-check.patch new file mode 100644 index 0000000..3eac13c --- /dev/null +++ b/meta-citadel/recipes-support/vifm/vifm/0001-prefix-needed-for-ncurses-check.patch @@ -0,0 +1,27 @@ +From 71f747ad793aeab16ef49e38c241cfcb2b50ec79 Mon Sep 17 00:00:00 2001 +From: brl +Date: Wed, 6 Dec 2017 20:42:29 -0500 +Subject: [PATCH] prefix needed for ncurses check + +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 09248d4..1e28505 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -414,8 +414,8 @@ ncurses_found=no + dnl Firstly check for lib${curses_lib_name}. + AC_CHECK_LIB(${curses_lib_name}, initscr, + [LIBS="$LIBS -l${curses_lib_name}" +- if test x$vifm_cv_curses = x/usr -a -d /usr/include/${curses_lib_name}; then +- CPPFLAGS="$CPPFLAGS -I/usr/include/${curses_lib_name}" ++ if test x$vifm_cv_curses = x/usr -a -d ${prefix}/usr/include/${curses_lib_name}; then ++ CPPFLAGS="$CPPFLAGS -I${prefix}/usr/include/${curses_lib_name}" + fi + ncurses_found=yes] + AC_SEARCH_LIBS([curs_set], [tinfo],, +-- +2.14.3 + diff --git a/meta-citadel/recipes-support/vifm/vifm_0.9.bb b/meta-citadel/recipes-support/vifm/vifm_0.9.bb new file mode 100644 index 0000000..2864ed8 --- /dev/null +++ b/meta-citadel/recipes-support/vifm/vifm_0.9.bb @@ -0,0 +1,14 @@ +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "https://github.com/vifm/vifm/releases/download/v${PV}/vifm-${PV}.tar.bz2 \ + file://0001-prefix-needed-for-ncurses-check.patch \ + " +SRC_URI[md5sum] = "a523a16a7a0170141b5a36cb67251490" +SRC_URI[sha256sum] = "ab10c99d1e4c24ff8a03c20be1c202cc15874750cc47a1614e6fe4f8d816a7fd" + +DEPENDS = "file ncurses libx11 groff-native" +RDEPENDS_${PN} = "ncurses-terminfo" + +inherit perlnative autotools +