diff options
Diffstat (limited to 'meta-oe/recipes-navigation/omgps/omgps/fix.build.with.glib.2.34.patch')
-rw-r--r-- | meta-oe/recipes-navigation/omgps/omgps/fix.build.with.glib.2.34.patch | 125 |
1 files changed, 125 insertions, 0 deletions
diff --git a/meta-oe/recipes-navigation/omgps/omgps/fix.build.with.glib.2.34.patch b/meta-oe/recipes-navigation/omgps/omgps/fix.build.with.glib.2.34.patch new file mode 100644 index 000000000..ec3bde0cd --- /dev/null +++ b/meta-oe/recipes-navigation/omgps/omgps/fix.build.with.glib.2.34.patch | |||
@@ -0,0 +1,125 @@ | |||
1 | Upstream-Status: Submitted | ||
2 | https://code.google.com/p/omgps/issues/detail?id=15 | ||
3 | |||
4 | diff -uNr omgps.orig/src/dbus_intf.c omgps/src/dbus_intf.c | ||
5 | --- omgps.orig/src/dbus_intf.c 2011-12-12 12:22:47.000000000 +0100 | ||
6 | +++ omgps/src/dbus_intf.c 2012-11-14 14:44:45.435381443 +0100 | ||
7 | @@ -171,7 +171,7 @@ | ||
8 | gpsdata->svinfo_valid = TRUE; | ||
9 | |||
10 | int i, j; | ||
11 | - GValueArray *val; | ||
12 | + GArray *val; | ||
13 | svinfo_channel_t *sv; | ||
14 | |||
15 | j = 0; | ||
16 | @@ -179,16 +179,16 @@ | ||
17 | val = satellites->pdata[i]; | ||
18 | |||
19 | sv = &gpsdata->sv_channels[j]; | ||
20 | - sv->sv_id = g_value_get_uint(g_value_array_get_nth(val, 0)); | ||
21 | + sv->sv_id = g_array_index(val, guint, 0); | ||
22 | |||
23 | - if (g_value_get_boolean(g_value_array_get_nth(val, 1))) { | ||
24 | + if (g_array_index(val, gboolean, 1)) { | ||
25 | ++gpsdata->sv_in_use; | ||
26 | sv->flags = 0x01; | ||
27 | } | ||
28 | |||
29 | - sv->elevation = (int)g_value_get_uint(g_value_array_get_nth(val, 2)); | ||
30 | - sv->azimuth = (int)g_value_get_uint(g_value_array_get_nth(val, 3)); | ||
31 | - sv->cno = g_value_get_uint(g_value_array_get_nth(val, 4)); | ||
32 | + sv->elevation = (int)g_array_index(val, guint, 2); | ||
33 | + sv->azimuth = (int)g_array_index(val, guint, 3); | ||
34 | + sv->cno = g_array_index(val, guint, 4); | ||
35 | if (sv->cno > 0) | ||
36 | ++gpsdata->sv_get_signal; | ||
37 | |||
38 | diff -uNr omgps.orig/src/main.c omgps/src/main.c | ||
39 | --- omgps.orig/src/main.c 2011-12-12 12:22:47.000000000 +0100 | ||
40 | +++ omgps/src/main.c 2012-11-14 14:46:00.345402222 +0100 | ||
41 | @@ -489,9 +489,6 @@ | ||
42 | |||
43 | g_type_init(); | ||
44 | |||
45 | - if (! g_thread_supported ()) | ||
46 | - g_thread_init(NULL); | ||
47 | - | ||
48 | gdk_threads_init(); | ||
49 | |||
50 | gdk_threads_enter(); | ||
51 | diff -uNr omgps.orig/src/tab_gpscfg.c omgps/src/tab_gpscfg.c | ||
52 | --- omgps.orig/src/tab_gpscfg.c 2011-12-12 12:22:47.000000000 +0100 | ||
53 | +++ omgps/src/tab_gpscfg.c 2012-11-14 15:23:47.526925258 +0100 | ||
54 | @@ -222,7 +222,7 @@ | ||
55 | |||
56 | static gboolean change_platform_model_cmd(void *model_id) | ||
57 | { | ||
58 | - U1 model = (U1)(int) model_id; | ||
59 | + U1 model = (U1)GPOINTER_TO_INT(model_id); | ||
60 | int gps_dev_fd = 0; | ||
61 | |||
62 | /* non ubx means: we need open serial port | ||
63 | @@ -269,7 +269,7 @@ | ||
64 | static void change_platmodel_button_clicked(GtkWidget *widget, gpointer data) | ||
65 | { | ||
66 | int idx = gtk_combo_box_get_active(GTK_COMBO_BOX(platmodel_list)); | ||
67 | - char *model_id = (void *)(int)platmodel_values[idx]; | ||
68 | + void *model_id = (void *)GINT_TO_POINTER(platmodel_values[idx]); | ||
69 | |||
70 | if (POLL_ENGINE_TEST(UBX)) { | ||
71 | gtk_widget_set_sensitive(change_platmodel_button, FALSE); | ||
72 | diff -uNr omgps.orig/src/tab_menu.c omgps/src/tab_menu.c | ||
73 | --- omgps.orig/src/tab_menu.c 2011-12-12 12:22:47.000000000 +0100 | ||
74 | +++ omgps/src/tab_menu.c 2012-11-14 15:25:08.217941513 +0100 | ||
75 | @@ -65,7 +65,7 @@ | ||
76 | |||
77 | static void poll_button_clicked(GtkWidget *widget, gpointer data) | ||
78 | { | ||
79 | - gboolean is_start_bt = (gboolean)data; | ||
80 | + gboolean is_start_bt = (gboolean) GPOINTER_TO_INT(data); | ||
81 | |||
82 | if (POLL_STATE_TEST(RUNNING) == is_start_bt) | ||
83 | return; | ||
84 | diff -uNr omgps.orig/src/tab_tile.c omgps/src/tab_tile.c | ||
85 | --- omgps.orig/src/tab_tile.c 2011-12-12 12:22:47.000000000 +0100 | ||
86 | +++ omgps/src/tab_tile.c 2012-11-14 15:25:30.392945800 +0100 | ||
87 | @@ -101,7 +101,7 @@ | ||
88 | static gboolean set_bg_map(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data) | ||
89 | { | ||
90 | map_repo_t *repo; | ||
91 | - gboolean clear = (gboolean)data; | ||
92 | + gboolean clear = (gboolean)GPOINTER_TO_INT(data); | ||
93 | |||
94 | int type; | ||
95 | |||
96 | @@ -240,7 +240,7 @@ | ||
97 | |||
98 | static void alpha_radio_toggled (GtkWidget *widget, gpointer user_data) | ||
99 | { | ||
100 | - int idx = (int)user_data; | ||
101 | + int idx = (int)GPOINTER_TO_INT(user_data); | ||
102 | |||
103 | if (g_view.bg_alpha_idx == idx) | ||
104 | return; | ||
105 | @@ -384,7 +384,7 @@ | ||
106 | |||
107 | for (i=0; i<ALPHA_LEVELS; i++) { | ||
108 | g_signal_connect (G_OBJECT (alpha_radios[i]), "toggled", | ||
109 | - G_CALLBACK (alpha_radio_toggled), (gpointer)i); | ||
110 | + G_CALLBACK (alpha_radio_toggled), GINT_TO_POINTER(i)); | ||
111 | gtk_container_add(GTK_CONTAINER (alpha_hbox), alpha_radios[i]); | ||
112 | } | ||
113 | |||
114 | diff -uNr omgps.orig/src/tab_view.c omgps/src/tab_view.c | ||
115 | --- omgps.orig/src/tab_view.c 2011-12-12 12:22:47.000000000 +0100 | ||
116 | +++ omgps/src/tab_view.c 2012-11-14 15:25:47.018949453 +0100 | ||
117 | @@ -534,7 +534,7 @@ | ||
118 | |||
119 | static void* change_zoom_routine(void *args) | ||
120 | { | ||
121 | - gboolean is_zoom_in = (gboolean)args; | ||
122 | + gboolean is_zoom_in = (gboolean)GPOINTER_TO_INT(args); | ||
123 | stop = FALSE; | ||
124 | |||
125 | int hi = (is_zoom_in)? | ||