summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTommaso Sardelli2020-07-10 08:30:13 +0200
committerTommaso Sardelli2020-07-10 08:33:36 +0200
commit43115466b4dcf47ff561753b6bb5f1f0fa812fab (patch)
tree280c54f8a1ea39bbf52ac521cdd00c7ea0ca459b
parent5d5570d1949320b5b5d31cb3aa3e2b8aea3a5419 (diff)
downloadaur-ympd.tar.gz
Add patch from PR 191 to fix compile issues
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD13
-rw-r--r--fix-compile.patch27
3 files changed, 40 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 91b9607904d8..0ec3bac1c52f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Sat Feb 20 09:31:32 UTC 2016
pkgbase = ympd
pkgdesc = A standalone MPD Web GUI
pkgver = 1.3.0
- pkgrel = 3
+ pkgrel = 4
url = http://www.ympd.org
install = ympd.install
arch = i686
@@ -18,7 +16,9 @@ pkgbase = ympd
conflicts = ympd-git
backup = etc/default/ympd
source = https://github.com/notandy/ympd/archive/v1.3.0.tar.gz
+ source = fix-compile.patch
sha256sums = d9f68920cd93d1cfa971e1d7b9162a2b1724909bc9753c1338cecb3688d234d5
+ sha256sums = 2aeabebd8cbca0b94895003f830e3820406aa85115e073b0a4d3c8a85c84fafd
pkgname = ympd
diff --git a/PKGBUILD b/PKGBUILD
index efe34b12612d..6fd7f3ee6430 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=ympd
pkgver=1.3.0
-pkgrel=3
+pkgrel=4
pkgdesc="A standalone MPD Web GUI"
arch=('i686' 'x86_64' 'armv6h' 'armv7h')
url="http://www.ympd.org"
@@ -13,8 +13,15 @@ provides=("$pkgname")
conflicts=("$pkgname-git")
install="${pkgname}.install"
backup=('etc/default/ympd')
-source=("https://github.com/notandy/$pkgname/archive/v$pkgver.tar.gz")
-sha256sums=('d9f68920cd93d1cfa971e1d7b9162a2b1724909bc9753c1338cecb3688d234d5')
+source=("https://github.com/notandy/$pkgname/archive/v$pkgver.tar.gz"
+ "fix-compile.patch")
+sha256sums=('d9f68920cd93d1cfa971e1d7b9162a2b1724909bc9753c1338cecb3688d234d5'
+ '2aeabebd8cbca0b94895003f830e3820406aa85115e073b0a4d3c8a85c84fafd')
+
+
+prepare() {
+ patch -d "${pkgname}-${pkgver}" -Np1 -i "${srcdir}"/fix-compile.patch
+}
build() {
cd $srcdir/$pkgname-$pkgver
diff --git a/fix-compile.patch b/fix-compile.patch
new file mode 100644
index 000000000000..e50bf43810a9
--- /dev/null
+++ b/fix-compile.patch
@@ -0,0 +1,27 @@
+diff --git a/src/mpd_client.c b/src/mpd_client.c
+index 7271984..1f086e4 100644
+--- a/src/mpd_client.c
++++ b/src/mpd_client.c
+@@ -29,6 +29,7 @@
+
+ /* forward declaration */
+ static int mpd_notify_callback(struct mg_connection *c, enum mg_event ev);
++struct t_mpd mpd;
+
+ const char * mpd_cmd_strs[] = {
+ MPD_CMDS(GEN_STR)
+diff --git a/src/mpd_client.h b/src/mpd_client.h
+index dd78af9..386a31d 100644
+--- a/src/mpd_client.h
++++ b/src/mpd_client.h
+@@ -92,7 +92,9 @@ struct t_mpd {
+
+ int song_id;
+ unsigned queue_version;
+-} mpd;
++};
++
++extern struct t_mpd mpd;
+
+ struct t_mpd_client_session {
+ int song_id;