Source: clinica Followup-For: Bug #787877 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 7a27775901a43fb52d24323a1432f0b22281837d Mon Sep 17 00:00:00 2001 From: Rodolphe PELLOUX-PRAYER <rodol...@damsy.net> Date: Sun, 7 Jun 2015 18:09:01 +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: #787877 --- ...us-references-between-GLib.ListStore-and-.patch | 87 ++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 88 insertions(+) create mode 100644 debian/patches/0001-Fix-ambiguous-references-between-GLib.ListStore-and-.patch create mode 100644 debian/patches/series diff --git a/debian/patches/0001-Fix-ambiguous-references-between-GLib.ListStore-and-.patch b/debian/patches/0001-Fix-ambiguous-references-between-GLib.ListStore-and-.patch new file mode 100644 index 0000000..d0d82d6 --- /dev/null +++ b/debian/patches/0001-Fix-ambiguous-references-between-GLib.ListStore-and-.patch @@ -0,0 +1,87 @@ +From: Rodolphe PELLOUX-PRAYER <rodol...@damsy.net> +Date: Sun, 7 Jun 2015 18:07:19 +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=787877 +--- + libclinica/DoctorListStore.vala | 2 +- + libclinica/EventListStore.vala | 2 +- + libclinica/MedicineTreeView.vala | 4 ++-- + libclinica/PatientListStore.vala | 2 +- + libclinica/VisitListStore.vala | 2 +- + 5 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/libclinica/DoctorListStore.vala b/libclinica/DoctorListStore.vala +index e87237b..ca63f36 100644 +--- a/libclinica/DoctorListStore.vala ++++ b/libclinica/DoctorListStore.vala +@@ -22,7 +22,7 @@ using Gtk; + + namespace Clinica { + +- public class DoctorListStore : ListStore { ++ public class DoctorListStore : Gtk.ListStore { + + enum Field { + DOCTOR, +diff --git a/libclinica/EventListStore.vala b/libclinica/EventListStore.vala +index 74bf4c1..83edac1 100644 +--- a/libclinica/EventListStore.vala ++++ b/libclinica/EventListStore.vala +@@ -22,7 +22,7 @@ + + namespace Clinica { + +- public class EventListStore : ListStore { ++ public class EventListStore : Gtk.ListStore { + + /** + * @brief Fields present in the store, i.e. header of +diff --git a/libclinica/MedicineTreeView.vala b/libclinica/MedicineTreeView.vala +index fac4b99..bc17e81 100644 +--- a/libclinica/MedicineTreeView.vala ++++ b/libclinica/MedicineTreeView.vala +@@ -23,13 +23,13 @@ namespace Clinica { + + public class MedicineTreeView : Gtk.TreeView { + +- private ListStore medicine_store { get; set; } ++ private Gtk.ListStore medicine_store { get; set; } + + private ResourceManager resource_manager { get; set; } + + public MedicineTreeView (ResourceManager resources) { + resource_manager = resources; +- medicine_store = new ListStore (3, typeof (string), typeof (string), typeof (Medicine)); ++ medicine_store = new Gtk.ListStore (3, typeof (string), typeof (string), typeof (Medicine)); + set_model (medicine_store); + + /* Create necessary columns */ +diff --git a/libclinica/PatientListStore.vala b/libclinica/PatientListStore.vala +index f09a7f0..054c89d 100644 +--- a/libclinica/PatientListStore.vala ++++ b/libclinica/PatientListStore.vala +@@ -22,7 +22,7 @@ using Gtk; + + namespace Clinica { + +- public class PatientListStore : ListStore { ++ public class PatientListStore : Gtk.ListStore { + + enum Field { + PATIENT, +diff --git a/libclinica/VisitListStore.vala b/libclinica/VisitListStore.vala +index 33b74a3..705e93f 100644 +--- a/libclinica/VisitListStore.vala ++++ b/libclinica/VisitListStore.vala +@@ -22,7 +22,7 @@ using Gtk; + + namespace Clinica { + +- public class VisitListStore : ListStore { ++ public class VisitListStore : Gtk.ListStore { + + enum Field { + VISIT, diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..67634fd --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-Fix-ambiguous-references-between-GLib.ListStore-and-.patch -- 2.1.4
