summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlarryhaja <larryhaja@gmail.com>2012-09-18 18:44:25 -0700
committerRobby Workman <rworkman@slackbuilds.org>2012-09-18 20:59:02 -0500
commitf1ea333e05a1e805963576373ea58b8c76f1224d (patch)
treead4ae68f7b168a4999d7d2c9c5174ec44b3d3379
parent1d233fae134173f8b93d475eccf6bf6789fa6b65 (diff)
downloadslackbuilds-f1ea333e05a1e805963576373ea58b8c76f1224d.tar.gz
misc/cwiid: Included a patch to link bluetooth.
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
-rw-r--r--misc/cwiid/bluetooth-linker.patch48
-rw-r--r--misc/cwiid/cwiid.SlackBuild3
2 files changed, 50 insertions, 1 deletions
diff --git a/misc/cwiid/bluetooth-linker.patch b/misc/cwiid/bluetooth-linker.patch
new file mode 100644
index 0000000000..dc22b918d5
--- /dev/null
+++ b/misc/cwiid/bluetooth-linker.patch
@@ -0,0 +1,48 @@
+diff -Naur cwiid-0.6.00.orig/lswm/Makefile.in cwiid-0.6.00/lswm/Makefile.in
+--- cwiid-0.6.00.orig/lswm/Makefile.in 2007-07-28 18:47:03.000000000 +0000
++++ cwiid-0.6.00/lswm/Makefile.in 2012-09-19 01:36:44.624050597 +0000
+@@ -8,7 +8,7 @@
+
+ CFLAGS += -I@top_builddir@/libcwiid
+ LDFLAGS += -L@top_builddir@/libcwiid
+-LDLIBS += -lcwiid
++LDLIBS += -lcwiid -lbluetooth
+ INST_DIR = @bindir@
+
+ include $(COMMON)/include/app.mak
+diff -Naur cwiid-0.6.00.orig/wmdemo/Makefile.in cwiid-0.6.00/wmdemo/Makefile.in
+--- cwiid-0.6.00.orig/wmdemo/Makefile.in 2007-04-11 02:57:27.000000000 +0000
++++ cwiid-0.6.00/wmdemo/Makefile.in 2012-09-19 01:37:25.008051673 +0000
+@@ -8,7 +8,7 @@
+
+ CFLAGS += -I@top_builddir@/libcwiid
+ LDFLAGS += -L@top_builddir@/libcwiid
+-LDLIBS += -lcwiid
++LDLIBS += -lcwiid -lbluetooth
+ INST_DIR = @bindir@
+
+ include $(COMMON)/include/app.mak
+diff -Naur cwiid-0.6.00.orig/wmgui/Makefile.in cwiid-0.6.00/wmgui/Makefile.in
+--- cwiid-0.6.00.orig/wmgui/Makefile.in 2007-07-28 18:47:03.000000000 +0000
++++ cwiid-0.6.00/wmgui/Makefile.in 2012-09-19 01:31:32.977042284 +0000
+@@ -8,7 +8,7 @@
+
+ CFLAGS += @GTK_CFLAGS@ -I@top_builddir@/libcwiid
+ LDFLAGS += -L@top_builddir@/libcwiid
+-LDLIBS += @GTK_LIBS@ -lm -lcwiid
++LDLIBS += @GTK_LIBS@ -lm -lcwiid -lbluetooth
+ INST_DIR = @bindir@
+
+ include $(COMMON)/include/app.mak
+diff -Naur cwiid-0.6.00.orig/wminput/Makefile.in cwiid-0.6.00/wminput/Makefile.in
+--- cwiid-0.6.00.orig/wminput/Makefile.in 2007-07-28 18:47:03.000000000 +0000
++++ cwiid-0.6.00/wminput/Makefile.in 2012-09-19 01:38:42.031053733 +0000
+@@ -14,7 +14,7 @@
+ -DWMINPUT_CONFIG_DIR=\"$(WMINPUT_CONFIG_DIR)\" \
+ -DCWIID_PLUGINS_DIR=\"$(CWIID_PLUGINS_DIR)\"
+
+-LDLIBS += -lcwiid -ldl
++LDLIBS += -lcwiid -ldl -lbluetooth -lpthread
+ LDFLAGS += -L@top_builddir@/libcwiid -rdynamic
+ INST_DIR = @bindir@
+
diff --git a/misc/cwiid/cwiid.SlackBuild b/misc/cwiid/cwiid.SlackBuild
index f6cba00068..9cf180e968 100644
--- a/misc/cwiid/cwiid.SlackBuild
+++ b/misc/cwiid/cwiid.SlackBuild
@@ -6,7 +6,7 @@
PRGNAM=cwiid
VERSION=${VERSION:-0.6.00}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -53,6 +53,7 @@ find . \
# Patch against newer bluez
patch -p1 < $CWD/bluez_4_api_changes.patch
+patch -p1 < $CWD/bluetooth-linker.patch
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \