diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2005-09-12 21:03:43 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-09-12 21:03:43 +0000 |
| commit | 1d698c0ce5d937ca2ec1e6f969dfd76625858718 (patch) | |
| tree | be8e837f8c7f35d27b867098159b6c3a9bbb65a9 | |
| parent | 172cdbd2ce755f0bd267c6721a016d180fbe4949 (diff) | |
libopieobex: chdir-patch.patch was already applied upstream and is not needed anymore
| -rw-r--r-- | packages/libopieobex/chdir-patch.patch | 23 | ||||
| -rw-r--r-- | packages/libopieobex/libopieobex0_1.2.1.bb | 3 |
2 files changed, 1 insertions, 25 deletions
diff --git a/packages/libopieobex/chdir-patch.patch b/packages/libopieobex/chdir-patch.patch deleted file mode 100644 index 60889ae893..0000000000 --- a/packages/libopieobex/chdir-patch.patch +++ /dev/null @@ -1,23 +0,0 @@ -Most Obex Push receivers are broken when getting a path inside -the push. We will change the working directory. -This patch is included upstream already - -Index: obex.cc -=================================================================== -RCS file: /cvs/opie/core/obex/obex.cc,v -retrieving revision 1.9 -diff -u -r1.9 obex.cc ---- obex.cc 12 Sep 2004 18:55:56 -0000 1.9 -+++ obex.cc 29 Mar 2005 23:28:37 -0000 -@@ -74,8 +74,10 @@ - } - // OProcess inititialisation - m_send = new OProcess(); -+ m_send->setWorkingDirectory( QFileInfo(m_file).dirPath(true) ); -+ - *m_send << "irobex_palm3"; -- *m_send << QFile::encodeName(m_file); -+ *m_send << QFile::encodeName(QFileInfo(m_file).fileName()); - - // connect to slots Exited and and StdOut - connect(m_send, SIGNAL(processExited(Opie::Core::OProcess*) ), diff --git a/packages/libopieobex/libopieobex0_1.2.1.bb b/packages/libopieobex/libopieobex0_1.2.1.bb index 6390cf1896..f5a2b1bc45 100644 --- a/packages/libopieobex/libopieobex0_1.2.1.bb +++ b/packages/libopieobex/libopieobex0_1.2.1.bb @@ -2,5 +2,4 @@ include libopieobex0.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/obex \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - file://chdir-patch.patch;patch=1;pnum=0 " + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics " |