From 060a812468b700a41ccade28794c0412660cd743 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 26 Mar 2016 08:28:20 +0100 Subject: [PATCH] newt: update to 0.52.19. --- ...ead-of-CPP-to-generate-.depend-files.patch | 38 ------------------- ...us-I-usr-include-slang-from-CPPFLAGS.patch | 33 ---------------- srcpkgs/newt/template | 6 +-- 3 files changed, 3 insertions(+), 74 deletions(-) delete mode 100644 srcpkgs/newt/patches/0001-Use-CC-instead-of-CPP-to-generate-.depend-files.patch delete mode 100644 srcpkgs/newt/patches/0002-Remove-bogus-I-usr-include-slang-from-CPPFLAGS.patch 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 deleted file mode 100644 index 5366b5de0f5..00000000000 --- a/srcpkgs/newt/patches/0001-Use-CC-instead-of-CPP-to-generate-.depend-files.patch +++ /dev/null @@ -1,38 +0,0 @@ -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 deleted file mode 100644 index e00ebaca3bc..00000000000 --- a/srcpkgs/newt/patches/0002-Remove-bogus-I-usr-include-slang-from-CPPFLAGS.patch +++ /dev/null @@ -1,33 +0,0 @@ -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 index 1ed0e1285eb..e1c9c7bea2d 100644 --- a/srcpkgs/newt/template +++ b/srcpkgs/newt/template @@ -1,7 +1,7 @@ # Template file for 'newt' pkgname=newt -version=0.52.18 -revision=2 +version=0.52.19 +revision=1 build_style=gnu-configure makedepends="slang-devel popt-devel" short_desc="Library for color text mode, widget based user interfaces" @@ -9,7 +9,7 @@ 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 +checksum=08c0db56c21996af6a7cbab99491b774c6c09cef91cd9b03903c84634bff2e80 newt-devel_package() { depends="${sourcepkg}>=${version}_${revision}"