[Buildroot] [PATCH 1/2] Revert "package/ncmpc: fix build with gcc 5"

[Buildroot] [PATCH 1/2] Revert "package/ncmpc: fix build with gcc 5"

[Fabrice Fontaine]

This reverts commit 56c476db99b764c6a1f64a64e0295e96f8a4612f.

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 ...TagListPage.cxx-fix-build-with-gcc-5.patch | 39 -------------------
 1 file changed, 39 deletions(-)
 delete mode 100644 package/ncmpc/0002-src-TagListPage.cxx-fix-build-with-gcc-5.patch

diff --git a/package/ncmpc/0002-src-TagListPage.cxx-fix-build-with-gcc-5.patch b/package/ncmpc/0002-src-TagListPage.cxx-fix-build-with-gcc-5.patch
deleted file mode 100644
index fc166a67f4..0000000000
--- a/package/ncmpc/0002-src-TagListPage.cxx-fix-build-with-gcc-5.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From fc6120f20e3482525ffa70230b8c3d72d979178f Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Sat, 9 Mar 2019 12:26:12 +0100
-Subject: [PATCH] src/TagListPage.cxx: fix build with gcc 5
-
-Build with gcc 5 fails on:
-
-FAILED: ncmpc at exe/src_TagListPage.cxx.o
-/accts/mlweber1/rclinux/rc-buildroot-test/scripts/instance-0/output/host/bin/mips-linux-gnu-g++ -Incmpc at exe -I. -I.. -I../src -I../ -I/accts/mlweber1/rclinux/rc-buildroot-test/scripts/instance-0/output/host/usr/bin/../mips64el-buildroot-linux-gnu/sysroot/usr/include -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wnon-virtual-dtor -std=c++14 -O3 -DBOOST_NO_IOSTREAM -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED -Wall -Wextra -Wno-deprecated-declarations -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Wmissing-declarations -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wundef -Wno-non-virtual-dtor -fvisibility=hidden -ffunction-sections -fdata-sections -D_GNU_SOURCE -D_DEFAULT_SOURCE -pthread -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -MD -MQ 'ncmpc at exe/src_TagListPage.cxx.o' -MF 'ncmpc at exe/src_TagListPage.cxx.o.d' -o 'ncmpc at exe/src_TagListPage.cxx.o' -c ../src/TagListPage
 .cxx
-../src/TagListPage.cxx: In member function 'TagFilter TagListPage::MakeCursorFilter() const':
-../src/TagListPage.cxx:41:12: error: converting to 'TagFilter {aka std::forward_list<std::pair<mpd_tag_type, std::__cxx11::basic_string<char> > >}' from initializer list would use explicit constructor 'std::forward_list<_Tp, _Alloc>::forward_list(const _Alloc&) [with _Tp = std::pair<mpd_tag_type, std::__cxx11::basic_string<char> >; _Alloc = std::allocator<std::pair<mpd_tag_type, std::__cxx11::basic_string<char> > >]'
-    return {};
-
-Fix this error by returning {{}} (a list with one empty element) instead
-of {}, see:
-https://stackoverflow.com/questions/26947704/implicit-conversion-failure-from-initializer-list
-
-Fixes:
- - http://autobuild.buildroot.org/results/655eb4905c6e308d34293658acee4fc4e1fe0bbc
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status: https://github.com/MusicPlayerDaemon/ncmpc/pull/47]
----
- src/TagListPage.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/TagListPage.cxx b/src/TagListPage.cxx
-index e197bae..c7379b4 100644
---- a/src/TagListPage.cxx
-+++ b/src/TagListPage.cxx
-@@ -38,7 +38,7 @@ TagListPage::MakeCursorFilter() const noexcept
- 	unsigned i = lw.selected;
- 	if (parent != nullptr) {
- 		if (i == 0)
--			return {};
-+			return {{}};
- 
- 		--i;
- 	}
-- 
2.20.1

[Buildroot] [PATCH 2/2] package/ncmpc: requires gcc >= 6

[Fabrice Fontaine]

Following reply from upstream on build failure with gcc 5
(https://github.com/MusicPlayerDaemon/ncmpc/pull/47), enforce gcc >= 6

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/ncmpc/Config.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/ncmpc/Config.in b/package/ncmpc/Config.in
index 00639b924a..2122bf3543 100644
--- a/package/ncmpc/Config.in
+++ b/package/ncmpc/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_NCMPC
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR # boost
 	depends on BR2_TOOLCHAIN_HAS_THREADS # boost
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6 # C++14
 	select BR2_PACKAGE_BOOST
 	select BR2_PACKAGE_BOOST_SYSTEM
 	select BR2_PACKAGE_LIBMPDCLIENT
@@ -16,7 +16,7 @@ config BR2_PACKAGE_NCMPC
 
 	  http://www.musicpd.org/clients/ncmpc/
 
-comment "ncmpc needs a toolchain w/ C++, wchar, threads, gcc >= 4.9"
+comment "ncmpc needs a toolchain w/ C++, wchar, threads, gcc >= 6"
 	depends on BR2_USE_MMU
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
-		!BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
+		!BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_6
-- 
2.20.1

[Buildroot] [PATCH 1/2] Revert "package/ncmpc: fix build with gcc 5"

[Thomas Petazzoni]

On Sat,  9 Mar 2019 15:42:41 +0100
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> This reverts commit 56c476db99b764c6a1f64a64e0295e96f8a4612f.
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  ...TagListPage.cxx-fix-build-with-gcc-5.patch | 39 -------------------
>  1 file changed, 39 deletions(-)
>  delete mode 100644 package/ncmpc/0002-src-TagListPage.cxx-fix-build-with-gcc-5.patch

Both applied to master. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com