From 963ac303ee49fd77d32d1edaaebf0358af4a6fd0 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Sat, 17 Sep 2011 14:57:01 +0100 Subject: libopieobex0: fix disable-bit-check patch for current git Signed-off-by: Paul Eggleton --- .../libopieobex/files/disable-bt-check-git.patch | 18 ++++++++++++++++++ recipes-opie/libopieobex/libopieobex0_git.bb | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 recipes-opie/libopieobex/files/disable-bt-check-git.patch (limited to 'recipes-opie/libopieobex') diff --git a/recipes-opie/libopieobex/files/disable-bt-check-git.patch b/recipes-opie/libopieobex/files/disable-bt-check-git.patch new file mode 100644 index 0000000..c8d0b7d --- /dev/null +++ b/recipes-opie/libopieobex/files/disable-bt-check-git.patch @@ -0,0 +1,18 @@ +--- obex/obex.pro ++++ obex/obex.pro +@@ -13,11 +13,11 @@ VERSION = 0.0.4 + 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 btobexpush.h + SOURCES += btobex.cpp btobexpush.cpp + LIBS += -lopiebluez2 + DEFINES += BLUETOOTH +-} ++#} diff --git a/recipes-opie/libopieobex/libopieobex0_git.bb b/recipes-opie/libopieobex/libopieobex0_git.bb index 318bee6..ad5aad2 100644 --- a/recipes-opie/libopieobex/libopieobex0_git.bb +++ b/recipes-opie/libopieobex/libopieobex0_git.bb @@ -1,7 +1,7 @@ require libopieobex0.inc PV = "${OPIE_GIT_PV}" -PR = "r8" +PR = "r9" SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/obex \ ${OPIE_GIT};protocol=git;subpath=pics \ - file://disable-bt-check.patch" + file://disable-bt-check-git.patch" -- cgit 1.2.3-korg