diff options
author | Marcin Juszkiewicz <hrw@openembedded.org> | 2008-02-17 22:15:50 +0000 |
---|---|---|
committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2008-02-17 22:15:50 +0000 |
commit | be5ee58f3d895b64c6fab84d14807629b0404851 (patch) | |
tree | 17f0445b3d8a546de7ad2a7dddaf8827fc17f3da | |
parent | 1b1d31889caebc06e4a140011ee41db4b2f4c989 (diff) | |
parent | ec91747176dcfbb05f2a3e87100b67ecdd076013 (diff) |
merge of '4b9bf269fccb2d8469b9d1ccfe6d73ac060a6b29'
and 'fce7884660951ebd01cb61a963139c631312da95'
-rw-r--r-- | packages/acpid/acpid-1.0.4/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/acpid/acpid-1.0.4/gcc40.patch | 13 | ||||
-rw-r--r-- | packages/acpid/acpid/.mtn2git_empty (renamed from packages/acpid/acpid-1.0.3/.mtn2git_empty) | 0 | ||||
-rw-r--r-- | packages/acpid/acpid/gcc40.patch (renamed from packages/acpid/acpid-1.0.3/gcc40.patch) | 2 | ||||
-rw-r--r-- | packages/wxbase/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/wxwidgets/wxbase_2.6.2.bb (renamed from packages/wxbase/wxbase_2.6.2.bb) | 0 | ||||
-rw-r--r-- | packages/wxwidgets/wxbase_2.7+cvs.bb (renamed from packages/wxbase/wxbase_2.7+cvs.bb) | 0 |
7 files changed, 2 insertions, 13 deletions
diff --git a/packages/acpid/acpid-1.0.4/.mtn2git_empty b/packages/acpid/acpid-1.0.4/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/acpid/acpid-1.0.4/.mtn2git_empty +++ /dev/null diff --git a/packages/acpid/acpid-1.0.4/gcc40.patch b/packages/acpid/acpid-1.0.4/gcc40.patch deleted file mode 100644 index dbe090ba41..0000000000 --- a/packages/acpid/acpid-1.0.4/gcc40.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: acpid-1.0.3/ud_socket.c -=================================================================== ---- acpid-1.0.3.orig/ud_socket.c 2003-11-17 14:24:58.000000000 -0700 -+++ acpid-1.0.3/ud_socket.c 2005-06-27 14:44:17.785576106 -0700 -@@ -58,7 +58,7 @@ - while (1) { - int newsock = 0; - struct sockaddr_un cliaddr; -- int len = sizeof(struct sockaddr_un); -+ socklen_t len = sizeof(struct sockaddr_un); - - newsock = accept(listenfd, (struct sockaddr *)&cliaddr, &len); - if (newsock < 0) { diff --git a/packages/acpid/acpid-1.0.3/.mtn2git_empty b/packages/acpid/acpid/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/acpid/acpid-1.0.3/.mtn2git_empty +++ b/packages/acpid/acpid/.mtn2git_empty diff --git a/packages/acpid/acpid-1.0.3/gcc40.patch b/packages/acpid/acpid/gcc40.patch index dbe090ba41..5320cee0bb 100644 --- a/packages/acpid/acpid-1.0.3/gcc40.patch +++ b/packages/acpid/acpid/gcc40.patch @@ -1,3 +1,5 @@ +upstream: https://sourceforge.net/tracker/index.php?func=detail&aid=1895615&group_id=33140&atid=407341 + Index: acpid-1.0.3/ud_socket.c =================================================================== --- acpid-1.0.3.orig/ud_socket.c 2003-11-17 14:24:58.000000000 -0700 diff --git a/packages/wxbase/.mtn2git_empty b/packages/wxbase/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/wxbase/.mtn2git_empty +++ /dev/null diff --git a/packages/wxbase/wxbase_2.6.2.bb b/packages/wxwidgets/wxbase_2.6.2.bb index 07d9199ae1..07d9199ae1 100644 --- a/packages/wxbase/wxbase_2.6.2.bb +++ b/packages/wxwidgets/wxbase_2.6.2.bb diff --git a/packages/wxbase/wxbase_2.7+cvs.bb b/packages/wxwidgets/wxbase_2.7+cvs.bb index 772ea4e27f..772ea4e27f 100644 --- a/packages/wxbase/wxbase_2.7+cvs.bb +++ b/packages/wxwidgets/wxbase_2.7+cvs.bb |