From 2c8723416fca09853aba1c86525330d5d1fca781 Mon Sep 17 00:00:00 2001
From: Paul Eggleton <bluelightning@bluelightning.org>
Date: Fri, 4 Apr 2008 12:44:10 +0000
Subject: libopieobex: disable bluetooth detection.  Fixes 3173.

---
 packages/libopieobex/files/.mtn2git_empty         |  0
 packages/libopieobex/files/disable-bt-check.patch | 19 +++++++++++++++++++
 packages/libopieobex/libopieobex0_1.2.3.bb        |  5 +++--
 packages/libopieobex/libopieobex0_cvs.bb          |  5 +++--
 4 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 packages/libopieobex/files/.mtn2git_empty
 create mode 100644 packages/libopieobex/files/disable-bt-check.patch

diff --git a/packages/libopieobex/files/.mtn2git_empty b/packages/libopieobex/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/libopieobex/files/disable-bt-check.patch b/packages/libopieobex/files/disable-bt-check.patch
new file mode 100644
index 0000000000..067af145f7
--- /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 eeaeb7bb70..047dcee6e6 100644
--- 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 1dcce8b68c..50c36686a9 100644
--- 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"
-- 
cgit v1.2.3


From 18be406b6c0f3b114d127c5865f22c0bbcf6beb9 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Fri, 4 Apr 2008 13:10:36 +0000
Subject: task-opie-all: drop opie-dasher (unsupported upstream).  Fixed 3601.

---
 packages/tasks/task-opie-all.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/tasks/task-opie-all.bb b/packages/tasks/task-opie-all.bb
index 5487985fd4..cb08f92e3d 100644
--- a/packages/tasks/task-opie-all.bb
+++ b/packages/tasks/task-opie-all.bb
@@ -24,7 +24,7 @@ RDEPENDS_task-opie-applets = "opie-aboutapplet opie-autorotateapplet opie-batter
                      opie-screenshotapplet opie-suspendapplet opie-vmemo \
                      opie-volumeapplet opie-vtapplet opie-zkbapplet \
                      "
-RDEPENDS_task-opie-inputmethods = "opie-dasher opie-dvorak opie-handwriting \
+RDEPENDS_task-opie-inputmethods = "opie-dvorak opie-handwriting \
                           opie-handwriting-classicset opie-jumpx opie-keyboard \
                           opie-keyview opie-kjumpx opie-multikey opie-unikeyboard"
 
-- 
cgit v1.2.3