[PATCH] midori: fix build with GLib 2.44

[PATCH] midori: fix build with GLib 2.44

[Ross Burton]

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.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-sato/midori/midori/liststore.patch | 29 +++++++++++++++++++++++++
 meta/recipes-sato/midori/midori_0.5.8.bb        |  4 +++-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-sato/midori/midori/liststore.patch

diff --git a/meta/recipes-sato/midori/midori/liststore.patch b/meta/recipes-sato/midori/midori/liststore.patch
new file mode 100644
index 0000000..4e5d666
--- /dev/null
+++ b/meta/recipes-sato/midori/midori/liststore.patch
@@ -0,0 +1,29 @@
+GLib 2.44 has a GListStore type which is GLib.ListStore in Vala, resulting in an ambigous type and compile failure.
+
+Fix by using the full type name.
+
+Upstream-Status: Backport
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+
+diff --git a/extensions/history-list.vala b/extensions/history-list.vala
+index 3a864b1..f309c0c 100644
+--- a/extensions/history-list.vala
++++ b/extensions/history-list.vala
+@@ -319,7 +319,7 @@ namespace HistoryList {
+         }
+ 
+         private void create_widgets () {
+-            ListStore model;
++            Gtk.ListStore model;
+             TreeIter iter;
+             TreeIter? active_iter = null;
+ 
+@@ -331,7 +331,7 @@ namespace HistoryList {
+ 
+             var tab_closing_behavior = this.hl_manager.get_integer ("TabClosingBehavior");
+ 
+-            model = new ListStore (2, typeof (string), typeof (int));
++            model = new Gtk.ListStore (2, typeof (string), typeof (int));
+ 
+             model.append (out iter);
+             model.set (iter, TabClosingBehaviorModel.TEXT, _("Do nothing"),
diff --git a/meta/recipes-sato/midori/midori_0.5.8.bb b/meta/recipes-sato/midori/midori_0.5.8.bb
index 5cc42cb..aa1b395 100644
--- a/meta/recipes-sato/midori/midori_0.5.8.bb
+++ b/meta/recipes-sato/midori/midori_0.5.8.bb
@@ -4,7 +4,9 @@ LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
 DEPENDS = "webkit-gtk libsoup-2.4 openssl python-native python-docutils-native librsvg-native libnotify libxscrnsaver"
 
-SRC_URI = "https://launchpad.net/midori/trunk/0.5.8/+download/${BPN}-${PV}.tar.bz2;subdir=${BPN}-${PV}"
+SRC_URI = "https://launchpad.net/midori/trunk/0.5.8/+download/${BPN}-${PV}.tar.bz2;subdir=${BPN}-${PV} \
+           file://liststore.patch"
+
 SRC_URI[md5sum] = "b89e25e74199d705e74767499a415976"
 SRC_URI[sha256sum] = "af19135fd4c4b04345df4d3592e7939c20f9b40eaca24550e6cb619751aa9381"
 
-- 
2.1.4

Re: [PATCH] midori: fix build with GLib 2.44

[Alexander Kanavin]

On 05/19/2015 10:40 PM, Ross Burton wrote:
> 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.
>

Midori is already at 0.5.10 upstream; if it's compatible with the webkit 
currently in oe-core, maybe it's better to update to the latest version?

When the new webkit patches are ready, I'll definitely pull in the 
latest midori as well.

Alex

Re: [PATCH] midori: fix build with GLib 2.44

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 688 bytes --]

On 20 May 2015 at 16:24, Alexander Kanavin <
alexander.kanavin@linux.intel.com> wrote:

> Midori is already at 0.5.10 upstream; if it's compatible with the webkit
> currently in oe-core, maybe it's better to update to the latest version?
>
> When the new webkit patches are ready, I'll definitely pull in the latest
> midori as well.
>

The precise cause of the problem was a bit of a mystery to me, as the
autobuilder was failing in ways that I couldn't replicate or understand.
Because of this and the failure being one blocking master-next from being
merged I opted to fix the immediate problem instead of doing an upgrade.

An upgrade is certainly due though.

Ross

[-- Attachment #2: Type: text/html, Size: 1123 bytes --]