<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4740e161252aa510505973e08ab029bd02f40661">https://github.com/macports/macports-ports/commit/4740e161252aa510505973e08ab029bd02f40661</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 4740e161252aa510505973e08ab029bd02f40661
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Tue Aug 1 21:39:19 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> gitg: apply upstream bugfixes and rebuild
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * allows configuration with libgit2-glib 0.26.*
</span>---
gnome/gitg/Portfile | 6 +-
.../patch-allow-popping-up-menu-from-keyboard.diff | 224 +++++++++++++++++++++
gnome/gitg/files/patch-fix-invalid-assignment.diff | 44 ++++
gnome/gitg/files/patch-libgit2-glib-0.26.diff | 24 +++
4 files changed, 297 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gitg/Portfile b/gnome/gitg/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b1a171e..0e6e6ca 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gitg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gitg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,6 +7,7 @@ PortGroup gobject_introspection 1.0
</span>
name gitg
version 3.24.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> license GPL-2+
set branch [join [lrange [split ${version} .] 0 1] .]
description GNOME git repository viewer.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,7 +53,10 @@ depends_run port:gnome-themes-standard
</span>
gobject_introspection yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-autogen.sh.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-autogen.sh.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-allow-popping-up-menu-from-keyboard.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-invalid-assignment.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-libgit2-glib-0.26.diff
</span>
# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gitg/files/patch-allow-popping-up-menu-from-keyboard.diff b/gnome/gitg/files/patch-allow-popping-up-menu-from-keyboard.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..0f14fa7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gitg/files/patch-allow-popping-up-menu-from-keyboard.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,224 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 6a9d3d7617ee96cb20f62451d24b0271eb7d76d8 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Ernestas Kulik <ernestask@gnome.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 6 May 2017 22:21:19 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: Allow popping menu up with keyboard
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Currently, the code assumes that any attempt to pop up the menu will
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+come from a button press event, which is not true when using the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+keyboard, in which case the assumption causes a crash.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This commit adds the ability to pop up the menu using the keyboard as
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+well.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bugzilla.gnome.org/show_bug.cgi?id=782275
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gitg/gitg-popup-menu.vala | 25 +++++++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gitg/history/gitg-history.vala | 114 ++++++++++++++++++++++++++++++++---------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 111 insertions(+), 28 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gitg/gitg-popup-menu.vala b/gitg/gitg-popup-menu.vala
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 26fc100..83e71c1 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gitg/gitg-popup-menu.vala
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gitg/gitg-popup-menu.vala
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,6 +23,7 @@ namespace Gitg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class PopupMenu : Object
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ public signal Gtk.Menu? populate_menu(Gdk.EventButton? event);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ public signal Gdk.Rectangle? request_menu_position();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ private Gtk.Widget? d_widget;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -54,11 +55,27 @@ class PopupMenu : Object
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- var time = (event == null ? Gtk.get_current_event_time() : event.time);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- var button = (event == null ? 0 : event.button);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ menu.attach_to_widget(widget, null);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- menu.popup(null, null, null, button, time);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (event == null)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ var position = request_menu_position();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (position == null)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ menu.popup_at_widget(widget, Gdk.Gravity.CENTER, Gdk.Gravity.CENTER);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ menu.popup_at_rect(widget.get_window(),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ position,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Gdk.Gravity.CENTER, Gdk.Gravity.WEST);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ menu.popup_at_pointer(event);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gitg/history/gitg-history.vala b/gitg/history/gitg-history.vala
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6625956..6f091ef 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gitg/history/gitg-history.vala
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gitg/history/gitg-history.vala
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -592,6 +592,7 @@ namespace GitgHistory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d_commit_list_popup = new Gitg.PopupMenu(d_main.commit_list_view);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d_commit_list_popup.populate_menu.connect(on_commit_list_populate_menu);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ d_commit_list_popup.request_menu_position.connect(on_commit_list_request_menu_position);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ application.bind_property("repository", d_main.refs_list,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "repository",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -629,6 +630,11 @@ namespace GitgHistory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Gtk.TreePath path;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Gtk.TreeViewColumn column;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (event == null)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return null;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!d_main.commit_list_view.get_path_at_pos((int)event.x,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (int)event.y,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ out path,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -665,44 +671,49 @@ namespace GitgHistory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ret = popup_menu_for_commit(event);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return ret;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- private void add_ref_action(Gee.LinkedList<GitgExt.RefAction> actions,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- GitgExt.RefAction? action)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (action != null && action.available)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // event is most likely null.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (ret == null)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- actions.add(action);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ret = popup_menu_for_selection();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return ret;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- private Gtk.Menu? popup_menu_for_commit(Gdk.EventButton? event)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ private Gdk.Rectangle? on_commit_list_request_menu_position()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int cell_x;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int cell_y;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Gtk.TreePath path;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Gtk.TreeViewColumn column;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ var selection = d_main.commit_list_view.get_selection();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (!d_main.commit_list_view.get_path_at_pos((int)event.x,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (int)event.y,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- out path,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- out column,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- out cell_x,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- out cell_y))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Gtk.TreeModel model;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Gtk.TreeIter iter;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!selection.get_selected(out model, out iter))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return null;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- var commit = d_commit_list_model.commit_from_path(path);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ var path = model.get_path(iter);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (commit == null)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Gdk.Rectangle rect = { 0 };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ d_main.commit_list_view.get_cell_area(path, null, out rect);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ d_main.commit_list_view.convert_bin_window_to_widget_coords(rect.x, rect.y,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ out rect.x, out rect.y);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return rect;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ private void add_ref_action(Gee.LinkedList<GitgExt.RefAction> actions,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GitgExt.RefAction? action)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (action != null && action.available)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return null;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ actions.add(action);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- d_main.commit_list_view.get_selection().select_path(path);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ private Gtk.Menu? populate_menu_for_commit(Gitg.Commit commit)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ var af = new ActionInterface(application, d_main.refs_list);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ af.updated.connect(() => {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -762,6 +773,61 @@ namespace GitgHistory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return menu;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ private Gtk.Menu? popup_menu_for_selection()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ var selection = d_main.commit_list_view.get_selection();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Gtk.TreeIter iter;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!selection.get_selected(null, out iter))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return null;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ var commit = d_commit_list_model.commit_from_iter(iter);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (commit == null)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return null;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return populate_menu_for_commit(commit);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ private Gtk.Menu? popup_menu_for_commit(Gdk.EventButton? event)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int cell_x;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int cell_y;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Gtk.TreePath path;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Gtk.TreeViewColumn column;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (event == null)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return null;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!d_main.commit_list_view.get_path_at_pos((int)event.x,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (int)event.y,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ out path,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ out column,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ out cell_x,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ out cell_y))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return null;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ var commit = d_commit_list_model.commit_from_path(path);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (commit == null)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return null;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ d_main.commit_list_view.get_selection().select_path(path);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return populate_menu_for_commit(commit);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ private Gtk.Menu? popup_menu_for_ref(Gitg.Ref reference)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ var actions = new Gee.LinkedList<GitgExt.RefAction?>();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cgit v0.12
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gitg/files/patch-fix-invalid-assignment.diff b/gnome/gitg/files/patch-fix-invalid-assignment.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..02c5452
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gitg/files/patch-fix-invalid-assignment.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,44 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 5b195d645fc5df06e099ac2dc501f5c10f173e29 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Rico Tzschichholz <ricotz@ubuntu.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 20 Mar 2017 16:42:33 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: commit: Fix invalid assignment from owned expression to unowned
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+commit is an unowned parameter of stage_submodule() and be used to keep
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+an owned reference returned by repo.lookup().
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bugzilla.gnome.org/show_bug.cgi?id=780314
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gitg/commit/gitg-commit.vala | 7 ++++---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 4 insertions(+), 3 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gitg/commit/gitg-commit.vala b/gitg/commit/gitg-commit.vala
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3b82fa1..26af7dd 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gitg/commit/gitg-commit.vala
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gitg/commit/gitg-commit.vala
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -251,11 +251,12 @@ namespace GitgCommit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (commit == null)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Ggit.Commit sub_commit = commit;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (sub_commit == null)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ try
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- commit = repo.lookup<Gitg.Commit>(sub.submodule.get_workdir_id());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sub_commit = repo.lookup<Gitg.Commit>(sub.submodule.get_workdir_id());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ catch (Error e)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -268,7 +269,7 @@ namespace GitgCommit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ try
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- yield stage.stage_commit(sub.path, commit);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ yield stage.stage_commit(sub.path, sub_commit);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ catch (Error e)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cgit v0.12
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gitg/files/patch-libgit2-glib-0.26.diff b/gnome/gitg/files/patch-libgit2-glib-0.26.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..6049d61
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gitg/files/patch-libgit2-glib-0.26.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 713b20a26b0012322f37ef1262ba4a3a02d3704e Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Kalev Lember <klember@redhat.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 31 Jul 2017 20:10:00 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: Bump libgit2-glib max version to 0.27.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ac | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/configure.ac b/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7198dcb..d6bcf49 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -133,7 +133,7 @@ GTK_REQUIRED_VERSION=3.20.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GTKSOURCEVIEW_REQUIRED_VERSION=3.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INTROSPECTION_REQUIRED=0.10.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBGIT2_GLIB_REQUIRED_VERSION=0.25.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LIBGIT2_GLIB_REQUIRED_MAX_VERSION=0.26.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIBGIT2_GLIB_REQUIRED_MAX_VERSION=0.27.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBXML_REQUIRED_VERSION=2.9.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CHECK_MODULES(LIBGITG, [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cgit v0.12
</span></pre><pre style='margin:0'>
</pre>