summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Andrew Clemons2022-02-07 03:03:39 +0100
committer Willy Sudiarto Raharjo2022-02-07 17:04:34 +0100
commit79ea52c869dd36326c3df6bbabc8a550d4fef56a (patch)
treea9ec9d55bbd606fd6ecaeafcfe39acd6b213afb1
parent94efd8558c4c42f4b8a560aa04c4c21b9d38b721 (diff)
downloadslackbuilds-79ea52c869dd36326c3df6bbabc8a550d4fef56a.tar.gz
audio/nekobee: Fix build.
Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--audio/nekobee/multiple_user_friendly_id.patch44
-rw-r--r--audio/nekobee/nekobee.SlackBuild2
2 files changed, 46 insertions, 0 deletions
diff --git a/audio/nekobee/multiple_user_friendly_id.patch b/audio/nekobee/multiple_user_friendly_id.patch
new file mode 100644
index 0000000000..b639146fa0
--- /dev/null
+++ b/audio/nekobee/multiple_user_friendly_id.patch
@@ -0,0 +1,44 @@
+From 96fcfd2177cce05be0d5faf019261497d8a27338 Mon Sep 17 00:00:00 2001
+From: EDEADLINK <31075243+EDEADLINK@users.noreply.github.com>
+Date: Sat, 22 May 2021 10:53:02 +0200
+Subject: [PATCH] fix multiple definitions of user_friendly_id
+
+---
+ src/gui_main.c | 3 ++-
+ src/gui_main.h | 2 +-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/gui_main.c b/src/gui_main.c
+index 54783c4..afcb029 100644
+--- a/src/gui_main.c
++++ b/src/gui_main.c
+@@ -33,7 +33,7 @@
+
+ #include <gtk/gtk.h>
+ #include <lo/lo.h>
+-
++
+ #include "nekobee_types.h"
+ #include "nekobee.h"
+ #include "gui_callbacks.h"
+@@ -42,6 +42,7 @@
+
+ /* ==== global variables ==== */
+
++char * user_friendly_id;
+ char * osc_host_url;
+ char * osc_self_url;
+ lo_address osc_host_address;
+diff --git a/src/gui_main.h b/src/gui_main.h
+index 4c5e787..1ad5775 100644
+--- a/src/gui_main.h
++++ b/src/gui_main.h
+@@ -28,7 +28,7 @@
+ #include <lo/lo.h>
+
+ #include "nekobee_types.h"
+-char *user_friendly_id;
++extern char * user_friendly_id;
+ extern char * osc_host_url;
+ extern char * osc_self_url;
+ extern lo_address osc_host_address;
diff --git a/audio/nekobee/nekobee.SlackBuild b/audio/nekobee/nekobee.SlackBuild
index 371e6a7252..e8bd317a0c 100644
--- a/audio/nekobee/nekobee.SlackBuild
+++ b/audio/nekobee/nekobee.SlackBuild
@@ -58,6 +58,8 @@ cd $TMP
rm -rf $PRGNAM-master
unzip $CWD/$PRGNAM-$VERSION.zip
cd $PRGNAM-master
+# https://github.com/gordonjcp/nekobee/pull/9/files
+patch -p1 < $CWD/multiple_user_friendly_id.patch
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \