Source: midori Followup-For: Bug #787878 Dear Maintainer,
Please apply the attached patch to fix this ftbfs. Regards, Rodolphe -- System Information: Debian Release: stretch/sid APT prefers unstable APT policy: (500, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.0.0-1-amd64 (SMP w/4 CPU cores) Locale: LANG=fr_FR.utf8, LC_CTYPE=fr_FR.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system)
>From 7cef18b2df4c75ed7bdd595ab214bc0b43cf49dd Mon Sep 17 00:00:00 2001 From: Rodolphe PELLOUX-PRAYER <rodol...@damsy.net> Date: Sun, 7 Jun 2015 18:44:32 +0200 Subject: [PATCH] Fix ambiguous references between GLib.ListStore and Gtk.ListStore GLib. ListStore is a new class in GIO and creates a conflict in Vala 0.28. Closes: #787878 --- ...us-references-between-GLib.ListStore-and-.patch | 33 ++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 34 insertions(+) create mode 100644 debian/patches/0002-Fix-ambiguous-references-between-GLib.ListStore-and-.patch diff --git a/debian/patches/0002-Fix-ambiguous-references-between-GLib.ListStore-and-.patch b/debian/patches/0002-Fix-ambiguous-references-between-GLib.ListStore-and-.patch new file mode 100644 index 0000000..6ffc391 --- /dev/null +++ b/debian/patches/0002-Fix-ambiguous-references-between-GLib.ListStore-and-.patch @@ -0,0 +1,33 @@ +From: Rodolphe PELLOUX-PRAYER <rodol...@damsy.net> +Date: Sun, 7 Jun 2015 18:42:41 +0200 +Subject: Fix ambiguous references between GLib.ListStore and Gtk.ListStore + +GLib.ListStore is a new class in GIO and creates a conflict in Vala 0.28 + +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=787878 +--- + extensions/history-list.vala | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/extensions/history-list.vala b/extensions/history-list.vala +index 44af649..ac5dcb2 100644 +--- a/extensions/history-list.vala ++++ b/extensions/history-list.vala +@@ -265,7 +265,7 @@ namespace HistoryList { + } + + private void create_widgets () { +- ListStore model; ++ Gtk.ListStore model; + TreeIter iter; + TreeIter? active_iter = null; + +@@ -277,7 +277,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/debian/patches/series b/debian/patches/series index 5367257..ba823fd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ add-debian-searches +0002-Fix-ambiguous-references-between-GLib.ListStore-and-.patch -- 2.1.4
