main/ncmpc: include upstream patch fixing crash on resume after suspend

Also switch the build type to release while being here.

3 files changed, 42 insertions, 7 deletions

diff --git a/main/ncmpc/0001-Make-lyrics_plugin_dir-configurable-again.patch b/main/ncmpc/0001-Make-lyrics_plugin_dir-configurable-again.patch
index 2b84681e3c..903627d7d1 100644
--- a/main/ncmpc/0001-Make-lyrics_plugin_dir-configurable-again.patch
+++ b/main/ncmpc/0001-Make-lyrics_plugin_dir-configurable-again.patch
@@ -1,7 +1,7 @@
-From b49026a1c9e8075ff7be03dac6d26d22a659219c Mon Sep 17 00:00:00 2001
+From c1b7a2d4372dff90e4952a9f137f685b777d073e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
 Date: Sat, 23 Sep 2017 11:09:38 +0200
-Subject: [PATCH] Make lyrics_plugin_dir configurable again
+Subject: [PATCH 1/2] Make lyrics_plugin_dir configurable again
 
 See: https://github.com/MusicPlayerDaemon/ncmpc/issues/7
 ---
@@ -10,7 +10,7 @@ See: https://github.com/MusicPlayerDaemon/ncmpc/issues/7
  2 files changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/meson.build b/meson.build
-index 92d0057..f399c69 100644
+index b2fd42a..5255b2a 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -271,7 +271,7 @@ conf.set('ENABLE_LYRICS_SCREEN', enable_lyrics_screen)
@@ -35,5 +35,5 @@ index 4f58ed3..92e83e6 100644
 +  value: 'lib/ncmpc/lyrics',
 +  description: 'Directory where lyrics plugins are stored')
 -- 
-2.14.1
+2.14.2
 
diff --git a/main/ncmpc/0002-mpdclient-check-source-again-after-mpd_glib_leave.patch b/main/ncmpc/0002-mpdclient-check-source-again-after-mpd_glib_leave.patch
new file mode 100644
index 0000000000..6dc7d7cf7f
--- /dev/null
+++ b/main/ncmpc/0002-mpdclient-check-source-again-after-mpd_glib_leave.patch
@@ -0,0 +1,32 @@
+From 058f2d23321839e4aca1af7eb4537883fe7dd92a Mon Sep 17 00:00:00 2001
+From: Max Kellermann <max.kellermann@gmail.com>
+Date: Tue, 17 Oct 2017 15:56:06 +0200
+Subject: [PATCH 2/2] mpdclient: check source again after mpd_glib_leave()
+
+Just in case mpd_glib_leave() has found an error and had to close the
+connection, check it again to avoid an assertion failure (or crash) in
+mpdclient_schedule_enter_idle().
+
+Closes #9
+---
+ NEWS            | 1 +
+ src/mpdclient.c | 3 ++-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/mpdclient.c b/src/mpdclient.c
+index 6a81a0b..1801ad2 100644
+--- a/src/mpdclient.c
++++ b/src/mpdclient.c
+@@ -490,7 +490,8 @@ mpdclient_get_connection(struct mpdclient *c)
+ 		c->idle = false;
+ 		mpd_glib_leave(c->source);
+ 
+-		mpdclient_schedule_enter_idle(c);
++		if (c->source != NULL)
++			mpdclient_schedule_enter_idle(c);
+ 	}
+ 
+ 	return c->connection;
+-- 
+2.14.2
+
diff --git a/main/ncmpc/APKBUILD b/main/ncmpc/APKBUILD
index 0da5ef4f52..45cd99d137 100644
--- a/main/ncmpc/APKBUILD
+++ b/main/ncmpc/APKBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Peter Bui <pnutzh4x0r@gmail.com>
 pkgname=ncmpc
 pkgver=0.28
-pkgrel=0
+pkgrel=1
 pkgdesc="Fully featured MPD client using ncurses"
 url="http://www.musicpd.org/clients/ncmpc/"
 arch="all"
@@ -14,7 +14,8 @@ makedepends="ncurses-dev glib-dev libmpdclient-dev meson"
 install=""
 subpackages="$pkgname-doc $pkgname-lang $pkgname-dbg"
 source="http://www.musicpd.org/download/${pkgname}/0/${pkgname}-${pkgver}.tar.xz
-	0001-Make-lyrics_plugin_dir-configurable-again.patch"
+	0001-Make-lyrics_plugin_dir-configurable-again.patch
+	0002-mpdclient-check-source-again-after-mpd_glib_leave.patch"
 builddir="$srcdir"/$pkgname-$pkgver
 
 build() {
@@ -24,6 +25,7 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--localstatedir=/var \
+		--buildtype=release \
 		-Dcurses=ncurses \
 		-Dlyrics_screen=true \
 		-Dlyrics_plugin_dir=share/$pkgname/lyrics \
@@ -45,4 +47,5 @@ package() {
 }
 
 sha512sums="d5cf890fc72b3c8c3391ddbcae49d494d9504eb237dcef1277b3b34eaecdce20611b1a874a2d248722b66e932a0ec7ace5bedc0dafbb0afe0d3476d4af520e0c  ncmpc-0.28.tar.xz
-686c8b10e14f33139df254a2c5bb29d6e52cdfdc938ad60e1ac315280c7936b56913a81b9278a9a083fa2831b41ef3ea0800d2971efc4b8d5fec5b48fa95214f  0001-Make-lyrics_plugin_dir-configurable-again.patch"
+3e04693161caa14d7e470241fd1c965767eea71cda5a67a029a9ddf75aefd80848ea582a0bc85e8b304b8e1272ad4b5404d369053fab03da59557a4ac42a9e99  0001-Make-lyrics_plugin_dir-configurable-again.patch
+a297ca0c2da1ebcaa01af8c2c211f9d99529891cb8c9dfb28eaf169186330b83d9a4120006e91bc2c0c272313501d4fd4812c9df707a8c03d6dace1b7fb469c5  0002-mpdclient-check-source-again-after-mpd_glib_leave.patch"