From 8e24a6ed1cd6fd91f9b4644b1fa199e516c25fa2 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Mon, 13 Jun 2016 05:16:31 -0400 Subject: libnewt/libnewt-python: upgrade to 0.52.19 - Drop remove_slang_include.patch, libnewt 0.52.19 has fixed it. Signed-off-by: Hongxu Jia Signed-off-by: Richard Purdie --- .../newt/files/remove_slang_include.patch | 16 ------- .../newt/libnewt-python_0.52.18.bb | 28 ----------- .../newt/libnewt-python_0.52.19.bb | 28 +++++++++++ meta/recipes-extended/newt/libnewt_0.52.18.bb | 56 ---------------------- meta/recipes-extended/newt/libnewt_0.52.19.bb | 55 +++++++++++++++++++++ 5 files changed, 83 insertions(+), 100 deletions(-) delete mode 100644 meta/recipes-extended/newt/files/remove_slang_include.patch delete mode 100644 meta/recipes-extended/newt/libnewt-python_0.52.18.bb create mode 100644 meta/recipes-extended/newt/libnewt-python_0.52.19.bb delete mode 100644 meta/recipes-extended/newt/libnewt_0.52.18.bb create mode 100644 meta/recipes-extended/newt/libnewt_0.52.19.bb diff --git a/meta/recipes-extended/newt/files/remove_slang_include.patch b/meta/recipes-extended/newt/files/remove_slang_include.patch deleted file mode 100644 index a2634ec75b..0000000000 --- a/meta/recipes-extended/newt/files/remove_slang_include.patch +++ /dev/null @@ -1,16 +0,0 @@ - -Upstream-Status: Pending - -Index: git/Makefile.in -=================================================================== ---- git.orig/Makefile.in -+++ git/Makefile.in -@@ -5,7 +5,7 @@ CC = @CC@ - CPP = @CPP@ - CFLAGS = @CFLAGS@ - LDFLAGS = @LDFLAGS@ --CPPFLAGS = -D_GNU_SOURCE -I/usr/include/slang @CPPFLAGS@ -+CPPFLAGS = -D_GNU_SOURCE @CPPFLAGS@ - GNU_LD = @GNU_LD@ - - VERSION = @VERSION@ diff --git a/meta/recipes-extended/newt/libnewt-python_0.52.18.bb b/meta/recipes-extended/newt/libnewt-python_0.52.18.bb deleted file mode 100644 index 20369effeb..0000000000 --- a/meta/recipes-extended/newt/libnewt-python_0.52.18.bb +++ /dev/null @@ -1,28 +0,0 @@ -require recipes-extended/newt/libnewt_${PV}.bb - -SUMMARY .= " - python" -DEPENDS = "libnewt python3" -RDEPENDS_${PN} += "python3-core" - -inherit python3native python3-dir - -EXTRA_OECONF += "--with-python" -EXTRA_OEMAKE += "PYTHONVERS=${PYTHON_DIR}" - - -do_compile () { - VERSION="$(sed -n 's/^VERSION = //p' Makefile)" - oe_runmake _snack.so -} - -do_install () { - install -d ${D}${PYTHON_SITEPACKAGES_DIR} - install -m 0755 ${PYTHON_DIR}/_snack.so ${D}${PYTHON_SITEPACKAGES_DIR}/ - install -m 0644 snack.py ${D}${PYTHON_SITEPACKAGES_DIR}/ -} - -PACKAGES_remove = "whiptail" - -FILES_${PN} = "${PYTHON_SITEPACKAGES_DIR}/*" - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-extended/newt/libnewt-python_0.52.19.bb b/meta/recipes-extended/newt/libnewt-python_0.52.19.bb new file mode 100644 index 0000000000..20369effeb --- /dev/null +++ b/meta/recipes-extended/newt/libnewt-python_0.52.19.bb @@ -0,0 +1,28 @@ +require recipes-extended/newt/libnewt_${PV}.bb + +SUMMARY .= " - python" +DEPENDS = "libnewt python3" +RDEPENDS_${PN} += "python3-core" + +inherit python3native python3-dir + +EXTRA_OECONF += "--with-python" +EXTRA_OEMAKE += "PYTHONVERS=${PYTHON_DIR}" + + +do_compile () { + VERSION="$(sed -n 's/^VERSION = //p' Makefile)" + oe_runmake _snack.so +} + +do_install () { + install -d ${D}${PYTHON_SITEPACKAGES_DIR} + install -m 0755 ${PYTHON_DIR}/_snack.so ${D}${PYTHON_SITEPACKAGES_DIR}/ + install -m 0644 snack.py ${D}${PYTHON_SITEPACKAGES_DIR}/ +} + +PACKAGES_remove = "whiptail" + +FILES_${PN} = "${PYTHON_SITEPACKAGES_DIR}/*" + +BBCLASSEXTEND = "native" diff --git a/meta/recipes-extended/newt/libnewt_0.52.18.bb b/meta/recipes-extended/newt/libnewt_0.52.18.bb deleted file mode 100644 index b6a9cd4dfc..0000000000 --- a/meta/recipes-extended/newt/libnewt_0.52.18.bb +++ /dev/null @@ -1,56 +0,0 @@ -SUMMARY = "A library for text mode user interfaces" - -DESCRIPTION = "Newt is a programming library for color text mode, widget based user \ -interfaces. Newt can be used to add stacked windows, entry widgets, \ -checkboxes, radio buttons, labels, plain text fields, scrollbars, \ -etc., to text mode user interfaces. This package also contains the \ -shared library needed by programs built with newt, as well as a \ -/usr/bin/dialog replacement called whiptail. Newt is based on the \ -slang library." - -HOMEPAGE = "https://fedorahosted.org/newt/" -SECTION = "libs" - -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" - -# slang needs to be >= 2.2 -DEPENDS = "slang popt" - -SRC_URI = "https://fedorahosted.org/releases/n/e/newt/newt-${PV}.tar.gz \ - file://remove_slang_include.patch \ - file://fix_SHAREDDIR.patch \ - file://cross_ar.patch \ - file://Makefile.in-Add-tinfo-library-to-the-linking-librari.patch \ - file://pie-flags.patch \ -" - -SRC_URI[md5sum] = "685721bee1a318570704b19dcf31d268" -SRC_URI[sha256sum] = "771b0e634ede56ae6a6acd910728bb5832ac13ddb0d1d27919d2498dab70c91e" - -S = "${WORKDIR}/newt-${PV}" - -EXTRA_OECONF = "--without-tcl --without-python" - -inherit autotools-brokensep - -CLEANBROKEN = "1" - -export STAGING_INCDIR -export STAGING_LIBDIR -export CPPFLAGS - -PACKAGES_prepend = "whiptail " - -do_configure_prepend() { - sh autogen.sh -} - -do_compile_prepend() { - # Make sure the recompile is OK - rm -f ${B}/.depend -} - -FILES_whiptail = "${bindir}/whiptail" - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-extended/newt/libnewt_0.52.19.bb b/meta/recipes-extended/newt/libnewt_0.52.19.bb new file mode 100644 index 0000000000..b45461cde3 --- /dev/null +++ b/meta/recipes-extended/newt/libnewt_0.52.19.bb @@ -0,0 +1,55 @@ +SUMMARY = "A library for text mode user interfaces" + +DESCRIPTION = "Newt is a programming library for color text mode, widget based user \ +interfaces. Newt can be used to add stacked windows, entry widgets, \ +checkboxes, radio buttons, labels, plain text fields, scrollbars, \ +etc., to text mode user interfaces. This package also contains the \ +shared library needed by programs built with newt, as well as a \ +/usr/bin/dialog replacement called whiptail. Newt is based on the \ +slang library." + +HOMEPAGE = "https://fedorahosted.org/newt/" +SECTION = "libs" + +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" + +# slang needs to be >= 2.2 +DEPENDS = "slang popt" + +SRC_URI = "https://fedorahosted.org/releases/n/e/newt/newt-${PV}.tar.gz \ + file://fix_SHAREDDIR.patch \ + file://cross_ar.patch \ + file://Makefile.in-Add-tinfo-library-to-the-linking-librari.patch \ + file://pie-flags.patch \ +" + +SRC_URI[md5sum] = "e4aa0f7943edd39c52481a87f68f412a" +SRC_URI[sha256sum] = "08c0db56c21996af6a7cbab99491b774c6c09cef91cd9b03903c84634bff2e80" + +S = "${WORKDIR}/newt-${PV}" + +EXTRA_OECONF = "--without-tcl --without-python" + +inherit autotools-brokensep + +CLEANBROKEN = "1" + +export STAGING_INCDIR +export STAGING_LIBDIR +export CPPFLAGS + +PACKAGES_prepend = "whiptail " + +do_configure_prepend() { + sh autogen.sh +} + +do_compile_prepend() { + # Make sure the recompile is OK + rm -f ${B}/.depend +} + +FILES_whiptail = "${bindir}/whiptail" + +BBCLASSEXTEND = "native" -- cgit 1.2.3-korg