summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Willy Sudiarto Raharjo2022-03-06 17:08:51 +0100
committer Willy Sudiarto Raharjo2022-03-07 02:38:03 +0100
commitb689338a77c2177646209474dede7e6fbbc87689 (patch)
tree6951cb349918cf088ab82e7ebf108f5f675bc69c
parentcffd9bf866177e9560dcc3c0429f0b1f25903f95 (diff)
downloadslackbuilds-b689338a77c2177646209474dede7e6fbbc87689.tar.gz
games/roccat-tools: Fix build.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--games/roccat-tools/fix-multiple-definitions.patch9
-rw-r--r--games/roccat-tools/roccat-tools.SlackBuild3
2 files changed, 12 insertions, 0 deletions
diff --git a/games/roccat-tools/fix-multiple-definitions.patch b/games/roccat-tools/fix-multiple-definitions.patch
new file mode 100644
index 0000000000..91916ab314
--- /dev/null
+++ b/games/roccat-tools/fix-multiple-definitions.patch
@@ -0,0 +1,9 @@
+--- ./ryosmk/libroccatryosmk/ryos_device.h.orig 2020-06-30 16:41:33.348116743 +0200
++++ ./ryosmk/libroccatryosmk/ryos_device.h 2020-06-30 16:40:18.701450210 +0200
+@@ -23,5 +23,5 @@
+ G_BEGIN_DECLS
+
+-enum {
++typedef enum {
+ RYOS_WRITE_CHECK_WAIT_LIGHT_CONTROL = 10,
+ } RyosWriteCheckWait;
diff --git a/games/roccat-tools/roccat-tools.SlackBuild b/games/roccat-tools/roccat-tools.SlackBuild
index a545a0a235..97b9e4329b 100644
--- a/games/roccat-tools/roccat-tools.SlackBuild
+++ b/games/roccat-tools/roccat-tools.SlackBuild
@@ -112,11 +112,14 @@ fi
LUAVERSION="$( lua -e 'print(_VERSION)' | cut -d' ' -f2 )"
LUA="-DWITH_LUA='$LUAVERSION'"
+patch -p1 < $CWD/fix-multiple-definitions.patch
+
mkdir -p build
cd build
cmake \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -isystem /usr/include/harfbuzz" \
-DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_C_FLAGS="$(pkg-config --cflags harfbuzz)" \
$HW \
$LUA \
-DCMAKE_BUILD_TYPE=Release ..