diff options
author | Ross Burton <ross.burton@intel.com> | 2015-05-19 20:40:57 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-20 21:41:10 +0100 |
commit | 2af30090ce04d8eeb9b76ab065dba3a58e29f0de (patch) | |
tree | 86876a66ac32ecf22520ce1476c445a43bcc5469 /meta/recipes-sato/midori/midori/liststore.patch | |
parent | 929b1793f8bf1e9b505d5b10287526530b818b84 (diff) | |
download | poky-2af30090ce04d8eeb9b76ab065dba3a58e29f0de.tar.gz |
midori: fix build with GLib 2.44
GLib 2.44 introduced a GListStore type which is ambiguous with GtkListStore when
using wildcard using statements. Use the full type name to fix builds.
(From OE-Core rev: e14f9f31d24c517e59f250cb79a536ed4b01bc5d)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/midori/midori/liststore.patch')
-rw-r--r-- | meta/recipes-sato/midori/midori/liststore.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-sato/midori/midori/liststore.patch b/meta/recipes-sato/midori/midori/liststore.patch new file mode 100644 index 0000000000..4e5d666afd --- /dev/null +++ b/meta/recipes-sato/midori/midori/liststore.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | GLib 2.44 has a GListStore type which is GLib.ListStore in Vala, resulting in an ambigous type and compile failure. | ||
2 | |||
3 | Fix by using the full type name. | ||
4 | |||
5 | Upstream-Status: Backport | ||
6 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
7 | |||
8 | diff --git a/extensions/history-list.vala b/extensions/history-list.vala | ||
9 | index 3a864b1..f309c0c 100644 | ||
10 | --- a/extensions/history-list.vala | ||
11 | +++ b/extensions/history-list.vala | ||
12 | @@ -319,7 +319,7 @@ namespace HistoryList { | ||
13 | } | ||
14 | |||
15 | private void create_widgets () { | ||
16 | - ListStore model; | ||
17 | + Gtk.ListStore model; | ||
18 | TreeIter iter; | ||
19 | TreeIter? active_iter = null; | ||
20 | |||
21 | @@ -331,7 +331,7 @@ namespace HistoryList { | ||
22 | |||
23 | var tab_closing_behavior = this.hl_manager.get_integer ("TabClosingBehavior"); | ||
24 | |||
25 | - model = new ListStore (2, typeof (string), typeof (int)); | ||
26 | + model = new Gtk.ListStore (2, typeof (string), typeof (int)); | ||
27 | |||
28 | model.append (out iter); | ||
29 | model.set (iter, TabClosingBehaviorModel.TEXT, _("Do nothing"), | ||