tags 663321 + patch pending thanks Hi,
I've prepared an NMU to make steadyflow compile against vala 0.14 and
uploaded it to DELAYED/10. Please let me know if you want me to delay it
further or cancel it.
Attached is the full debdiff.
The changelog reads:
steadyflow (0.1.7-2.1) unstable; urgency=low
* Non-maintainer upload.
* Build against vala 0.14. (Closes: #663321)
- Update debian/patches/vala_executable.patch to check for valac-0.14.
- Bump Build-Depends to valac-0.14.
- Add debian/patches/vala-0.14.patch to fix ActionEntry and Menu
ambiguity
errors with newer Vala versions.
-- Michael Biebl <[email protected]> Sat, 05 May 2012 00:42:19 +0200
Cheers,
Michael
--
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?
diff -Nru steadyflow-0.1.7/debian/changelog steadyflow-0.1.7/debian/changelog --- steadyflow-0.1.7/debian/changelog 2011-07-13 03:32:49.000000000 +0200 +++ steadyflow-0.1.7/debian/changelog 2012-05-05 00:44:47.000000000 +0200 @@ -1,3 +1,14 @@ +steadyflow (0.1.7-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Build against vala 0.14. (Closes: #663321) + - Update debian/patches/vala_executable.patch to check for valac-0.14. + - Bump Build-Depends to valac-0.14. + - Add debian/patches/vala-0.14.patch to fix ActionEntry and Menu ambiguity + errors with newer Vala versions. + + -- Michael Biebl <[email protected]> Sat, 05 May 2012 00:42:19 +0200 + steadyflow (0.1.7-2) unstable; urgency=low * Remove libappindicator-dev | hello build-dependency; confuses Debian diff -Nru steadyflow-0.1.7/debian/control steadyflow-0.1.7/debian/control --- steadyflow-0.1.7/debian/control 2011-07-13 03:31:26.000000000 +0200 +++ steadyflow-0.1.7/debian/control 2012-05-05 00:41:18.000000000 +0200 @@ -4,7 +4,7 @@ Maintainer: Maia Kozheva <[email protected]> Build-Depends: debhelper (>= 7.0.50~), cmake (>= 2.6), - valac-0.12, + valac-0.14, libgtk2.0-dev (>= 2.16), libglib2.0-dev (>= 2.26), libgee-dev, diff -Nru steadyflow-0.1.7/debian/patches/series steadyflow-0.1.7/debian/patches/series --- steadyflow-0.1.7/debian/patches/series 2011-07-10 19:42:49.000000000 +0200 +++ steadyflow-0.1.7/debian/patches/series 2012-05-05 00:42:08.000000000 +0200 @@ -1 +1,2 @@ vala_executable.patch +vala-0.14.patch diff -Nru steadyflow-0.1.7/debian/patches/vala-0.14.patch steadyflow-0.1.7/debian/patches/vala-0.14.patch --- steadyflow-0.1.7/debian/patches/vala-0.14.patch 1970-01-01 01:00:00.000000000 +0100 +++ steadyflow-0.1.7/debian/patches/vala-0.14.patch 2012-05-05 00:37:54.000000000 +0200 @@ -0,0 +1,138 @@ +Index: steadyflow-0.1.7/Steadyflow/IndicatorController.vala +=================================================================== +--- steadyflow-0.1.7.orig/Steadyflow/IndicatorController.vala 2011-05-22 11:29:17.000000000 +0200 ++++ steadyflow-0.1.7/Steadyflow/IndicatorController.vala 2012-05-05 00:36:26.222259332 +0200 +@@ -57,11 +57,11 @@ + stock_quit_label = item.label; + } + +- private ActionEntry[] actions = { +- ActionEntry () { name = "Add", stock_id = "list-add", label = _("_Add download...") }, +- ActionEntry () { name = "Quit", stock_id = "system-shutdown", label = stock_quit_label }, +- ActionEntry () { name = "PauseAll", stock_id = "media-playback-pause", label = _("_Pause all") }, +- ActionEntry () { name = "ResumeAll", stock_id = "media-playback-start", label = _("_Resume all") } ++ private Gtk.ActionEntry[] actions = { ++ Gtk.ActionEntry () { name = "Add", stock_id = "list-add", label = _("_Add download...") }, ++ Gtk.ActionEntry () { name = "Quit", stock_id = "system-shutdown", label = stock_quit_label }, ++ Gtk.ActionEntry () { name = "PauseAll", stock_id = "media-playback-pause", label = _("_Pause all") }, ++ Gtk.ActionEntry () { name = "ResumeAll", stock_id = "media-playback-start", label = _("_Resume all") } + }; + + private ToggleActionEntry[] toggle_actions = { +@@ -69,7 +69,7 @@ + }; + + private UIManager ui_manager; +- private Menu menu; ++ private Gtk.Menu menu; + private ToggleAction show_hide_action; + private Gtk.Action pause_all_action; + private Gtk.Action resume_all_action; +@@ -89,7 +89,7 @@ + Util.fatal_error (e); + } + +- menu = (Menu) ui_manager.get_widget ("/ui/IndicatorMenu"); ++ menu = (Gtk.Menu) ui_manager.get_widget ("/ui/IndicatorMenu"); + Services.indicator.set_menu (menu); + Services.indicator.visible = Services.settings.get_boolean ("show-indicator"); + +Index: steadyflow-0.1.7/Steadyflow.UI/TrayIndicatorService.vala +=================================================================== +--- steadyflow-0.1.7.orig/Steadyflow.UI/TrayIndicatorService.vala 2011-05-22 11:29:17.000000000 +0200 ++++ steadyflow-0.1.7/Steadyflow.UI/TrayIndicatorService.vala 2012-05-05 00:37:50.518256351 +0200 +@@ -23,7 +23,7 @@ + + public class TrayIndicatorService : GLib.Object, IIndicatorService { + private StatusIcon status_icon; +- private Menu menu; ++ private Gtk.Menu menu; + + public TrayIndicatorService (string icon_name) { + status_icon = new StatusIcon.from_icon_name (icon_name); +Index: steadyflow-0.1.7/Steadyflow/MainWindow.vala +=================================================================== +--- steadyflow-0.1.7.orig/Steadyflow/MainWindow.vala 2011-05-22 11:29:17.000000000 +0200 ++++ steadyflow-0.1.7/Steadyflow/MainWindow.vala 2012-05-05 00:37:39.946256726 +0200 +@@ -47,7 +47,7 @@ + private Label url_label; + private Label local_label; + private Label status_label; +- private Menu m_item_popup; ++ private Gtk.Menu m_item_popup; + private Entry searchbox; + private ToggleToolButton t_edit; + +@@ -77,7 +77,7 @@ + url_label = (Label) get_object ("url_label"); + local_label = (Label) get_object ("local_label"); + status_label = (Label) get_object ("status_label"); +- m_item_popup = (Menu) get_object ("m_item_popup"); ++ m_item_popup = (Gtk.Menu) get_object ("m_item_popup"); + searchbox = (Entry) get_object ("searchbox"); + + a_start = (Gtk.Action) get_object ("a_start"); +@@ -130,7 +130,7 @@ + } + + [CCode (instance_pos = -1)] +- protected void on_quit (MenuItem sender) { ++ protected void on_quit (Gtk.MenuItem sender) { + destroy (); + } + +@@ -270,7 +270,7 @@ + } + + [CCode (instance_pos = -1)] +- protected void on_edit_preferences (MenuItem sender) { ++ protected void on_edit_preferences (Gtk.MenuItem sender) { + PreferencesDialog dlg = new PreferencesDialog (this); + dlg.run (); + dlg.destroy (); +@@ -285,17 +285,17 @@ + } + + [CCode (instance_pos = -1)] +- protected void on_help_reportbug (MenuItem sender) { ++ protected void on_help_reportbug (Gtk.MenuItem sender) { + show_uri ("https://bugs.launchpad.net/steadyflow";); + } + + [CCode (instance_pos = -1)] +- protected void on_help_translate (MenuItem sender) { ++ protected void on_help_translate (Gtk.MenuItem sender) { + show_uri ("https://translations.launchpad.net/steadyflow";); + } + + [CCode (instance_pos = -1)] +- protected void on_help_about (MenuItem sender) { ++ protected void on_help_about (Gtk.MenuItem sender) { + AboutDialog dlg = new AboutDialog (); + + dlg.authors = AppConfig.APP_AUTHORS.split("\n"); +@@ -313,7 +313,7 @@ + dlg.destroy (); + } + +- private void on_menu_position (Menu menu, out int x, out int y, out bool push_in) { ++ private void on_menu_position (Gtk.Menu menu, out int x, out int y, out bool push_in) { + int win_x; + int win_y; + +@@ -326,13 +326,13 @@ + [CCode (instance_pos = -1)] + protected void on_menu_edit (ToolButton sender) { + if (t_edit.active) { +- Menu menu = (Menu) get_object ("m_edit_s"); ++ Gtk.Menu menu = (Gtk.Menu) get_object ("m_edit_s"); + menu.popup (null, null, on_menu_position, 1, Gdk.CURRENT_TIME); + } + } + + [CCode (instance_pos = -1)] +- protected void on_app_menu_deactivate (Menu sender) { ++ protected void on_app_menu_deactivate (Gtk.Menu sender) { + t_edit.active = false; + } + diff -Nru steadyflow-0.1.7/debian/patches/vala_executable.patch steadyflow-0.1.7/debian/patches/vala_executable.patch --- steadyflow-0.1.7/debian/patches/vala_executable.patch 2011-07-10 19:43:28.000000000 +0200 +++ steadyflow-0.1.7/debian/patches/vala_executable.patch 2012-05-05 00:41:11.000000000 +0200 @@ -7,7 +7,7 @@ # Search for the valac executable in the usual system paths. find_program(VALA_EXECUTABLE - NAMES valac) -+ NAMES valac-0.12) ++ NAMES valac-0.14) # Handle the QUIETLY and REQUIRED arguments, which may be given to the find call. # Furthermore set VALA_FOUND to TRUE if Vala has been found (aka.
signature.asc
Description: OpenPGP digital signature
