Source: moonshot-ui Followup-For: Bug #787880 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 97cd849d668f2e414fae0165a22797a9fe69bbcc Mon Sep 17 00:00:00 2001 From: Rodolphe PELLOUX-PRAYER <rodol...@damsy.net> Date: Sun, 7 Jun 2015 19:36:59 +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 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=787880 --- ...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..e4318c0 --- /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 19:33:57 +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=787880 +--- + src/moonshot-identity-management-view.vala | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/moonshot-identity-management-view.vala b/src/moonshot-identity-management-view.vala +index 158b652..d9d7c5a 100644 +--- a/src/moonshot-identity-management-view.vala ++++ b/src/moonshot-identity-management-view.vala +@@ -55,7 +55,7 @@ public class IdentityManagerView : Window { + private CheckButton remember_checkbutton; + private Button update_password_button; + +- private ListStore* listmodel; ++ private Gtk.ListStore* listmodel; + private TreeModelFilter filter; + + public IdentityManagerModel identities_manager; +@@ -177,7 +177,7 @@ public class IdentityManagerView : Window { + + private void setup_list_model () + { +- this.listmodel = new ListStore (Columns.N_COLUMNS, typeof (IdCard), ++ this.listmodel = new Gtk.ListStore (Columns.N_COLUMNS, typeof (IdCard), + typeof (Gdk.Pixbuf), + typeof (string), + typeof (string), diff --git a/debian/patches/series b/debian/patches/series index 7bb8252..84b6b7b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ debian-changes +0002-Fix-ambiguous-references-between-GLib.ListStore-and-.patch -- 2.1.4
