diff --git a/common/shlibs b/common/shlibs index d17bd64a48c..81f662c643c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2145,3 +2145,4 @@ libtelegramqml.so.1 TelegramQML-0.8.0_1 libglog.so.0 glog-0.3.4_1 libzita-convolver.so.3 zita-convolver-3.1.0_1 libpugixml.so.1 pugixml-1.6_1 +libnewt.so.0.52 newt-0.52.18_1 diff --git a/srcpkgs/newt-devel b/srcpkgs/newt-devel new file mode 120000 index 00000000000..53fabbcb042 --- /dev/null +++ b/srcpkgs/newt-devel @@ -0,0 +1 @@ +newt \ No newline at end of file diff --git a/srcpkgs/newt/patches/0001-Use-CC-instead-of-CPP-to-generate-.depend-files.patch b/srcpkgs/newt/patches/0001-Use-CC-instead-of-CPP-to-generate-.depend-files.patch new file mode 100644 index 00000000000..5366b5de0f5 --- /dev/null +++ b/srcpkgs/newt/patches/0001-Use-CC-instead-of-CPP-to-generate-.depend-files.patch @@ -0,0 +1,38 @@ +From 65754effe16506a7a0a04069c8b6e1281811604d Mon Sep 17 00:00:00 2001 +From: Samuel Martin +Date: Sat, 10 Jan 2015 11:54:10 +0100 +Subject: [PATCH newt 1/2] Use $(CC) instead of $(CPP) to generate .depend + files + +Use $(CC) instead of $(CPP) to generate .depend file because '$(CPP) +-M' call does not support multiple input files. This avoid the +following error: + +make[1]: Entering directory `/opt/br/output/build/newt-0.51.0' +/opt/br/output/host/usr/bin/arm-none-linux-gnueabi-cpp -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -M newt.c button.c form.c checkbox.c entry.c label.c listbox.c scrollbar.c textbox.c scale.c grid.c windows.c buttonbar.c checkboxtree.c > .depend +arm-none-linux-gnueabi-cpp: too many input files +make[1]: *** [depend] Error 1 + +Signed-off-by: Samuel Martin +Signed-off-by: Yegor Yefremov +Signed-off-by: Thomas Petazzoni +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index 7989203..17853e0 100644 +--- Makefile.in ++++ Makefile.in +@@ -121,7 +121,7 @@ clean: + $(SHAREDDIR)/*.o *.$(SOEXT)* + + depend: +- $(CPP) $(CFLAGS) $(CPPFLAGS) -M $(SOURCES) > .depend ++ $(CC) $(CFLAGS) $(CPPFLAGS) -M $(SOURCES) > .depend + + $(SHAREDDIR): + mkdir -p $(SHAREDDIR) +-- +2.1.0 + diff --git a/srcpkgs/newt/patches/0002-Remove-bogus-I-usr-include-slang-from-CPPFLAGS.patch b/srcpkgs/newt/patches/0002-Remove-bogus-I-usr-include-slang-from-CPPFLAGS.patch new file mode 100644 index 00000000000..e00ebaca3bc --- /dev/null +++ b/srcpkgs/newt/patches/0002-Remove-bogus-I-usr-include-slang-from-CPPFLAGS.patch @@ -0,0 +1,33 @@ +From 28145b46649165b94666ee585d064b41306e10fd Mon Sep 17 00:00:00 2001 +From: Alex Suykov +Date: Sat, 10 Jan 2015 11:55:32 +0100 +Subject: [PATCH newt 2/2] Remove bogus -I/usr/include/slang from CPPFLAGS + +Hardcoding -I/usr/include/slang in CPPFLAGS is bogus for +cross-compilation. With recent versions of slang, the headers are +installed in ${sysroot}/usr/include directly, so there is no need for +an additional flag. And if one was needed, it should be added by the +configure script, after detecting the right header location. + +Signed-off-by: Alex Suykov +Signed-off-by: Thomas Petazzoni +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index 17853e0..d32d784 100644 +--- Makefile.in ++++ 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@ +-- +2.1.0 + diff --git a/srcpkgs/newt/template b/srcpkgs/newt/template new file mode 100644 index 00000000000..88d1837b3ed --- /dev/null +++ b/srcpkgs/newt/template @@ -0,0 +1,25 @@ +# Template file for 'newt' +pkgname=newt +version=0.52.18 +revision=1 +build_style=gnu-configure +hostmakedepends="" +makedepends="slang-devel popt-devel" +depends="" +short_desc="Library for color text mode, widget based user interfaces." +maintainer="Enno Boland " +license="GPL-3" +homepage="https://fedorahosted.org/newt/" +distfiles="https://fedorahosted.org/releases/n/e/$pkgname/$pkgname-$version.tar.gz" +checksum=771b0e634ede56ae6a6acd910728bb5832ac13ddb0d1d27919d2498dab70c91e + +newt-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + } +}