From dde02ad31e46a7f42cfd0374b3421d52a4b54eaf Mon Sep 17 00:00:00 2001 From: Kang Kai Date: Thu, 28 Jul 2011 17:28:42 +0800 Subject: libnewt: update to 0.52.13 Update libnewt to 0.52.13, and remove include-without-python.patch because it has been merged. Update SRC_URI and add SRC_URI checksum. (From OE-Core rev: b83284d2be47019e1ca122ce4a2b1a077e7c3174) Signed-off-by: Kang Kai Signed-off-by: Richard Purdie --- .../newt/files/include-without-python.patch | 73 ---------------------- meta/recipes-extended/newt/libnewt_0.52.12.bb | 41 ------------ meta/recipes-extended/newt/libnewt_0.52.13.bb | 43 +++++++++++++ 3 files changed, 43 insertions(+), 114 deletions(-) delete mode 100644 meta/recipes-extended/newt/files/include-without-python.patch delete mode 100644 meta/recipes-extended/newt/libnewt_0.52.12.bb create mode 100644 meta/recipes-extended/newt/libnewt_0.52.13.bb (limited to 'meta/recipes-extended/newt') diff --git a/meta/recipes-extended/newt/files/include-without-python.patch b/meta/recipes-extended/newt/files/include-without-python.patch deleted file mode 100644 index 263e9de039..0000000000 --- a/meta/recipes-extended/newt/files/include-without-python.patch +++ /dev/null @@ -1,73 +0,0 @@ -Upstream-Status: Pending - -From 3d13bbbb769050fac4cc6c904c174edc27e4f03d Mon Sep 17 00:00:00 2001 -From: Otavio Salvador -Date: Thu, 20 Jan 2011 14:14:51 -0200 -Subject: [PATCH] build: add -without-python - -Signed-off-by: Otavio Salvador ---- - Makefile.in | 8 ++++---- - configure.ac | 10 ++++++++-- - 2 files changed, 12 insertions(+), 6 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index e764e61..74e9097 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -77,7 +77,7 @@ showkey: showkey.o $(LIBNEWT) - $(CC) -g -o showkey showkey.o $(LIBNEWT) $(LDFLAGS) $(LIBS) - - _snackmodule.so: snackmodule.c $(LIBNEWTSH) -- for ver in $(PYTHONVERS) ; do \ -+ [ -n "$(PYTHONVERS)" ] && for ver in $(PYTHONVERS) ; do \ - mkdir -p $$ver ;\ - PCFLAGS=`$$ver-config --cflags`; \ - PIFLAGS=`$$ver-config --includes`; \ -@@ -85,7 +85,7 @@ _snackmodule.so: snackmodule.c $(LIBNEWTSH) - PLFLAGS=`$$ver-config --libs`; \ - $(CC) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snackmodule.o snackmodule.c ;\ - $(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snackmodule.so $$ver/snackmodule.o -L. -lnewt $(LIBS);\ -- done -+ done || : - touch $@ - - whiptail: $(NDIALOGOBJS) $(LIBNEWTSH) -@@ -141,11 +141,11 @@ install-sh: sharedlib $(WHIPTCLSO) _snackmodule.so - ln -sf $(LIBNEWTSONAME) $(instroot)/$(libdir)/libnewt.so - ln -sf $(LIBNEWTSH) $(instroot)/$(libdir)/$(LIBNEWTSONAME) - [ -n "$(WHIPTCLSO)" ] && install -m 755 whiptcl.so $(instroot)/$(libdir) || : -- for ver in $(PYTHONVERS) ; do \ -+ [ -n "$(PYTHONVERS)" ] && for ver in $(PYTHONVERS) ; do \ - [ -d $(instroot)/$(libdir)/$$ver/site-packages ] || install -m 755 -d $(instroot)/$(libdir)/$$ver/site-packages ;\ - install -m 755 $$ver/_snackmodule.so $(instroot)/$(libdir)/$$ver/site-packages ;\ - install -m 644 snack.py $(instroot)/$(libdir)/$$ver/site-packages ;\ -- done -+ done || : - - Makefile: newt.spec - echo "You need to rerun ./configure before continuing" -diff --git a/configure.ac b/configure.ac -index 7bc381a..dc04352 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -54,8 +54,14 @@ fi - AC_CHECK_HEADERS([popt.h libintl.h]) - - AC_MSG_CHECKING([for python versions]) --PYTHONVERS=$(echo /usr/include/python*/Python.h | sed "s|/usr/include/||g"| sed "s|/Python.h||g" 2> /dev/null) --AC_MSG_RESULT([$PYTHONVERS]) -+AC_ARG_WITH([python], [ --without-python do not compile python support]) -+if test "x$with_python" = "xno"; then -+ AC_MSG_RESULT([skipped]) -+ PYTHONVERS= -+else -+ PYTHONVERS=$(ls /usr/include/python*/Python.h 2> /dev/null | sed "s|/usr/include/||g"| sed "s|/Python.h||g" 2> /dev/null) -+ AC_MSG_RESULT([$PYTHONVERS]) -+fi - AC_SUBST([PYTHONVERS]) - - AC_ARG_WITH([tcl], [ --without-tcl do not compile whiptcl.so]) --- -1.7.2.3 - diff --git a/meta/recipes-extended/newt/libnewt_0.52.12.bb b/meta/recipes-extended/newt/libnewt_0.52.12.bb deleted file mode 100644 index e2ad55964d..0000000000 --- a/meta/recipes-extended/newt/libnewt_0.52.12.bb +++ /dev/null @@ -1,41 +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 = "LGPL" -LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" - -# slang needs to be >= 2.2 -DEPENDS = "slang popt" - -PR = "r2" - -SRCREV = "c3c7be75f6ef1adfc2be5f99c1e8ef3f0ab58c38" - -SRC_URI = "git://git.fedorahosted.org/git/newt;protocol=git \ - file://include-without-python.patch \ - file://remove_slang_include.patch \ - file://fix_SHAREDDIR.patch" - -S = "${WORKDIR}/git" - -EXTRA_OECONF = "--without-python --without-tcl" - -inherit autotools - -PACKAGES_prepend = "whiptail " - -do_configure_prepend() { - sh autogen.sh -} - -FILES_whiptail = "${bindir}/whiptail" diff --git a/meta/recipes-extended/newt/libnewt_0.52.13.bb b/meta/recipes-extended/newt/libnewt_0.52.13.bb new file mode 100644 index 0000000000..38e09a9f9b --- /dev/null +++ b/meta/recipes-extended/newt/libnewt_0.52.13.bb @@ -0,0 +1,43 @@ +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 = "LGPL" +LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" + +# slang needs to be >= 2.2 +DEPENDS = "slang popt" + +PR = "r0" + +SRCREV = "c3c7be75f6ef1adfc2be5f99c1e8ef3f0ab58c38" + +SRC_URI = "https://fedorahosted.org/releases/n/e/newt/newt-${PV}.tar.gz \ + file://remove_slang_include.patch \ + file://fix_SHAREDDIR.patch" + +SRC_URI[md5sum] = "77de05b3f58540152a4ae32a1a64e5d0" +SRC_URI[sha256sum] = "01c254b00a3d27e22f13240b6db74df04e721ccec4d1d4fc7b45fee009efc05f" + +S = "${WORKDIR}/newt-${PV}" + +EXTRA_OECONF = "--without-python --without-tcl" + +inherit autotools + +PACKAGES_prepend = "whiptail " + +do_configure_prepend() { + sh autogen.sh +} + +FILES_whiptail = "${bindir}/whiptail" -- cgit v1.2.3-54-g00ecf