diff options
author | Ross Burton <ross@openedhand.com> | 2007-09-23 11:38:11 +0000 |
---|---|---|
committer | Ross Burton <ross@openedhand.com> | 2007-09-23 11:38:11 +0000 |
commit | ed66764821441b3ab8fde48edf2ff4b221d9e5ed (patch) | |
tree | c84fbfec9c834fedb9aadad0c2d1e4824926c7e2 /meta-extras/packages/networkmanager/files/build-fixes.diff | |
parent | 0a5c898c901401ac0045bca5adfca569c8383bed (diff) | |
download | poky-ed66764821441b3ab8fde48edf2ff4b221d9e5ed.tar.gz |
networkmanager: add svn trunk packages, fix up bad packaging, and backport fixes to 0.6
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2772 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta-extras/packages/networkmanager/files/build-fixes.diff')
-rw-r--r-- | meta-extras/packages/networkmanager/files/build-fixes.diff | 78 |
1 files changed, 78 insertions, 0 deletions
diff --git a/meta-extras/packages/networkmanager/files/build-fixes.diff b/meta-extras/packages/networkmanager/files/build-fixes.diff new file mode 100644 index 0000000000..d771c30563 --- /dev/null +++ b/meta-extras/packages/networkmanager/files/build-fixes.diff | |||
@@ -0,0 +1,78 @@ | |||
1 | Index: test/nm-tool.c | ||
2 | =================================================================== | ||
3 | --- test/nm-tool.c (revision 2853) | ||
4 | +++ test/nm-tool.c (working copy) | ||
5 | @@ -148,7 +148,7 @@ | ||
6 | GString *str; | ||
7 | gboolean active = FALSE; | ||
8 | guint32 flags, wpa_flags, rsn_flags; | ||
9 | - GByteArray * ssid; | ||
10 | + const GByteArray * ssid; | ||
11 | char *tmp; | ||
12 | |||
13 | flags = nm_access_point_get_flags (ap); | ||
14 | @@ -193,7 +193,6 @@ | ||
15 | ssid = nm_access_point_get_ssid (ap); | ||
16 | tmp = g_strdup_printf (" %s%s", active ? "*" : "", | ||
17 | ssid ? nm_utils_escape_ssid (ssid->data, ssid->len) : "(none)"); | ||
18 | - g_byte_array_free (ssid, TRUE); | ||
19 | |||
20 | print_string (tmp, str->str); | ||
21 | |||
22 | Index: callouts/nm-dhcp-client-action.c | ||
23 | =================================================================== | ||
24 | --- callouts/nm-dhcp-client-action.c (revision 2853) | ||
25 | +++ callouts/nm-dhcp-client-action.c (working copy) | ||
26 | @@ -176,7 +176,7 @@ | ||
27 | } | ||
28 | |||
29 | |||
30 | -const char ** ignore[] = {"PATH", "SHLVL", "_", "PWD", "dhc_dbus", NULL}; | ||
31 | +static const char * ignore[] = {"PATH", "SHLVL", "_", "PWD", "dhc_dbus", NULL}; | ||
32 | |||
33 | dbus_bool_t | ||
34 | build_message (DBusMessage * message) | ||
35 | Index: src/nm-netlink.c | ||
36 | =================================================================== | ||
37 | --- src/nm-netlink.c (revision 2853) | ||
38 | +++ src/nm-netlink.c (working copy) | ||
39 | @@ -19,6 +19,7 @@ | ||
40 | * (C) Copyright 2007 Red Hat, Inc. | ||
41 | */ | ||
42 | |||
43 | +#include <asm/types.h> | ||
44 | #include "nm-netlink.h" | ||
45 | #include "nm-utils.h" | ||
46 | |||
47 | Index: src/vpn-manager/nm-vpn-connection.c | ||
48 | =================================================================== | ||
49 | --- src/vpn-manager/nm-vpn-connection.c (revision 2853) | ||
50 | +++ src/vpn-manager/nm-vpn-connection.c (working copy) | ||
51 | @@ -406,7 +406,7 @@ | ||
52 | routes = nm_vpn_connection_get_routes (connection); | ||
53 | org_freedesktop_NetworkManager_VPN_Plugin_connect_async (priv->proxy, | ||
54 | nm_vpn_connection_get_vpn_data (connection), | ||
55 | - routes, | ||
56 | + (const char**)routes, | ||
57 | nm_vpn_connection_connect_cb, | ||
58 | connection); | ||
59 | |||
60 | Index: libnm-glib/libnm-glib-test.c | ||
61 | =================================================================== | ||
62 | --- libnm-glib/libnm-glib-test.c (revision 2853) | ||
63 | +++ libnm-glib/libnm-glib-test.c (working copy) | ||
64 | @@ -165,13 +165,12 @@ | ||
65 | static void | ||
66 | dump_access_point (NMAccessPoint *ap) | ||
67 | { | ||
68 | - GByteArray * ssid; | ||
69 | + const GByteArray * ssid; | ||
70 | char * str; | ||
71 | |||
72 | ssid = nm_access_point_get_ssid (ap); | ||
73 | g_print ("\tSsid: %s\n", | ||
74 | ssid ? nm_utils_escape_ssid (ssid->data, ssid->len) : "(none)"); | ||
75 | - g_byte_array_free (ssid, TRUE); | ||
76 | |||
77 | str = nm_access_point_get_hw_address (ap); | ||
78 | g_print ("\tMAC Address: %s\n", str); | ||