package/ncmpc: remove first patch

This patch has been rejected by upstream however the issue has been
fixed by a different approach since version 0.31 and
https://github.com/MusicPlayerDaemon/ncmpc/commit/029523c8a2472e45213e50c1e3eb414245dd9d57

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

diff --git a/package/ncmpc/0001-Fix-unique_ptr-error-with-some-old-toolchains.patch b/package/ncmpc/0001-Fix-unique_ptr-error-with-some-old-toolchains.patch
deleted file mode 100644 (file)
index 47905d7..0000000
--- a/package/ncmpc/0001-Fix-unique_ptr-error-with-some-old-toolchains.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 63c0c47106007f7b2a791e3e4b062a5424d3dfe8 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Sun, 12 Aug 2018 09:02:50 +0200
-Subject: [PATCH] Fix unique_ptr error with some old toolchains
-
-With some "old" toolchains (glibc, uclibc in version 4.9.4, 5.3, 5.4,
-5.5 ...), the following error is raised by the compiler:
-
-../src/screen.cxx:60:29:   required from here
-/usr/lfs/v0/rc-buildroot-test/scripts/instance-1/output/host/opt/ext-toolchain/mips-linux-gnu/include/c++/5.3.0/ext/new_allocator.h:120:4:
-error: no matching function for call to 'std::pair<const screen_functions* const, std::unique_ptr<Page> >::pair(const screen_functions*, Page*)'
-
-[...]
-
-/usr/lfs/v0/rc-buildroot-test/scripts/instance-1/output/host/opt/ext-toolchain/mips-linux-gnu/include/c++/5.3.0/bits/stl_pair.h:112:26:
-note: candidate: constexpr std::pair<_T1, _T2>::pair(const _T1&, const _T2&) [with _T1 = const screen_functions* const; _T2 = std::unique_ptr<Page>]
-       _GLIBCXX_CONSTEXPR pair(const _T1& __a, const _T2& __b)
-                          ^
-/usr/lfs/v0/rc-buildroot-test/scripts/instance-1/output/host/opt/ext-toolchain/mips-linux-gnu/include/c++/5.3.0/bits/stl_pair.h:112:26:
-note:   no known conversion for argument 2 from 'Page*' to 'const
-std::unique_ptr<Page>&'
-
-This is due to the fact that init function of screen_functions
-structure returns Page* but PageMap wants a std::unique_ptr<Page>
-
-To fix this, cast raw pointer into a unique_ptr with an explicit cast
-
-Fixes:
- - http://autobuild.buildroot.net/results/d8a7339d8bdd5cdc6bd1716585d4bcf15a2e8015
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- src/screen.cxx | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/screen.cxx b/src/screen.cxx
-index dd42b25..56afd11 100644
---- a/src/screen.cxx
-+++ b/src/screen.cxx
-@@ -56,8 +56,9 @@ ScreenManager::MakePage(const struct screen_functions &sf)
-               return i;
- 
-       auto j = pages.emplace(&sf,
--                             sf.init(*this, main_window.w,
--                                     main_window.size));
-+                             std::unique_ptr<Page>(sf.init(*this,
-+                                                           main_window.w,
-+                                                           main_window.size)));
-       assert(j.second);
-       return j.first;
- }
--- 
-2.14.1
-

diff --git a/package/ncmpc/0001-meson.build-add-atomic-dependency-for-sparc.patch b/package/ncmpc/0001-meson.build-add-atomic-dependency-for-sparc.patch
new file mode 100644 (file)
index 0000000..fd24589
--- /dev/null
+++ b/package/ncmpc/0001-meson.build-add-atomic-dependency-for-sparc.patch
@@ -0,0 +1,43 @@
+From d2bd33ec18c146b27fb5aff7dd0089faa195ef9b Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Mon, 11 Feb 2019 21:42:01 +0100
+Subject: [PATCH] meson.build: add atomic dependency for sparc
+
+Linking with libatomic is needed on sparc otherwise build fails on:
+ncmpc@exe/src_Main.cxx.o: In function `std::__atomic_base<long>::operator++()':
+/home/buildroot/autobuild/instance-1/output/host/opt/ext-toolchain/sparc-buildroot-linux-uclibc/include/c++/6.4.0/bits/atomic_base.h:296: undefined reference to `__atomic_fetch_add_4'
+
+Fixes:
+ - http://autobuild.buildroot.org/results/7ac1a07e4f72633d3ec92b79dc5d8c062490abdc
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status: https://github.com/MusicPlayerDaemon/ncmpc/pull/45]
+---
+ meson.build | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/meson.build b/meson.build
+index 2e6defc..b393e39 100644
+--- a/meson.build
++++ b/meson.build
+@@ -174,6 +174,9 @@ else
+   pcre_dep = declare_dependency()
+ endif
+ 
++# Needed on sparc 
++atomic_dep = cc.find_library('atomic', required: false)
++
+ inc = include_directories(
+   'src',
+ 
+@@ -352,6 +355,7 @@ ncmpc = executable('ncmpc',
+   sources,
+   include_directories: inc,
+   dependencies: [
++    atomic_dep,
+     thread_dep,
+     boost_dep,
+     pcre_dep,
+-- 
+2.14.1
+

diff --git a/package/ncmpc/0002-meson.build-add-atomic-dependency-for-sparc.patch b/package/ncmpc/0002-meson.build-add-atomic-dependency-for-sparc.patch
deleted file mode 100644 (file)
index fd24589..0000000
--- a/package/ncmpc/0002-meson.build-add-atomic-dependency-for-sparc.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From d2bd33ec18c146b27fb5aff7dd0089faa195ef9b Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Mon, 11 Feb 2019 21:42:01 +0100
-Subject: [PATCH] meson.build: add atomic dependency for sparc
-
-Linking with libatomic is needed on sparc otherwise build fails on:
-ncmpc@exe/src_Main.cxx.o: In function `std::__atomic_base<long>::operator++()':
-/home/buildroot/autobuild/instance-1/output/host/opt/ext-toolchain/sparc-buildroot-linux-uclibc/include/c++/6.4.0/bits/atomic_base.h:296: undefined reference to `__atomic_fetch_add_4'
-
-Fixes:
- - http://autobuild.buildroot.org/results/7ac1a07e4f72633d3ec92b79dc5d8c062490abdc
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status: https://github.com/MusicPlayerDaemon/ncmpc/pull/45]
----
- meson.build | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/meson.build b/meson.build
-index 2e6defc..b393e39 100644
---- a/meson.build
-+++ b/meson.build
-@@ -174,6 +174,9 @@ else
-   pcre_dep = declare_dependency()
- endif
- 
-+# Needed on sparc 
-+atomic_dep = cc.find_library('atomic', required: false)
-+
- inc = include_directories(
-   'src',
- 
-@@ -352,6 +355,7 @@ ncmpc = executable('ncmpc',
-   sources,
-   include_directories: inc,
-   dependencies: [
-+    atomic_dep,
-     thread_dep,
-     boost_dep,
-     pcre_dep,
--- 
-2.14.1
-