diff options
| author | Thomas Kunze <thommycheck@gmx.de> | 2008-04-04 13:15:29 +0000 |
|---|---|---|
| committer | Thomas Kunze <thommycheck@gmx.de> | 2008-04-04 13:15:29 +0000 |
| commit | c56471d2c29a13b9e79201a935b45d56b8a144a2 (patch) | |
| tree | 380e6843ebbae889824a6a8506eee86a5fdca85e /packages | |
| parent | c01de08bcb0a7f79db2e8a15474a74d3a8efd066 (diff) | |
| parent | 18be406b6c0f3b114d127c5865f22c0bbcf6beb9 (diff) | |
merge of '87fd9620e17c2f95921fa9efc06c497fd665ce42'
and 'd4ada8446f36d70f32222f306b5709b1048f47d7'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/libopieobex/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/libopieobex/files/disable-bt-check.patch | 19 | ||||
| -rw-r--r-- | packages/libopieobex/libopieobex0_1.2.3.bb | 5 | ||||
| -rw-r--r-- | packages/libopieobex/libopieobex0_cvs.bb | 5 | ||||
| -rw-r--r-- | packages/tasks/task-opie-all.bb | 2 |
5 files changed, 26 insertions, 5 deletions
diff --git a/packages/libopieobex/files/.mtn2git_empty b/packages/libopieobex/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libopieobex/files/.mtn2git_empty 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" 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"
|