libopieobex: disable bluetooth detection. Fixes 3173.

diff --git a/packages/libopieobex/files/.mtn2git_empty b/packages/libopieobex/files/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/libopieobex/files/disable-bt-check.patch b/packages/libopieobex/files/disable-bt-check.patch
new file mode 100644 (file)
index 0000000..067af14
--- /dev/null
+++ b/packages/libopieobex/files/disable-bt-check.patch
@@ -0,0 +1,19 @@
+--- obex/obex.pro      2007-07-20 23:44:06.000000000 +1200
++++ obex/obex.pro      2007-10-18 17:57:15.000000000 +1300
+@@ -13,12 +13,12 @@
+ include( $(OPIEDIR)/include.pro )
+ target.path = $$prefix/plugins/applets
+ 
+-#FIXME: These parameters are used if bluetooth is used
+-CONFTEST = $$system( echo $CONFIG_LIBOPIETOOTH )
+-contains( CONFTEST, y ){
++#FIXME: This test does not work under OE. Instead, just always enable bluetooth.
++#CONFTEST = $$system( echo $CONFIG_LIBOPIETOOTH )
++#contains( CONFTEST, y ){
+ HEADERS     += btobex.h
+ SOURCES     += btobex.cpp
+ INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib
+ LIBS        += -lopietooth1 -lbluetooth
+ DEFINES     += BLUETOOTH
+-}
++#}

diff --git a/packages/libopieobex/libopieobex0_1.2.3.bb b/packages/libopieobex/libopieobex0_1.2.3.bb
index eeaeb7b..047dcee 100644 (file)
--- a/packages/libopieobex/libopieobex0_1.2.3.bb
+++ b/packages/libopieobex/libopieobex0_1.2.3.bb
@@ -1,5 +1,6 @@
 require libopieobex0.inc
-
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/obex \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics      "
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           file://disable-bt-check.patch;patch=1"

diff --git a/packages/libopieobex/libopieobex0_cvs.bb b/packages/libopieobex/libopieobex0_cvs.bb
index 1dcce8b..50c3668 100644 (file)
--- a/packages/libopieobex/libopieobex0_cvs.bb
+++ b/packages/libopieobex/libopieobex0_cvs.bb
@@ -1,6 +1,7 @@
 require libopieobex0.inc
 PV = "${OPIE_CVS_PV}"
-PR = "r6"
+PR = "r7"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/obex \
-           ${HANDHELDS_CVS};module=opie/pics"
+           ${HANDHELDS_CVS};module=opie/pics \
+           file://disable-bt-check.patch;patch=1"