diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-07-17 11:39:12 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-07-17 11:39:12 +0000 |
| commit | 00dfa13f6ae93309ea2f209634a41e2c3666873f (patch) | |
| tree | 6ec7ce65bf7198275fb53dbd119dad82c4dd4de1 /packages | |
| parent | 99e51a82c7e110beb611d728b822c40ca9a8ed54 (diff) | |
libopieobex0 cvs: Patches merged upstream.
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/libopieobex/files/obex-fixes.patch | 76 | ||||
| -rw-r--r-- | packages/libopieobex/libopieobex0_cvs.bb | 5 |
2 files changed, 2 insertions, 79 deletions
diff --git a/packages/libopieobex/files/obex-fixes.patch b/packages/libopieobex/files/obex-fixes.patch deleted file mode 100644 index 184f29846e..0000000000 --- a/packages/libopieobex/files/obex-fixes.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff --git a/obex.pro b/obex.pro -index 05118ab..2372d12 100644 ---- a/obex.pro -+++ b/obex.pro -@@ -7,7 +7,7 @@ DESTDIR = $(OPIEDIR)/plugins/obex - INTERFACES = obexsendbase.ui - INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/core/launcher - DEPENDPATH += --LIBS += -lqpe -lopiecore2 -+LIBS += -lqpe -lopiecore2 -lopenobex - VERSION = 0.0.4 - - include( $(OPIEDIR)/include.pro ) -@@ -19,6 +19,6 @@ contains( CONFTEST, y ){ - HEADERS += btobex.h - SOURCES += btobex.cpp - INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib --LIBS += -lopietooth1 -lbluetooth -lopenobex -+LIBS += -lopietooth1 -lbluetooth - DEFINES += BLUETOOTH - } -diff --git a/obexserver.cpp b/obexserver.cpp -index f1fb205..a98c64f 100644 ---- a/obexserver.cpp -+++ b/obexserver.cpp -@@ -207,7 +207,19 @@ static void obex_conn_event (obex_t *handle, obex_object_t *object, - /* Comes when a server-request has been received. */ - handle_request (handle, object, event, obex_cmd); - break; -- -+ case OBEX_EV_REQDONE: -+ switch(obex_cmd) { -+ case OBEX_CMD_PUT: -+ case OBEX_CMD_CONNECT: -+ break; -+ case OBEX_CMD_DISCONNECT: -+ OBEX_TransportDisconnect(handle); -+ _exit(0); -+ break; -+ default: -+ break; -+ } -+ break; - case OBEX_EV_LINKERR: - break; - } -@@ -423,21 +435,15 @@ bool ObexServer::start(RunMode runmode, Communication comm) - fcntl( fd[ 1 ], F_SETFD, FD_CLOEXEC ); - - if (initObex() == 0) { -+ if ( fd[ 1 ] ) { -+ ::close(fd[1]); -+ fd[1] = 0; -+ } - do { -- int result; //Connection result -- if ( fd[ 1 ] ) { -- ::close(fd[1]); -- fd[1] = 0; -- } -- if ((result = OBEX_HandleInput(m_obex, 60)) < 0) { -- if (errno != ECONNRESET) { -- printf("OBEX_HandleInput error %d\n", errno); -- fflush(stdout); -- _exit(-1); -- } -- else -- _exit(0); -- } -+ if (OBEX_HandleInput(m_obex, 60) < 0) { -+ fprintf(stderr,"failed to OBEX_HandleInput(), errno=%d\n"); -+ _exit(errno?errno:-1); -+ } - } while(1); - } - char resultByte = 1; diff --git a/packages/libopieobex/libopieobex0_cvs.bb b/packages/libopieobex/libopieobex0_cvs.bb index fe6216155c..1dcce8b68c 100644 --- a/packages/libopieobex/libopieobex0_cvs.bb +++ b/packages/libopieobex/libopieobex0_cvs.bb @@ -1,7 +1,6 @@ require libopieobex0.inc PV = "${OPIE_CVS_PV}" -PR = "r5" +PR = "r6" SRC_URI = "${HANDHELDS_CVS};module=opie/core/obex \ - ${HANDHELDS_CVS};module=opie/pics \ - file://obex-fixes.patch;patch=1" + ${HANDHELDS_CVS};module=opie/pics" |