diff -Nru granite-0.3.0/debian/changelog granite-0.3.0/debian/changelog --- granite-0.3.0/debian/changelog 2014-10-29 20:47:33.000000000 +0000 +++ granite-0.3.0/debian/changelog 2015-10-22 06:06:24.000000000 +0000 @@ -1,3 +1,16 @@ +granite (0.3.0-2~experimental1ubuntu2) wily; urgency=medium + + * Include upstream patch to fix about dialog crash/implicit pointer + conversion, causing FTBFS on 64-bit arches. + + -- Logan Rosen Thu, 22 Oct 2015 02:03:06 -0400 + +granite (0.3.0-2~experimental1ubuntu1) wily; urgency=medium + + * Cherrypick fixes from upstream for FTBFS with Vala 0.28. + + -- Logan Rosen Thu, 22 Oct 2015 01:38:51 -0400 + granite (0.3.0-2~experimental1) experimental; urgency=low * Fix build on valac 0.25.2 and later by cherrypicking an upstream patch. diff -Nru granite-0.3.0/debian/control granite-0.3.0/debian/control --- granite-0.3.0/debian/control 2014-10-29 18:57:00.000000000 +0000 +++ granite-0.3.0/debian/control 2015-10-22 05:39:07.000000000 +0000 @@ -1,7 +1,8 @@ Source: granite Section: libs Priority: optional -Maintainer: Sergey "Shnatsel" Davidoff +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Sergey "Shnatsel" Davidoff Build-Depends: cmake (>= 2.8), debhelper (>= 9), gobject-introspection (>= 1.41.4-1~), diff -Nru granite-0.3.0/debian/patches/fix-about-dialog granite-0.3.0/debian/patches/fix-about-dialog --- granite-0.3.0/debian/patches/fix-about-dialog 1970-01-01 00:00:00.000000000 +0000 +++ granite-0.3.0/debian/patches/fix-about-dialog 2015-10-22 06:02:47.000000000 +0000 @@ -0,0 +1,29 @@ +--- a/lib/Widgets/widgets-utils.h ++++ b/lib/Widgets/widgets-utils.h +@@ -1,5 +1,6 @@ + #include + #include ++#include + + void granite_widgets_show_about_dialog (GtkWindow *parent, + const gchar *first_property_name, +--- a/lib/Widgets/widgets-utils.c ++++ b/lib/Widgets/widgets-utils.c +@@ -67,7 +67,7 @@ + if (!dialog) + { + //dialog = gtk_about_dialog_new (); +- dialog = granite_widgets_about_dialog_new (); ++ dialog = GTK_WIDGET (granite_widgets_about_dialog_new ()); + g_object_ref_sink (dialog); + + g_signal_connect (dialog, "delete-event", +--- a/lib/Widgets/AboutDialog.vala ++++ b/lib/Widgets/AboutDialog.vala +@@ -195,5 +195,5 @@ + } + } + +- public extern void show_about_dialog (Gtk.Window *parent, ...); ++ public extern void show_about_dialog (Gtk.Window *parent, string first, ...); + } diff -Nru granite-0.3.0/debian/patches/series granite-0.3.0/debian/patches/series --- granite-0.3.0/debian/patches/series 2014-10-29 20:28:51.000000000 +0000 +++ granite-0.3.0/debian/patches/series 2015-10-22 06:03:04.000000000 +0000 @@ -1 +1,3 @@ fix-build-on-valac-0.25+ +vala-0.28 +fix-about-dialog diff -Nru granite-0.3.0/debian/patches/vala-0.28 granite-0.3.0/debian/patches/vala-0.28 --- granite-0.3.0/debian/patches/vala-0.28 1970-01-01 00:00:00.000000000 +0000 +++ granite-0.3.0/debian/patches/vala-0.28 2015-10-22 05:42:37.000000000 +0000 @@ -0,0 +1,31 @@ +--- a/lib/Widgets/DynamicNotebook.vala ++++ b/lib/Widgets/DynamicNotebook.vala +@@ -927,7 +927,7 @@ + notebook.create_window.connect (on_create_window); + } + +- ~Notebook () { ++ ~DynamicNotebook () { + notebook.switch_page.disconnect (on_switch_page); + notebook.page_added.disconnect (on_page_added); + notebook.page_removed.disconnect (on_page_removed); +--- a/lib/Widgets/ContractorView.vala ++++ b/lib/Widgets/ContractorView.vala +@@ -35,7 +35,7 @@ + public delegate void ContractCallback (); + private Gee.HashMap outsiders; + private int[] blacklisted_pos; +- private ListStore list; ++ private Gtk.ListStore list; + + private struct DelegateWrapper { unowned ContractCallback method; } + +@@ -73,7 +73,7 @@ + */ + public ContractorView (string filename, string mime, int icon_size = 32, bool show_contract_name = true) { + /* Setup the ListStore */ +- list = new ListStore (2, typeof (Gdk.Pixbuf), typeof (string)); ++ list = new Gtk.ListStore (2, typeof (Gdk.Pixbuf), typeof (string)); + outsiders = new Gee.HashMap (); + this.model = list; +