diff options
author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-10-05 17:05:21 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-10-05 17:05:21 +0000 |
commit | 49d5a95e391ad4dba4a60d909f47b78f140f4562 (patch) | |
tree | 34d0be1b90b5b45ecd7569ee33cc2c1a3dc66a59 /packages | |
parent | ca7716767e99afc18acce578c662b346148c39a7 (diff) | |
parent | 07a1cdc3d5e872f6787d681ab4b8bc3e2e13dd18 (diff) |
merge of '063eb0ee158d77c4c6ba8c5ca8b517b3380b0d66'
and 'eda920dfeccbfa68c48217a7ccb00fad8a8a62c2'
Diffstat (limited to 'packages')
-rw-r--r-- | packages/opie-rdesktop/files/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/opie-rdesktop/files/crash_fix.patch | 10 | ||||
-rw-r--r-- | packages/opie-rdesktop/opie-rdesktop_1.2.4.bb | 4 |
3 files changed, 13 insertions, 1 deletions
diff --git a/packages/opie-rdesktop/files/.mtn2git_empty b/packages/opie-rdesktop/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/opie-rdesktop/files/.mtn2git_empty diff --git a/packages/opie-rdesktop/files/crash_fix.patch b/packages/opie-rdesktop/files/crash_fix.patch new file mode 100644 index 0000000000..b3ebc31499 --- /dev/null +++ b/packages/opie-rdesktop/files/crash_fix.patch @@ -0,0 +1,10 @@ +--- opierdesktop/licence.cpp 30 Jul 2007 19:08:05 -0000 1.2 ++++ opierdesktop/licence.cpp 5 Oct 2008 16:02:07 -0000 1.3 +@@ -173,7 +173,6 @@ + } + + licence_send_request(null_data, null_data, username, hostname); +- free(licence_data); + } + + /* Send an authentication response packet */ diff --git a/packages/opie-rdesktop/opie-rdesktop_1.2.4.bb b/packages/opie-rdesktop/opie-rdesktop_1.2.4.bb index 8bf2649e72..38484b9413 100644 --- a/packages/opie-rdesktop/opie-rdesktop_1.2.4.bb +++ b/packages/opie-rdesktop/opie-rdesktop_1.2.4.bb @@ -1,6 +1,8 @@ require ${PN}.inc +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opierdesktop \ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + file://crash_fix.patch;patch=1" |