[oe-commits] org.oe.dev libopieobex: disable bluetooth detection. Fixes 3173.

[bluelightning commit]

libopieobex: disable bluetooth detection.  Fixes 3173.

Author: bluelightning
Branch: org.openembedded.dev
Revision: 5c70288a8476dbd93aba7d5a2d256f0f765341c9
ViewMTN: http://monotone.openembedded.org/revision/info/5c70288a8476dbd93aba7d5a2d256f0f765341c9
Files:
1
packages/libopieobex/files
packages/libopieobex/files/disable-bt-check.patch
packages/libopieobex/libopieobex0_1.2.3.bb
packages/libopieobex/libopieobex0_cvs.bb
Diffs:

#
# mt diff -r5be1694af54efe619f89c634867bc6aa9bbe54be -r5c70288a8476dbd93aba7d5a2d256f0f765341c9
#
#
#
# add_dir "packages/libopieobex/files"
# 
# add_file "packages/libopieobex/files/disable-bt-check.patch"
#  content [4531ca6db356b9e34c43ab4986901f13cbef2ad4]
# 
# patch "packages/libopieobex/libopieobex0_1.2.3.bb"
#  from [d78020e74a92f741a163fff78e554f93bd96f91e]
#    to [0c803763dbf3b86af956d5c0b3d2520ece6bcc8c]
# 
# patch "packages/libopieobex/libopieobex0_cvs.bb"
#  from [0e5adb40de222cf5c66a7884fa46c00160d179a7]
#    to [8f777b6cc6d58e21975d108a806c55a81f01f4a4]
#
============================================================
--- packages/libopieobex/files/disable-bt-check.patch	4531ca6db356b9e34c43ab4986901f13cbef2ad4
+++ packages/libopieobex/files/disable-bt-check.patch	4531ca6db356b9e34c43ab4986901f13cbef2ad4
@@ -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
+-}
++#}
============================================================
--- packages/libopieobex/libopieobex0_1.2.3.bb	d78020e74a92f741a163fff78e554f93bd96f91e
+++ packages/libopieobex/libopieobex0_1.2.3.bb	0c803763dbf3b86af956d5c0b3d2520ece6bcc8c
@@ -1,5 +1,6 @@ require libopieobex0.inc
 require libopieobex0.inc
+PR = "r1"
 
-
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/obex \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           file://disable-bt-check.patch;patch=1"
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics      "
============================================================
--- packages/libopieobex/libopieobex0_cvs.bb	0e5adb40de222cf5c66a7884fa46c00160d179a7
+++ packages/libopieobex/libopieobex0_cvs.bb	8f777b6cc6d58e21975d108a806c55a81f01f4a4
@@ -1,6 +1,7 @@ PV = "${OPIE_CVS_PV}"
 require libopieobex0.inc
 PV = "${OPIE_CVS_PV}"
-PR = "r6"
+PR = "r7"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/obex \
+           ${HANDHELDS_CVS};module=opie/pics \
+           file://disable-bt-check.patch;patch=1"
-           ${HANDHELDS_CVS};module=opie/pics"